style/qg-253: Добавлен алиас для ICalCalendarItem<ZonedDateTime>

Author: d-r-q

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

@@ -8,6 +8,7 @@ import net.fortuna.ical4j.model.property.RecurrenceId
 import pro.azhidkov.platform.java.time.toLocalDateTime
 import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
 import pro.qyoga.i9ns.calendars.ical.model.ICalEventId
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import java.time.Duration
 import java.time.ZoneId
 import java.time.ZonedDateTime
@@ -55,10 +56,10 @@ val VEvent.geographicsPosOrNull: String?
 val VEvent.locationOrNull: String?
     get() = this.location?.value
 
-fun VEvent.toICalCalendarItem(): ICalCalendarItem<ZonedDateTime> =
+fun VEvent.toICalCalendarItem(): ICalZonedCalendarItem =
     toICalCalendarItem(Period(startDateTime, startDateTime + javaDuration))
 
-fun VEvent.toICalCalendarItem(period: Period<ZonedDateTime>): ICalCalendarItem<ZonedDateTime> = ICalCalendarItem(
+fun VEvent.toICalCalendarItem(period: Period<ZonedDateTime>): ICalZonedCalendarItem = 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<ZonedDateTime>>? =
+): List<ICalZonedCalendarItem>? =
     vEvents()
         ?.flatMap { ve: VEvent ->
             ve.calculateRecurrenceSet<ZonedDateTime>(interval.toICalPeriod())

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

@@ -7,6 +7,8 @@ import java.time.ZonedDateTime
 import java.time.temporal.Temporal
 
 
+typealias ICalZonedCalendarItem = ICalCalendarItem<ZonedDateTime>
+
 data class ICalCalendarItem<DATE : Temporal>(
     override val id: ICalEventId,
     override val title: String,
@@ -16,7 +18,7 @@ data class ICalCalendarItem<DATE : Temporal>(
     override val location: String?
 ) : CalendarItem<ICalEventId, DATE>
 
-fun ICalCalendarItem<ZonedDateTime>.toLocalizedICalCalendarItem(): ICalCalendarItem<LocalDateTime> =
+fun ICalZonedCalendarItem.toLocalizedICalCalendarItem(): ICalCalendarItem<LocalDateTime> =
     ICalCalendarItem(
         this.id,
         this.title,

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.i9ns.calendars.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.tests.assertions.shouldBePage
 import pro.qyoga.tests.assertions.shouldHave
 import pro.qyoga.tests.assertions.shouldHaveElement
@@ -28,7 +28,10 @@ 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.*
+import java.time.Duration
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.ZoneId
 import java.time.temporal.ChronoUnit
 import java.util.*
 
@@ -155,11 +158,11 @@ class CreateAppointmentPageTest : QYogaAppIntegrationBaseTest() {
         // Сетап
         val event = aCalendarItem {
             set(
-                field(ICalCalendarItem<ZonedDateTime>::dateTime),
+                field(ICalZonedCalendarItem::dateTime),
                 randomAppointmentDate().atZone(asiaNovosibirskTimeZone)
             )
-            set(field(ICalCalendarItem<ZonedDateTime>::duration), Duration.ofMinutes(75))
-            set(field(ICalCalendarItem<ZonedDateTime>::description), randomSentence())
+            set(field(ICalZonedCalendarItem::duration), Duration.ofMinutes(75))
+            set(field(ICalZonedCalendarItem::description), randomSentence())
         }
         iCalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(event)
 

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

@@ -6,7 +6,7 @@ import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
-import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.tests.assertions.SelectorOnlyComponent
 import pro.qyoga.tests.assertions.shouldBePage
 import pro.qyoga.tests.assertions.shouldHaveComponent
@@ -25,7 +25,6 @@ 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("Страница календаря")
@@ -118,10 +117,10 @@ class SchedulePageTest : QYogaAppIntegrationBaseTest() {
         val today = LocalDate.now()
         val event = aCalendarItem {
             set(
-                field(ICalCalendarItem<ZonedDateTime>::dateTime),
+                field(ICalZonedCalendarItem::dateTime),
                 today.atTime(randomWorkingTime()).atZone(asiaNovosibirskTimeZone)
             )
-            set(field(ICalCalendarItem<ZonedDateTime>::duration), AppointmentsObjectMother.fullCardDuration)
+            set(field(ICalZonedCalendarItem::duration), AppointmentsObjectMother.fullCardDuration)
         }
 
         ICalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(event)

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

@@ -3,15 +3,14 @@ package pro.qyoga.tests.cases.core.calendar.ical
 import io.kotest.core.annotation.DisplayName
 import io.kotest.matchers.shouldBe
 import pro.qyoga.i9ns.calendars.ical.ICalCalendarsRepo
-import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.tests.fixture.backgrounds.ICalCalendarsBackgrounds
 import pro.qyoga.tests.fixture.object_mothers.calendars.CalendarsObjectMother.aCalendarItem
 import pro.qyoga.tests.fixture.object_mothers.calendars.ical.ICalCalendarsObjectMother
 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-календарей")
@@ -26,7 +25,7 @@ class ICalCalendarsRepoTest : QYogaAppBaseKoTest({
             val iCalEvent = aCalendarItem()
             val iCal = getBean<ICalsCalendarsFixturePresets>().createICalCalendarWithSingleEvent(iCalEvent)
             val updatedEvent = aCalendarItem {
-                set(field(ICalCalendarItem<ZonedDateTime>::id), iCalEvent.id)
+                set(field(ICalZonedCalendarItem::id), iCalEvent.id)
             }
             getBean<ICalCalendarsBackgrounds>().updateICalSource(
                 iCal.icsUrl,

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

@@ -5,6 +5,7 @@ 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.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
 import pro.qyoga.tests.fixture.data.faker
 import pro.qyoga.tests.fixture.data.randomElementOf
@@ -18,24 +19,24 @@ import java.time.ZonedDateTime
 object CalendarsObjectMother {
 
     @Suppress("UNCHECKED_CAST")
-    private val aCalendarItemModel: Model<ICalCalendarItem<ZonedDateTime>> = Instancio.of(ICalCalendarItem::class.java)
+    private val aCalendarItemModel: Model<ICalZonedCalendarItem> = Instancio.of(ICalCalendarItem::class.java)
         .withTypeParameters(ZonedDateTime::class.java)
         .run {
-            generateBy(field(ICalCalendarItem<ZonedDateTime>::id)) { aICalEventId() }
-            generateBy(field(ICalCalendarItem<ZonedDateTime>::title)) { aAppointmentEventTitle() }
-            generateBy(field(ICalCalendarItem<ZonedDateTime>::dateTime)) {
+            generateBy(field(ICalZonedCalendarItem::id)) { aICalEventId() }
+            generateBy(field(ICalZonedCalendarItem::title)) { aAppointmentEventTitle() }
+            generateBy(field(ICalZonedCalendarItem::dateTime)) {
                 randomAppointmentDate().atZone(
                     asiaNovosibirskTimeZone
                 )
             }
-            generateBy(field(ICalCalendarItem<ZonedDateTime>::duration)) { AppointmentsObjectMother.fullCardDuration }
+            generateBy(field(ICalZonedCalendarItem::duration)) { AppointmentsObjectMother.fullCardDuration }
         }
         .withSeed(faker.random().nextLong())
-        .toModel() as Model<ICalCalendarItem<ZonedDateTime>>
+        .toModel() as Model<ICalZonedCalendarItem>
 
     fun aICalEventId() = ICalEventId(faker.internet().uuid().toString())
 
-    fun aCalendarItem(configureInstance: InstancioApi<ICalCalendarItem<ZonedDateTime>>.() -> InstancioApi<ICalCalendarItem<ZonedDateTime>> = { this }): ICalCalendarItem<ZonedDateTime> {
+    fun aCalendarItem(configureInstance: InstancioApi<ICalZonedCalendarItem>.() -> InstancioApi<ICalZonedCalendarItem> = { this }): ICalZonedCalendarItem {
         return Instancio.of(aCalendarItemModel).run {
             this.configureInstance()
         }

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

@@ -10,13 +10,12 @@ import net.fortuna.ical4j.model.property.RecurrenceId
 import net.fortuna.ical4j.model.property.Uid
 import pro.azhidkov.platform.kotlin.ifNotNull
 import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
-import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.tests.fixture.data.faker
 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
 
 
@@ -31,14 +30,14 @@ object ICalCalendarsObjectMother {
         )
     }
 
-    fun aIcsFile(event: ICalCalendarItem<ZonedDateTime>): String {
+    fun aIcsFile(event: ICalZonedCalendarItem): String {
         val calendar = aICalCalendar(event)
         val icsFile = StringWriter()
         CalendarOutputter().output(calendar, icsFile)
         return icsFile.toString()
     }
 
-    fun aICalCalendar(event: ICalCalendarItem<ZonedDateTime>): Calendar {
+    fun aICalCalendar(event: ICalZonedCalendarItem): Calendar {
         val calendar = Calendar()
             .withProdId("-//azhidkov.pro//Trainer Advisor Tests//RU")
             .withDefaults()

app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ICalsCalendarsFixturePresets.kt

@@ -2,11 +2,10 @@ package pro.qyoga.tests.fixture.presets
 
 import org.springframework.stereotype.Component
 import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
-import pro.qyoga.i9ns.calendars.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.tests.fixture.backgrounds.ICalCalendarsBackgrounds
 import pro.qyoga.tests.fixture.object_mothers.calendars.ical.ICalCalendarsObjectMother.aIcsFile
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
-import java.time.ZonedDateTime
 
 
 @Component
@@ -15,7 +14,7 @@ class ICalsCalendarsFixturePresets(
 ) {
 
     fun createICalCalendarWithSingleEvent(
-        event: ICalCalendarItem<ZonedDateTime>,
+        event: ICalZonedCalendarItem,
     ): ICalCalendar {
         val icsFile = aIcsFile(event)
 

app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt

@@ -15,14 +15,13 @@ import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel
 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.i9ns.calendars.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalZonedCalendarItem
 import pro.qyoga.l10n.russianTimeFormat
 import pro.qyoga.tests.assertions.*
 import pro.qyoga.tests.pages.therapist.appointments.CalendarPage.APPOINTMENT_CARD_SELECTOR
 import pro.qyoga.tests.pages.therapist.appointments.google_calendars.GoogleCalendarsSettingsLoaderComponent
 import pro.qyoga.tests.platform.html.*
 import java.time.LocalTime
-import java.time.ZonedDateTime
 
 
 object CalendarPage : HtmlPage {
@@ -91,7 +90,7 @@ infix fun Element.shouldMatch(app: EditAppointmentRequest) {
         .single() shouldHaveClass AppointmentCard.appointmentStatusClasses[app.appointmentStatus]!!
 }
 
-infix fun Element.shouldMatch(localizedICalCalendarItem: ICalCalendarItem<ZonedDateTime>) {
+infix fun Element.shouldMatch(localizedICalCalendarItem: ICalZonedCalendarItem) {
     this shouldHaveComponent Link(
         "editAppointmentLink",
         CreateAppointmentPageController.addFromSourceItemUri(