refactor/qg-253: типы календарей переведены со строк на типы

Author: d-r-q

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

@@ -32,10 +32,10 @@ class GetAppointmentPrefillDataOp(
         val currentUserTimeZone = userSettingsRepo.getUserTimeZone(UserRef(therapistRef))
 
         val sourceEvent = when (sourceItem?.type) {
-            ICalCalendar.TYPE ->
+            ICalCalendar.Type.name ->
                 iCalCalendarsRepo.findById(therapistRef, sourceItem.icsEventId())
 
-            GoogleCalendar.TYPE ->
+            GoogleCalendar.Type.name ->
                 googleCalendarsService.findById(therapistRef, sourceItem.googleEventId())
 
             else ->

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

@@ -11,11 +11,11 @@ data class SourceItem(
     val id: String
 ) {
 
-    constructor(eventId: CalendarItemId) : this(eventId.type, eventId.toQueryParamStr())
+    constructor(eventId: CalendarItemId) : this(eventId.type.name, eventId.toQueryParamStr())
 
     companion object {
         fun icsEvent(eventId: ICalEventId): SourceItem =
-            SourceItem(ICalCalendar.TYPE, eventId.toQueryParamStr())
+            SourceItem(ICalCalendar.Type.name, eventId.toQueryParamStr())
 
         fun googleEvent(eventId: GoogleCalendarItemId): SourceItem =
             SourceItem("Google", eventId.toQueryParamStr())
@@ -25,7 +25,7 @@ data class SourceItem(
 }
 
 fun SourceItem.icsEventId(): ICalEventId {
-    check(type == ICalCalendar.TYPE)
+    check(type == ICalCalendar.Type.name)
     val matcher = "uid=(.+),rid=(.*)".toRegex().matchEntire(id)
     check(matcher != null)
     val uid = matcher.groups[1]!!.value
@@ -34,7 +34,7 @@ fun SourceItem.icsEventId(): ICalEventId {
 }
 
 fun SourceItem.googleEventId(): GoogleCalendarItemId {
-    check(type == GoogleCalendar.TYPE)
+    check(type == GoogleCalendar.Type.name)
     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/calendar/api/Calendar.kt

@@ -6,5 +6,5 @@ import pro.qyoga.core.users.therapists.TherapistRef
 interface Calendar {
     val ownerRef: TherapistRef
     val name: String
-    val type: String
-}
+    val type: CalendarType
+}

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

@@ -5,7 +5,7 @@ import java.time.temporal.Temporal
 
 interface CalendarItemId {
 
-    val type: String
+    val type: CalendarType
 
     fun toQueryParamStr(): String
 

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

@@ -0,0 +1,8 @@
+package pro.qyoga.core.calendar.api
+
+
+interface CalendarType {
+
+    val name: String
+
+}

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

@@ -13,6 +13,8 @@ data class SearchResult<ID>(
 
 interface CalendarsService<ID> {
 
+    val type: CalendarType
+
     fun findCalendarItemsInInterval(
         therapist: TherapistRef,
         interval: Interval<ZonedDateTime>

app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendar.kt

@@ -1,6 +1,7 @@
 package pro.qyoga.i9ns.calendars.google
 
 import pro.qyoga.core.calendar.api.Calendar
+import pro.qyoga.core.calendar.api.CalendarType
 import pro.qyoga.core.users.therapists.TherapistRef
 
 
@@ -10,11 +11,10 @@ data class GoogleCalendar(
     override val name: String,
 ) : Calendar {
 
-    override val type: String = TYPE
+    override val type: CalendarType = Type
 
-    companion object {
-
-        const val TYPE = "Google"
+    object Type : CalendarType {
+        override val name = "Google"
     }
 
 }

app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarItem.kt

@@ -3,16 +3,18 @@ package pro.qyoga.i9ns.calendars.google
 import pro.azhidkov.platform.java.time.toLocalDateTime
 import pro.qyoga.core.calendar.api.CalendarItem
 import pro.qyoga.core.calendar.api.CalendarItemId
+import pro.qyoga.core.calendar.api.CalendarType
 import java.time.Duration
 import java.time.ZoneId
 import java.time.temporal.Temporal
 
+
 data class GoogleCalendarItemId(
     val calendarId: String,
     val itemId: String
 ) : CalendarItemId {
 
-    override val type: String = GoogleCalendar.TYPE
+    override val type: CalendarType = GoogleCalendar.Type
 
     override fun toQueryParamStr(): String =
         "$calendarId,$itemId"

app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarsService.kt

@@ -10,6 +10,7 @@ import pro.azhidkov.platform.java.time.zoneId
 import pro.azhidkov.platform.kotlin.tryExecute
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
 import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarType
 import pro.qyoga.core.calendar.api.CalendarsService
 import pro.qyoga.core.calendar.api.SearchResult
 import pro.qyoga.core.users.therapists.TherapistRef
@@ -81,6 +82,8 @@ class GoogleCalendarsService(
     private val googleCalendarsClient: GoogleCalendarsClient,
 ) : CalendarsService<GoogleCalendarItemId> {
 
+    override val type: CalendarType = GoogleCalendar.Type
+
     private val executor = VirtualThreadExecutor("google-calendar-events-fetcher")
 
     fun addGoogleAccount(googleAccount: GoogleAccount) {

app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsRepo.kt

@@ -5,6 +5,7 @@ import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
 import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarType
 import pro.qyoga.core.calendar.api.CalendarsService
 import pro.qyoga.core.calendar.api.SearchResult
 import pro.qyoga.core.users.therapists.TherapistRef
@@ -24,6 +25,8 @@ class ICalCalendarsRepo(
 
     private val log = LoggerFactory.getLogger(javaClass)
 
+    override val type: CalendarType = ICalCalendar.Type
+
     fun addICal(createICalRq: CreateICalRq): ICalCalendar {
         val icsData = createICalRq.icsUrl.readText()
         val ical = ICalCalendar.createFrom(createICalRq, icsData)