refactor/qg-253: поиск CalendarItem по строковому идентификатору инкапсулирован в CalendarItemsResolver

d-r-q · d-r-q · commit 386e6f28b945 · 2025-09-25T12:00:03.000+07:00
diff --git a/app/src/main/kotlin/pro/qyoga/app/QYogaApp.kt b/app/src/main/kotlin/pro/qyoga/app/QYogaApp.kt
@@ -8,6 +8,7 @@ import pro.azhidkov.platform.spring.sdj.ErgoSdjConfig
 import pro.qyoga.app.publc.PublicAppConfig
 import pro.qyoga.app.therapist.TherapistWebAppConfig
 import pro.qyoga.core.appointments.AppointmentsConfig
+import pro.qyoga.core.calendar.gateways.CalendarGatewaysConf
 import pro.qyoga.core.clients.ClientsConfig
 import pro.qyoga.core.survey_forms.SurveyFormsSettingsConfig
 import pro.qyoga.core.therapy.TherapyConfig
@@ -35,11 +36,12 @@ import pro.qyoga.tech.captcha.CaptchaConf
     TherapyConfig::class,
     UsersConfig::class,
     SurveyFormsSettingsConfig::class,
-    ICalCalendarsConfig::class,
-    GoogleCalendarConf::class,
+    CalendarGatewaysConf::class,
 
     // I9ns
     EmailsConfig::class,
+    ICalCalendarsConfig::class,
+    GoogleCalendarConf::class,
 
     // Tech
     CaptchaConf::class,
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/CreateAppointmentPageController.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/CreateAppointmentPageController.kt
@@ -16,10 +16,10 @@ import pro.qyoga.app.publc.components.toComboBoxItem
 import pro.qyoga.app.therapist.appointments.core.edit.errors.AppointmentsIntersectionException
 import pro.qyoga.app.therapist.appointments.core.edit.ops.CreateAppointmentOp
 import pro.qyoga.app.therapist.appointments.core.edit.ops.GetAppointmentPrefillDataOp
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.edit.view_model.appointmentPageModelAndView
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController.Companion.calendarForDayWithFocus
 import pro.qyoga.core.appointments.core.commands.EditAppointmentRequest
+import pro.qyoga.core.calendar.api.SourceItem
 import pro.qyoga.core.users.auth.dtos.QyogaUserDetails
 import pro.qyoga.core.users.therapists.ref
 import java.time.LocalDateTime
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt
@@ -3,23 +3,17 @@ package pro.qyoga.app.therapist.appointments.core.edit.ops
 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.api.SourceItem
+import pro.qyoga.core.calendar.gateways.CalendarItemsResolver
 import pro.qyoga.core.users.auth.model.UserRef
 import pro.qyoga.core.users.settings.UserSettingsRepo
 import pro.qyoga.core.users.therapists.TherapistRef
-import pro.qyoga.i9ns.calendars.google.GoogleCalendar
-import pro.qyoga.i9ns.calendars.google.GoogleCalendarsService
-import pro.qyoga.i9ns.calendars.ical.ICalCalendarsRepo
-import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
 import java.time.LocalDateTime
 
 
 @Component
 class GetAppointmentPrefillDataOp(
-    private val iCalCalendarsRepo: ICalCalendarsRepo,
-    private val googleCalendarsService: GoogleCalendarsService,
+    private val calendarItemsResolver: CalendarItemsResolver,
     private val userSettingsRepo: UserSettingsRepo,
     private val timeZones: TimeZones,
 ) : (TherapistRef, SourceItem?, LocalDateTime?) -> CreateAppointmentForm {
@@ -31,16 +25,7 @@ class GetAppointmentPrefillDataOp(
     ): CreateAppointmentForm {
         val currentUserTimeZone = userSettingsRepo.getUserTimeZone(UserRef(therapistRef))
 
-        val sourceEvent = when (sourceItem?.type) {
-            ICalCalendar.Type.name ->
-                iCalCalendarsRepo.findById(therapistRef, sourceItem.icsEventId())
-
-            GoogleCalendar.Type.name ->
-                googleCalendarsService.findById(therapistRef, sourceItem.googleEventId())
-
-            else ->
-                null
-        }
+        val sourceEvent = calendarItemsResolver.findCalendarItem(therapistRef, sourceItem!!)
 
         val timeZoneTitle = timeZones.findById(currentUserTimeZone)?.displayName
 
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/view_model/SourceItem.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/view_model/SourceItem.kt
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/CalendarPageModel.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/CalendarPageModel.kt
@@ -5,7 +5,6 @@ package pro.qyoga.app.therapist.appointments.core.schedule
 import org.springframework.web.servlet.ModelAndView
 import pro.qyoga.app.therapist.appointments.core.edit.CreateAppointmentPageController
 import pro.qyoga.app.therapist.appointments.core.edit.EditAppointmentPageController
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.CLIENT_CAME_CARD
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.CLIENT_DO_NOT_CAME_CARD
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.DRAFT_CARD
@@ -18,6 +17,7 @@ import pro.qyoga.core.appointments.core.model.AppointmentStatus
 import pro.qyoga.core.appointments.core.views.LocalizedAppointmentSummary
 import pro.qyoga.core.calendar.api.CalendarItem
 import pro.qyoga.core.calendar.api.CalendarItemId
+import pro.qyoga.core.calendar.api.SourceItem
 import pro.qyoga.l10n.russianDayOfMonthLongFormat
 import pro.qyoga.l10n.russianTimeFormat
 import pro.qyoga.l10n.systemLocale
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt
@@ -22,4 +22,6 @@ interface CalendarsService<ID> {
 
     fun findById(therapistRef: TherapistRef, eventId: ID): CalendarItem<ID, ZonedDateTime>?
 
+    fun parseStringId(sourceItem: SourceItem): ID
+
 }
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/api/SourceItem.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/api/SourceItem.kt
@@ -0,0 +1,10 @@
+package pro.qyoga.core.calendar.api
+
+data class SourceItem(
+    val type: String,
+    val id: String
+) {
+
+    constructor(eventId: CalendarItemId) : this(eventId.type.name, eventId.toQueryParamStr())
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarGatewaysConf.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarGatewaysConf.kt
@@ -0,0 +1,9 @@
+package pro.qyoga.core.calendar.gateways
+
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+
+
+@ComponentScan
+@Configuration
+class CalendarGatewaysConf
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarItemsResolver.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarItemsResolver.kt
@@ -0,0 +1,28 @@
+package pro.qyoga.core.calendar.gateways
+
+import org.springframework.stereotype.Service
+import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarItemId
+import pro.qyoga.core.calendar.api.CalendarsService
+import pro.qyoga.core.calendar.api.SourceItem
+import pro.qyoga.core.users.therapists.TherapistRef
+import java.time.ZonedDateTime
+
+@Service
+class CalendarItemsResolver(
+    calendarsServices: List<CalendarsService<*>>
+) {
+
+    private val services = calendarsServices.associateBy { it.type.name }
+
+    fun findCalendarItem(
+        therapistRef: TherapistRef,
+        sourceItem: SourceItem
+    ): CalendarItem<CalendarItemId, ZonedDateTime>? {
+        @Suppress("UNCHECKED_CAST")
+        val service = services[sourceItem.type] as CalendarsService<CalendarItemId>
+        val id = service.parseStringId(sourceItem)
+        return service.findById(therapistRef, id)
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarsService.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarsService.kt
@@ -9,10 +9,7 @@ import pro.azhidkov.platform.java.time.Interval
 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.calendar.api.*
 import pro.qyoga.core.users.therapists.TherapistRef
 import java.time.ZonedDateTime
 import java.util.*
@@ -152,6 +149,9 @@ class GoogleCalendarsService(
         return googleCalendarsClient.findById(account, eventId)
     }
 
+    override fun parseStringId(sourceItem: SourceItem): GoogleCalendarItemId =
+        sourceItem.googleEventId()
+
     fun updateCalendarSettings(
         therapist: TherapistRef,
         googleAccount: GoogleAccountRef,
@@ -162,3 +162,10 @@ class GoogleCalendarsService(
     }
 
 }
+
+fun SourceItem.googleEventId(): GoogleCalendarItemId {
+    check(type == GoogleCalendar.Type.name)
+    val matcher = "(.+),(.+)".toRegex().matchEntire(id)
+    check(matcher != null)
+    return GoogleCalendarItemId(matcher.groups[1]!!.value, matcher.groups[2]!!.value)
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsRepo.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsRepo.kt
@@ -4,10 +4,7 @@ import org.slf4j.LoggerFactory
 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.calendar.api.*
 import pro.qyoga.core.users.therapists.TherapistRef
 import pro.qyoga.i9ns.calendars.ical.commands.CreateICalRq
 import pro.qyoga.i9ns.calendars.ical.commands.createFrom
@@ -55,6 +52,9 @@ class ICalCalendarsRepo(
             ?.toICalCalendarItem()
     }
 
+    override fun parseStringId(sourceItem: SourceItem): ICalEventId =
+        sourceItem.icsEventId()
+
 
     @Scheduled(cron = "0 */10 * * * *")
     fun sync() {
@@ -71,3 +71,12 @@ private fun ICalCalendar.localizedICalCalendarItemsIn(
 ): List<LocalizedICalCalendarItem> =
     (this.calendarItemsIn(interval) ?: emptyList())
         .map(ICalCalendarItem::toLocalizedICalCalendarItem)
+
+fun SourceItem.icsEventId(): ICalEventId {
+    check(type == ICalCalendar.Type.name)
+    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)
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt
@@ -7,7 +7,7 @@ import org.springframework.http.HttpStatus
 import pro.azhidkov.platform.java.time.toLocalTimeString
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
 import pro.qyoga.app.therapist.appointments.core.edit.forms.formatCommentFor
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
+import pro.qyoga.core.calendar.api.SourceItem
 import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
 import pro.qyoga.tests.assertions.shouldBePage
 import pro.qyoga.tests.assertions.shouldHave
@@ -167,7 +167,7 @@ class CreateAppointmentPageTest : QYogaAppIntegrationBaseTest() {
         // Действие
         val document = theTherapist.appointments.getCreateAppointmentPage(
             dateTime = event.dateTime.toLocalDateTime(),
-            sourceItem = SourceItem.icsEvent(event.id)
+            sourceItem = SourceItem(event.id)
         )
 
         // Проверка
@@ -190,7 +190,7 @@ class CreateAppointmentPageTest : QYogaAppIntegrationBaseTest() {
         // Действие
         val document = theTherapist.appointments.getCreateAppointmentPage(
             dateTime = event.dateTime.toLocalDateTime(),
-            sourceItem = SourceItem.googleEvent(event.id)
+            sourceItem = SourceItem(event.id)
         )
 
         // Проверка
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt
@@ -21,7 +21,7 @@ class TherapistClient(
 ) {
 
     // Work
-    val appointments = TherapistAppointmentsApi(authCookie, webTestClient)
+    val appointments = TherapistAppointmentsApi(authCookie)
     val googleCalendarIntegration = TherapistGoogleCalendarIntegrationApi(authCookie, webTestClient)
     val clients = TherapistClientsApi(authCookie)
     val clientJournal = TherapistClientJournalApi(authCookie)
@@ -61,4 +61,4 @@ class TherapistClient(
 
     }
 
-}
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistAppointmentsApi.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistAppointmentsApi.kt
@@ -11,24 +11,22 @@ import org.hamcrest.CoreMatchers.nullValue
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.springframework.http.HttpStatus
-import org.springframework.test.web.reactive.server.WebTestClient
 import pro.azhidkov.platform.java.time.toLocalTimeString
 import pro.qyoga.app.therapist.appointments.core.edit.CreateAppointmentPageController
 import pro.qyoga.app.therapist.appointments.core.edit.EditAppointmentPageController
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController
 import pro.qyoga.core.appointments.core.commands.EditAppointmentRequest
 import pro.qyoga.core.appointments.core.model.AppointmentRef
+import pro.qyoga.core.calendar.api.SourceItem
 import pro.qyoga.tests.pages.therapist.appointments.CreateAppointmentPage
 import pro.qyoga.tests.pages.therapist.appointments.EditAppointmentPage
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 class TherapistAppointmentsApi(
-    override val authCookie: Cookie,
-    private val webTestClient: WebTestClient
+    override val authCookie: Cookie
 ) : AuthorizedApi {
 
     fun getScheduleForDay(date: LocalDate? = null, appointmentToFocus: AppointmentRef? = null): Document {
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt
@@ -9,13 +9,13 @@ import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.resolveOrThrow
 import pro.qyoga.app.therapist.appointments.core.edit.CreateAppointmentPageController
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard
 import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController
 import pro.qyoga.app.therapist.appointments.core.schedule.TimeMark
 import pro.qyoga.core.appointments.core.commands.EditAppointmentRequest
 import pro.qyoga.core.appointments.core.model.Appointment
+import pro.qyoga.core.calendar.api.SourceItem
 import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
 import pro.qyoga.l10n.russianTimeFormat
 import pro.qyoga.tests.assertions.*
@@ -95,7 +95,7 @@ infix fun Element.shouldMatch(localizedICalCalendarItem: ICalCalendarItem) {
         "editAppointmentLink",
         CreateAppointmentPageController.addFromSourceItemUri(
             localizedICalCalendarItem.dateTime.toLocalDateTime(),
-            SourceItem.icsEvent(localizedICalCalendarItem.id)
+            SourceItem(localizedICalCalendarItem.id)
         ),
         localizedICalCalendarItem.title + " " +
                 russianTimeFormat.format(localizedICalCalendarItem.dateTime) + " - " + russianTimeFormat.format(

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,6 @@ interface CalendarsService<ID> {`
`22`	`22`
`23`	`23`	`fun findById(therapistRef: TherapistRef, eventId: ID): CalendarItem<ID, ZonedDateTime>?`
`24`	`24`
	`25`	`+ fun parseStringId(sourceItem: SourceItem): ID`
	`26`	`+`
`25`	`27`	`}`