feat/qg-253: WIP: добавлена обработка ошибки получения событий Google-календаря

Author: d-r-q

app/src/main/kotlin/pro/azhidkov/platform/kotlin/ResultExt.kt

@@ -39,6 +39,9 @@ inline fun <R : Any, reified T : Any?> Result<T>.mapNull(transform: () -> R): Re
 inline fun <reified T : Throwable, V : R, R> Result<V>.recoverFailure(block: (T) -> R): Result<R> =
     if (this.exceptionOrNull() is T) success(block(this.exceptionOrNull() as T)) else this
 
+inline fun <reified T : Throwable, V : R, R> Result<V>.tryRecover(block: (T) -> Result<R>): Result<R> =
+    if (this.exceptionOrNull() is T) block(this.exceptionOrNull() as T) else this
+
 inline fun <reified T : Throwable, R> Result<R>.mapFailure(block: (T) -> Throwable): Result<R> =
     if (this.exceptionOrNull() is T) failure(block(this.exceptionOrNull() as T)) else this
 

app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/forms/CreateAppointmentForm.kt

@@ -1,10 +1,9 @@
 package pro.qyoga.app.therapist.appointments.core.edit.forms
 
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.toQueryParamStr
 import pro.qyoga.core.appointments.core.model.AppointmentStatus
 import pro.qyoga.core.appointments.types.model.AppointmentTypeRef
 import pro.qyoga.core.calendar.api.CalendarItem
-import pro.qyoga.core.calendar.ical.model.ICalEventId
+import pro.qyoga.core.calendar.api.CalendarItemId
 import pro.qyoga.core.clients.cards.model.ClientRef
 import pro.qyoga.core.therapy.therapeutic_tasks.model.TherapeuticTaskRef
 import java.time.Duration
@@ -33,7 +32,7 @@ data class CreateAppointmentForm(
 ) {
 
     constructor(
-        iCalEvent: CalendarItem<ICalEventId, ZonedDateTime>?,
+        iCalEvent: CalendarItem<out CalendarItemId, ZonedDateTime>?,
         dateTime: LocalDateTime?,
         timeZone: ZoneId,
         timeZoneTitle: String?

app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt

@@ -4,8 +4,12 @@ import org.springframework.stereotype.Component
 import pro.azhidkov.timezones.TimeZones
 import pro.qyoga.app.therapist.appointments.core.edit.forms.CreateAppointmentForm
 import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
+import pro.qyoga.app.therapist.appointments.core.edit.view_model.googleEventId
 import pro.qyoga.app.therapist.appointments.core.edit.view_model.icsEventId
+import pro.qyoga.core.calendar.google.GoogleCalendar
+import pro.qyoga.core.calendar.google.GoogleCalendarsService
 import pro.qyoga.core.calendar.ical.ICalCalendarsRepo
+import pro.qyoga.core.calendar.ical.model.ICalCalendar
 import pro.qyoga.core.users.auth.model.UserRef
 import pro.qyoga.core.users.settings.UserSettingsRepo
 import pro.qyoga.core.users.therapists.TherapistRef
@@ -15,6 +19,7 @@ import java.time.LocalDateTime
 @Component
 class GetAppointmentPrefillDataOp(
     private val iCalCalendarsRepo: ICalCalendarsRepo,
+    private val googleCalendarsService: GoogleCalendarsService,
     private val userSettingsRepo: UserSettingsRepo,
     private val timeZones: TimeZones,
 ) : (TherapistRef, SourceItem?, LocalDateTime?) -> CreateAppointmentForm {
@@ -26,14 +31,22 @@ class GetAppointmentPrefillDataOp(
     ): CreateAppointmentForm {
         val currentUserTimeZone = userSettingsRepo.getUserTimeZone(UserRef(therapistRef))
 
-        val iCalEvent = sourceItem?.icsEventId()
-            ?.let { iCalCalendarsRepo.findById(therapistRef, it) }
+        val sourceEvent = when (sourceItem?.type) {
+            ICalCalendar.TYPE ->
+                iCalCalendarsRepo.findById(therapistRef, sourceItem.icsEventId())
 
-        val timeZone = iCalEvent?.dateTime?.zone
+            GoogleCalendar.TYPE ->
+                googleCalendarsService.findById(therapistRef, sourceItem.googleEventId())
+
+            else ->
+                null
+        }
+
+        val timeZone = sourceEvent?.dateTime?.zone
             ?: currentUserTimeZone
         val timeZoneTitle = timeZones.findById(timeZone)?.displayName
 
-        return CreateAppointmentForm(iCalEvent, dateTime, timeZone, timeZoneTitle)
+        return CreateAppointmentForm(sourceEvent, dateTime, timeZone, timeZoneTitle)
     }
 
 }

app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/view_model/SourceItem.kt

@@ -1,5 +1,6 @@
 package pro.qyoga.app.therapist.appointments.core.edit.view_model
 
+import pro.qyoga.core.calendar.google.GoogleCalendar
 import pro.qyoga.core.calendar.google.GoogleCalendarItemId
 import pro.qyoga.core.calendar.ical.model.ICalCalendar
 import pro.qyoga.core.calendar.ical.model.ICalEventId
@@ -14,20 +15,24 @@ data class SourceItem(
             SourceItem(ICalCalendar.TYPE, eventId.toQueryParamStr())
 
         fun googleEvent(eventId: GoogleCalendarItemId): SourceItem =
-            SourceItem("Google", eventId.value)
+            SourceItem("Google", eventId.toQueryParamStr())
 
     }
 
 }
 
-fun ICalEventId.toQueryParamStr(): String =
-    "uid=${uid},rid=${recurrenceId ?: ""}"
-
 fun SourceItem.icsEventId(): ICalEventId {
     check(type == ICalCalendar.TYPE)
     val matcher = "uid=(.+),rid=(.*)".toRegex().matchEntire(id)
     check(matcher != null)
     val uid = matcher.groups[1]!!.value
     val rid = matcher.groups[2]!!.value.takeIf { it.isNotBlank() }
     return ICalEventId(uid, rid)
+}
+
+fun SourceItem.googleEventId(): GoogleCalendarItemId {
+    check(type == GoogleCalendar.TYPE)
+    val matcher = "(.+),(.+)".toRegex().matchEntire(id)
+    check(matcher != null)
+    return GoogleCalendarItemId(matcher.groups[1]!!.value, matcher.groups[2]!!.value)
 }

app/src/main/kotlin/pro/qyoga/core/appointments/core/AppointmentsRepo.kt

@@ -35,7 +35,7 @@ class AppointmentsRepo(
     Appointment::class,
     jdbcConverter,
     relationalMappingContext
-), CalendarsService {
+), CalendarsService<UUID> {
 
     override fun findCalendarItemsInInterval(
         therapist: TherapistRef,
@@ -73,6 +73,13 @@ class AppointmentsRepo(
         return findAll(query, params, localizedAppointmentSummaryRowMapper)
     }
 
+    override fun findById(
+        therapistRef: TherapistRef,
+        eventId: UUID
+    ): CalendarItem<UUID, ZonedDateTime>? {
+        TODO()
+    }
+
 }
 
 fun AppointmentsRepo.findIntersectingAppointment(

app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarItem.kt

@@ -3,6 +3,12 @@ package pro.qyoga.core.calendar.api
 import java.time.Duration
 import java.time.temporal.Temporal
 
+interface CalendarItemId {
+
+    fun toQueryParamStr(): String
+
+}
+
 interface CalendarItem<ID, DATE : Temporal> {
     val id: ID
     val title: String

app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt

@@ -6,11 +6,13 @@ import java.time.LocalDateTime
 import java.time.ZonedDateTime
 
 
-interface CalendarsService {
+interface CalendarsService<ID> {
 
     fun findCalendarItemsInInterval(
         therapist: TherapistRef,
         interval: Interval<ZonedDateTime>
     ): Iterable<CalendarItem<*, LocalDateTime>>
 
+    fun findById(therapistRef: TherapistRef, eventId: ID): CalendarItem<ID, ZonedDateTime>?
+
 }

app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendar.kt

@@ -10,6 +10,11 @@ data class GoogleCalendar(
     override val name: String,
 ) : Calendar {
 
-    override val type: String = "Google"
+    override val type: String = TYPE
+
+    companion object {
+
+        const val TYPE = "Google"
+    }
 
 }

app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarItem.kt

@@ -2,12 +2,20 @@ package pro.qyoga.core.calendar.google
 
 import pro.azhidkov.platform.java.time.toLocalDateTime
 import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarItemId
 import java.time.Duration
 import java.time.ZoneId
 import java.time.temporal.Temporal
 
-@JvmInline
-value class GoogleCalendarItemId(val value: String)
+data class GoogleCalendarItemId(
+    val calendarId: String,
+    val itemId: String
+) : CalendarItemId {
+
+    override fun toQueryParamStr(): String =
+        "$calendarId,$itemId"
+
+}
 
 data class GoogleCalendarItem<DATE : Temporal>(
     override val id: GoogleCalendarItemId,

app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarsClient.kt

@@ -1,5 +1,6 @@
 package pro.qyoga.core.calendar.google
 
+import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.client.util.DateTime
 import com.google.api.services.calendar.Calendar
 import com.google.api.services.calendar.model.Event
@@ -9,9 +10,12 @@ import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties
 import org.springframework.cache.annotation.Cacheable
+import org.springframework.http.HttpStatus
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
 import pro.azhidkov.platform.kotlin.tryExecute
+import pro.azhidkov.platform.kotlin.tryRecover
+import pro.qyoga.core.calendar.api.CalendarItem
 import pro.qyoga.core.users.therapists.TherapistRef
 import java.net.URI
 import java.time.Duration
@@ -54,29 +58,10 @@ class GoogleCalendarsClient(
                 .setSingleEvents(true)
                 .execute()
                 .items
-                .map {
-                    GoogleCalendarItem(
-                        GoogleCalendarItemId(it.id),
-                        it.summary,
-                        it.description ?: "",
-                        startDate(it),
-                        duration(it),
-                        it.location
-                    )
-                }
+                .map { mapToCalendarItem(calendarSettings.calendarId, it) }
         return events
     }
 
-    private fun startDate(event: Event): ZonedDateTime =
-        ZonedDateTime.ofInstant(
-            Instant.ofEpochMilli(event.start.dateTime?.value ?: event.start.date?.value ?: 0),
-            ZoneId.of(event.start.timeZone)
-        )
-
-    private fun duration(event: Event): Duration =
-        Duration.ofMillis(event.end.dateTime?.value ?: event.end.date?.value ?: 0) -
-                Duration.ofMillis(event.start.dateTime?.value ?: event.start.date?.value ?: 0)
-
     @Cacheable(
         cacheNames = [GoogleCalendarConf.CacheNames.GOOGLE_ACCOUNT_CALENDARS],
         key = "#therapist.id + ':' + #account.id"
@@ -100,6 +85,31 @@ class GoogleCalendarsClient(
         return success(calendarsList)
     }
 
+    @Cacheable(
+        cacheNames = [GoogleCalendarConf.CacheNames.CALENDAR_EVENTS],
+        key = "#eventId"
+    )
+    fun findById(
+        account: GoogleAccount,
+        eventId: GoogleCalendarItemId
+    ): CalendarItem<GoogleCalendarItemId, ZonedDateTime>? {
+        val service = servicesCache.getValue(account)
+
+        val getEventRequest = service.events().get(eventId.calendarId, eventId.itemId)
+
+        val event = tryExecute { getEventRequest.execute() }
+            .tryRecover<GoogleJsonResponseException, _, _> {
+                if (it.statusCode == HttpStatus.NOT_FOUND.value()) {
+                    success(null)
+                } else {
+                    failure(it)
+                }
+            }
+            .getOrThrow()
+
+        return event?.let { mapToCalendarItem(eventId.calendarId, it) }
+    }
+
     private fun createCalendarService(account: GoogleAccount): Calendar {
         val credentials = UserCredentials.newBuilder()
             .setClientId(googleOAuthProps.registration["google"]!!.clientId)
@@ -115,4 +125,23 @@ class GoogleCalendarsClient(
         return service
     }
 
-}
+}
+
+private fun mapToCalendarItem(calendarId: String, event: Event): GoogleCalendarItem<ZonedDateTime> = GoogleCalendarItem(
+    GoogleCalendarItemId(calendarId, event.id),
+    event.summary,
+    event.description ?: "",
+    startDate(event),
+    duration(event),
+    event.location
+)
+
+private fun startDate(event: Event): ZonedDateTime =
+    ZonedDateTime.ofInstant(
+        Instant.ofEpochMilli(event.start.dateTime?.value ?: event.start.date?.value ?: 0),
+        ZoneId.of(event.start.timeZone)
+    )
+
+private fun duration(event: Event): Duration =
+    Duration.ofMillis(event.end.dateTime?.value ?: event.end.date?.value ?: 0) -
+            Duration.ofMillis(event.start.dateTime?.value ?: event.start.date?.value ?: 0)