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

Author: d-r-q

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

@@ -1,5 +1,8 @@
 package pro.azhidkov.platform.kotlin
 
+import kotlin.Result.Companion.failure
+import kotlin.Result.Companion.success
+
 inline fun <reified T : Throwable> Result<*>.isFailureOf(): Boolean = this.exceptionOrNull() is T
 
 fun Result<*>.value(): Any? = if (this.isSuccess) this.getOrThrow() else this.exceptionOrNull()!!
@@ -9,7 +12,7 @@ inline fun <R : Any, reified T : Any?> Result<T>.mapSuccessOrNull(transform: (T
 
     @Suppress("UNCHECKED_CAST")
     val result = when {
-        value != null -> Result.success(transform(value))
+        value != null -> success(transform(value))
         else -> this as Result<R>
     }
     return result
@@ -20,7 +23,7 @@ inline fun <R : Any, reified T : Any> Result<T>.mapSuccess(transform: (T) -> R):
 
     @Suppress("UNCHECKED_CAST")
     val result = when {
-        value != null -> Result.success(transform(value))
+        value != null -> success(transform(value))
         else -> this as Result<R>
     }
     return result
@@ -29,12 +32,19 @@ inline fun <R : Any, reified T : Any> Result<T>.mapSuccess(transform: (T) -> R):
 @Suppress("UNCHECKED_CAST")
 inline fun <R : Any, reified T : Any?> Result<T>.mapNull(transform: () -> R): Result<R> =
     when {
-        this.isSuccess && this.getOrNull() == null -> Result.success(transform())
+        this.isSuccess && this.getOrNull() == null -> success(transform())
         else -> this as Result<R>
     }
 
 inline fun <reified T : Throwable, V : R, R> Result<V>.recoverFailure(block: (T) -> R): Result<R> =
-    if (this.exceptionOrNull() is T) Result.success(block(this.exceptionOrNull() as T)) else this
+    if (this.exceptionOrNull() is T) success(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) Result.failure(block(this.exceptionOrNull() as T)) else this
+    if (this.exceptionOrNull() is T) failure(block(this.exceptionOrNull() as T)) else this
+
+fun <T> tryExecute(eventsRequest: () -> T): Result<T> =
+    try {
+        success(eventsRequest())
+    } catch (e: Exception) {
+        failure(e)
+    }

app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/CharArrayConverters.kt

@@ -5,6 +5,10 @@ import org.springframework.data.convert.ReadingConverter
 import org.springframework.data.convert.WritingConverter
 
 data class SecretChars(val value: CharArray) {
+
+    fun show() =
+        String(value)
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
@@ -17,6 +21,7 @@ data class SecretChars(val value: CharArray) {
     override fun hashCode(): Int {
         return value.contentHashCode()
     }
+
 }
 
 @WritingConverter

app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/CalendarPageModel.kt

@@ -45,7 +45,8 @@ data class CalendarPageModel(
     val date: LocalDate,
     val timeMarks: List<TimeMark>,
     val calendarDays: Collection<CalendarDay>,
-    val appointmentToFocus: UUID?
+    val appointmentToFocus: UUID?,
+    val hasSyncErrors: Boolean
 ) : ModelAndView("therapist/appointments/schedule.html") {
 
     init {
@@ -54,18 +55,19 @@ data class CalendarPageModel(
         addObject("calendarDays", calendarDays)
         addObject("selectedDayLabel", date.format(russianDayOfMonthLongFormat))
         addObject(FOCUSED_APPOINTMENT, appointmentToFocus)
+        addObject("hasSyncErrors", hasSyncErrors)
     }
 
     companion object {
 
         fun of(
             date: LocalDate,
-            appointments: Iterable<CalendarItem<*, LocalDateTime>>,
+            appointments: GetCalendarAppointmentsRs,
             appointmentToFocus: UUID? = null
         ): CalendarPageModel {
-            val timeMarks = generateTimeMarks(appointments, date)
+            val timeMarks = generateTimeMarks(appointments.appointments, date)
             val weekCalendar = generateDaysAround(date)
-            return CalendarPageModel(date, timeMarks, weekCalendar, appointmentToFocus)
+            return CalendarPageModel(date, timeMarks, weekCalendar, appointmentToFocus, appointments.hasErrors)
         }
 
         const val FOCUSED_APPOINTMENT = "focusedAppointment"

app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GetCalendarAppointments.kt

@@ -2,6 +2,7 @@ package pro.qyoga.app.therapist.appointments.core.schedule
 
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
+import pro.azhidkov.platform.kotlin.tryExecute
 import pro.qyoga.core.appointments.core.AppointmentsRepo
 import pro.qyoga.core.calendar.api.CalendarItem
 import pro.qyoga.core.calendar.google.GoogleCalendarsService
@@ -12,21 +13,36 @@ import pro.qyoga.core.users.therapists.TherapistRef
 import java.time.*
 
 
+data class GetCalendarAppointmentsRs(
+    val appointments: List<CalendarItem<*, LocalDateTime>>,
+    val hasErrors: Boolean
+)
+
 @Component
 class GetCalendarAppointmentsOp(
     private val userSettingsRepo: UserSettingsRepo,
     private val appointmentsRepo: AppointmentsRepo,
     private val iCalCalendarsRepo: ICalCalendarsRepo,
     private val googleCalendarsService: GoogleCalendarsService
-) : (TherapistRef, LocalDate) -> Iterable<CalendarItem<*, LocalDateTime>> {
+) : (TherapistRef, LocalDate) -> GetCalendarAppointmentsRs {
 
-    override fun invoke(therapist: TherapistRef, date: LocalDate): Iterable<CalendarItem<*, LocalDateTime>> {
+    override fun invoke(therapist: TherapistRef, date: LocalDate): GetCalendarAppointmentsRs {
         val currentUserTimeZone = userSettingsRepo.getUserTimeZone(UserRef(therapist))
         val interval = calendarIntervalAround(date, currentUserTimeZone)
         val appointments = appointmentsRepo.findCalendarItemsInInterval(therapist, interval)
-        val drafts = iCalCalendarsRepo.findCalendarItemsInInterval(therapist, interval) +
-                googleCalendarsService.findCalendarItemsInInterval(therapist, interval)
-        return appointments + drafts
+
+        val iCalEventsResult =
+            tryExecute { iCalCalendarsRepo.findCalendarItemsInInterval(therapist, interval) }
+
+        val googleCalendarEventsResult =
+            tryExecute { googleCalendarsService.findCalendarItemsInInterval(therapist, interval) }
+
+        val drafts =
+            iCalEventsResult.getOrElse { emptyList() } +
+                    googleCalendarEventsResult.getOrElse { emptyList() }
+
+        val hasErrors = iCalEventsResult.isFailure || googleCalendarEventsResult.isFailure
+        return GetCalendarAppointmentsRs(appointments + drafts, hasErrors)
     }
 
 }

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

@@ -12,13 +12,15 @@ import java.util.*
 
 typealias GoogleAccountRef = AggregateReference<GoogleAccount, UUID>
 
+typealias GoogleAccountId = UUID
+
 @Table("therapist_google_accounts")
 data class GoogleAccount(
     val ownerRef: TherapistRef,
     val email: String,
     val refreshToken: SecretChars,
 
-    @Id override val id: UUID = UUIDv7.randomUUID()
+    @Id override val id: GoogleAccountId = UUIDv7.randomUUID()
 ) : Identifiable<UUID> {
 
     constructor(

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

@@ -11,8 +11,8 @@ import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2Clien
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
+import pro.azhidkov.platform.kotlin.tryExecute
 import pro.qyoga.core.users.therapists.TherapistRef
-import java.io.IOException
 import java.net.URI
 import java.time.Duration
 import java.time.Instant
@@ -115,11 +115,4 @@ class GoogleCalendarsClient(
         return service
     }
 
-}
-
-private fun <T> tryExecute(eventsRequest: () -> T): Result<T> =
-    try {
-        success(eventsRequest())
-    } catch (e: IOException) {
-        failure(e)
-    }
+}

app/src/main/kotlin/pro/qyoga/core/clients/cards/model/Client.kt

@@ -15,6 +15,7 @@ import java.time.LocalDate
 import java.util.*
 
 typealias ClientRef = AggregateReference<Client, UUID>
+typealias ClientId = UUID
 
 @Table("clients")
 data class Client(
@@ -32,7 +33,7 @@ data class Client(
     val therapistRef: TherapistRef,
 
     @Id
-    override val id: UUID = UUIDv7.randomUUID(),
+    override val id: ClientId = UUIDv7.randomUUID(),
     @CreatedDate
     val createdAt: Instant = Instant.now(),
     @LastModifiedDate

app/src/main/kotlin/pro/qyoga/infra/web/ThymeleafConfig.kt

@@ -3,12 +3,14 @@ package pro.qyoga.infra.web
 import com.fasterxml.jackson.databind.ObjectMapper
 import jakarta.annotation.PostConstruct
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Lazy
 import org.thymeleaf.spring6.SpringTemplateEngine
 import org.thymeleaf.standard.StandardDialect
 import org.thymeleaf.standard.serializer.IStandardJavaScriptSerializer
 
 
 @Configuration
+@Lazy(false)
 class ThymeleafConfig(
     private val objectMapper: ObjectMapper,
     private val engine: SpringTemplateEngine

app/src/main/resources/application.yaml

@@ -106,6 +106,6 @@ trainer-advisor:
 
 logging:
   level:
-    org.springframework.security: DEBUG
+    org.springframework.security: WARN
 
 debug: false

app/src/main/resources/templates/therapist/appointments/schedule.html

@@ -92,10 +92,11 @@
 
     <div class="calendar-header bg-white z-3" id="datePickerView">
         <div class="position-relative d-inline-block">
-            <button class="btn btn-outline-secondary"
+            <button
+                    class="btn btn-outline-secondary"
                     name="datePickerButton"
-                    onclick="document.getElementById('datePicker').showPicker()"
                     th:href="@{/therapist/schedule?calendar=true&date={date}(date=${today})}"
+                    onclick="document.getElementById('datePicker').showPicker()"
             >
                 <i class="fa-solid fa-calendar"></i>
             </button>
@@ -115,11 +116,22 @@
             >
         </div>
 
-        <button class="btn btn-outline-secondary ms-2"
+        <button
+                class="btn btn-outline-secondary ms-2 position-relative"
                 data-bs-target="#settingsModal"
                 data-bs-toggle="modal"
         >
             <i class="fa-solid fa-gear"></i>
+            <i
+                    aria-hidden="true"
+                    class="sync-error-icon
+                           fa-solid fa-circle-exclamation text-danger bg-white
+                           position-absolute top-0 start-0 translate-middle
+                           "
+                    style="border-radius: 50%;"
+                    th:if="${hasSyncErrors}"
+                    title="Ошибки синхронизации"
+            ></i>
         </button>
     </div>
 </div>