refactor/qg-253: LocalizedICalCalendarItem удалён в пользу генерализации ICalCalendarItem

Author: d-r-q

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

@@ -15,6 +15,7 @@ import pro.qyoga.i9ns.calendars.ical.ical4j.toICalCalendarItem
 import pro.qyoga.i9ns.calendars.ical.model.*
 import pro.qyoga.i9ns.calendars.ical.persistance.ICalCalendarsDao
 import pro.qyoga.i9ns.calendars.ical.persistance.findAllByOwner
+import java.time.LocalDateTime
 import java.time.ZonedDateTime
 
 
@@ -71,6 +72,6 @@ class ICalCalendarsRepo(
 
 private fun ICalCalendar.localizedICalCalendarItemsIn(
     interval: Interval<ZonedDateTime>,
-): List<LocalizedICalCalendarItem> =
+): List<ICalCalendarItem<LocalDateTime>> =
     (this.calendarItemsIn(interval) ?: emptyList())
-        .map(ICalCalendarItem::toLocalizedICalCalendarItem)
+        .map { it.toLocalizedICalCalendarItem() }

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

@@ -55,10 +55,10 @@ val VEvent.geographicsPosOrNull: String?
 val VEvent.locationOrNull: String?
     get() = this.location?.value
 
-fun VEvent.toICalCalendarItem(): ICalCalendarItem =
+fun VEvent.toICalCalendarItem(): ICalCalendarItem<ZonedDateTime> =
     toICalCalendarItem(Period(startDateTime, startDateTime + javaDuration))
 
-fun VEvent.toICalCalendarItem(period: Period<ZonedDateTime>): ICalCalendarItem = ICalCalendarItem(
+fun VEvent.toICalCalendarItem(period: Period<ZonedDateTime>): ICalCalendarItem<ZonedDateTime> = ICalCalendarItem(
     id,
     title,
     descriptionOrNull ?: "",

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

@@ -62,7 +62,7 @@ fun ICalCalendar.findById(eventId: ICalEventId) =
 
 fun ICalCalendar.calendarItemsIn(
     interval: Interval<ZonedDateTime>
-): List<ICalCalendarItem>? =
+): List<ICalCalendarItem<ZonedDateTime>>? =
     vEvents()
         ?.flatMap { ve: VEvent ->
             ve.calculateRecurrenceSet<ZonedDateTime>(interval.toICalPeriod())

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

@@ -2,20 +2,22 @@ package pro.qyoga.i9ns.calendars.ical.model
 
 import pro.qyoga.core.calendar.api.CalendarItem
 import java.time.Duration
+import java.time.LocalDateTime
 import java.time.ZonedDateTime
+import java.time.temporal.Temporal
 
 
-data class ICalCalendarItem(
+data class ICalCalendarItem<DATE : Temporal>(
     override val id: ICalEventId,
     override val title: String,
     override val description: String,
-    override val dateTime: ZonedDateTime,
+    override val dateTime: DATE,
     override val duration: Duration,
     override val location: String?
-) : CalendarItem<ICalEventId, ZonedDateTime>
+) : CalendarItem<ICalEventId, DATE>
 
-fun ICalCalendarItem.toLocalizedICalCalendarItem(): LocalizedICalCalendarItem =
-    LocalizedICalCalendarItem(
+fun ICalCalendarItem<ZonedDateTime>.toLocalizedICalCalendarItem(): ICalCalendarItem<LocalDateTime> =
+    ICalCalendarItem(
         this.id,
         this.title,
         this.description,

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

@@ -28,10 +28,7 @@ import pro.qyoga.tests.pages.therapist.appointments.CreateAppointmentForm
 import pro.qyoga.tests.pages.therapist.appointments.CreateAppointmentPage
 import pro.qyoga.tests.pages.therapist.appointments.EditAppointmentForm
 import pro.qyoga.tests.platform.instancio.KSelect.Companion.field
-import java.time.Duration
-import java.time.LocalDate
-import java.time.LocalTime
-import java.time.ZoneId
+import java.time.*
 import java.time.temporal.ChronoUnit
 import java.util.*
 
@@ -157,9 +154,12 @@ class CreateAppointmentPageTest : QYogaAppIntegrationBaseTest() {
     fun createAppointmentWithIcsEventId() {
         // Сетап
         val event = aCalendarItem {
-            set(field(ICalCalendarItem::dateTime), randomAppointmentDate().atZone(asiaNovosibirskTimeZone))
-            set(field(ICalCalendarItem::duration), Duration.ofMinutes(75))
-            set(field(ICalCalendarItem::description), randomSentence())
+            set(
+                field(ICalCalendarItem<ZonedDateTime>::dateTime),
+                randomAppointmentDate().atZone(asiaNovosibirskTimeZone)
+            )
+            set(field(ICalCalendarItem<ZonedDateTime>::duration), Duration.ofMinutes(75))
+            set(field(ICalCalendarItem<ZonedDateTime>::description), randomSentence())
         }
         iCalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(event)
 

app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt

@@ -24,6 +24,7 @@ import pro.qyoga.tests.pages.therapist.appointments.appointmentCards
 import pro.qyoga.tests.pages.therapist.appointments.shouldMatch
 import pro.qyoga.tests.platform.instancio.KSelect.Companion.field
 import java.time.LocalDate
+import java.time.ZonedDateTime
 
 
 @DisplayName("Страница календаря")
@@ -115,8 +116,11 @@ class SchedulePageTest : QYogaAppIntegrationBaseTest() {
         // Сетап
         val today = LocalDate.now()
         val event = aCalendarItem {
-            set(field(ICalCalendarItem::dateTime), today.atTime(randomWorkingTime()).atZone(asiaNovosibirskTimeZone))
-            set(field(ICalCalendarItem::duration), AppointmentsObjectMother.fullCardDuration)
+            set(
+                field(ICalCalendarItem<ZonedDateTime>::dateTime),
+                today.atTime(randomWorkingTime()).atZone(asiaNovosibirskTimeZone)
+            )
+            set(field(ICalCalendarItem<ZonedDateTime>::duration), AppointmentsObjectMother.fullCardDuration)
         }
 
         ICalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(event)

app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageTest.kt

@@ -11,6 +11,7 @@ import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 import pro.qyoga.tests.fixture.presets.ICalsCalendarsFixturePresets
 import pro.qyoga.tests.infra.web.QYogaAppBaseKoTest
 import pro.qyoga.tests.platform.instancio.KSelect.Companion.field
+import java.time.ZonedDateTime
 
 
 @DisplayName("Репозиторий ical-календарей")
@@ -25,7 +26,7 @@ class ICalCalendarsRepoTest : QYogaAppBaseKoTest({
             val iCalEvent = aCalendarItem()
             val iCal = getBean<ICalsCalendarsFixturePresets>().createICalCalendarWithSingleEvent(iCalEvent)
             val updatedEvent = aCalendarItem {
-                set(field(ICalCalendarItem::id), iCalEvent.id)
+                set(field(ICalCalendarItem<ZonedDateTime>::id), iCalEvent.id)
             }
             getBean<ICalCalendarsBackgrounds>().updateICalSource(
                 iCal.icsUrl,

app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarsRepoTest.kt

@@ -2,6 +2,7 @@ package pro.qyoga.tests.fixture.object_mothers.calendars
 
 import org.instancio.Instancio
 import org.instancio.InstancioApi
+import org.instancio.Model
 import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
 import pro.qyoga.i9ns.calendars.ical.model.ICalEventId
 import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
@@ -11,23 +12,30 @@ import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMot
 import pro.qyoga.tests.fixture.object_mothers.appointments.randomAppointmentDate
 import pro.qyoga.tests.platform.instancio.KSelect.Companion.field
 import pro.qyoga.tests.platform.instancio.generateBy
+import java.time.ZonedDateTime
 
 
 object CalendarsObjectMother {
 
-    private val aCalendarItemModel = Instancio.of(ICalCalendarItem::class.java)
+    @Suppress("UNCHECKED_CAST")
+    private val aCalendarItemModel: Model<ICalCalendarItem<ZonedDateTime>> = Instancio.of(ICalCalendarItem::class.java)
+        .withTypeParameters(ZonedDateTime::class.java)
         .run {
-            generateBy(field(ICalCalendarItem::id)) { aICalEventId() }
-            generateBy(field(ICalCalendarItem::title)) { aAppointmentEventTitle() }
-            generateBy(field(ICalCalendarItem::dateTime)) { randomAppointmentDate().atZone(asiaNovosibirskTimeZone) }
-            generateBy(field(ICalCalendarItem::duration)) { AppointmentsObjectMother.fullCardDuration }
+            generateBy(field(ICalCalendarItem<ZonedDateTime>::id)) { aICalEventId() }
+            generateBy(field(ICalCalendarItem<ZonedDateTime>::title)) { aAppointmentEventTitle() }
+            generateBy(field(ICalCalendarItem<ZonedDateTime>::dateTime)) {
+                randomAppointmentDate().atZone(
+                    asiaNovosibirskTimeZone
+                )
+            }
+            generateBy(field(ICalCalendarItem<ZonedDateTime>::duration)) { AppointmentsObjectMother.fullCardDuration }
         }
         .withSeed(faker.random().nextLong())
-        .toModel()
+        .toModel() as Model<ICalCalendarItem<ZonedDateTime>>
 
     fun aICalEventId() = ICalEventId(faker.internet().uuid().toString())
 
-    fun aCalendarItem(configureInstance: InstancioApi<ICalCalendarItem>.() -> InstancioApi<ICalCalendarItem> = { this }): ICalCalendarItem {
+    fun aCalendarItem(configureInstance: InstancioApi<ICalCalendarItem<ZonedDateTime>>.() -> InstancioApi<ICalCalendarItem<ZonedDateTime>> = { this }): ICalCalendarItem<ZonedDateTime> {
         return Instancio.of(aCalendarItemModel).run {
             this.configureInstance()
         }

app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/CalendarsObjectMother.kt

@@ -16,6 +16,7 @@ import pro.qyoga.tests.fixture.object_mothers.calendars.CalendarsObjectMother
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 import java.io.StringWriter
 import java.net.URI
+import java.time.ZonedDateTime
 import java.time.temporal.Temporal
 
 
@@ -30,14 +31,14 @@ object ICalCalendarsObjectMother {
         )
     }
 
-    fun aIcsFile(event: ICalCalendarItem): String {
+    fun aIcsFile(event: ICalCalendarItem<ZonedDateTime>): String {
         val calendar = aICalCalendar(event)
         val icsFile = StringWriter()
         CalendarOutputter().output(calendar, icsFile)
         return icsFile.toString()
     }
 
-    fun aICalCalendar(event: ICalCalendarItem): Calendar {
+    fun aICalCalendar(event: ICalCalendarItem<ZonedDateTime>): Calendar {
         val calendar = Calendar()
             .withProdId("-//azhidkov.pro//Trainer Advisor Tests//RU")
             .withDefaults()