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

d-r-q · d-r-q · commit b4b274062bb3 · 2025-09-19T15:56:15.000+07:00
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/oauth2/GoogleCallbackController.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/oauth2/GoogleCallbackController.kt
@@ -44,7 +44,7 @@ class GoogleOAuthController(
             .body(Map::class.java)
         val email = response
             ?.get("email") as String
-        val picture = response["picture"] as String?
+        val picture = response["picture"] as? String?
 
         googleCalendarsService.addGoogleAccount(
             GoogleAccount(therapistId, email, authorizedClient.refreshToken!!.tokenValue)
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarItem.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarItem.kt
@@ -1,17 +1,31 @@
 package pro.qyoga.core.calendar.google
 
+import pro.azhidkov.platform.java.time.toLocalDateTime
 import pro.qyoga.core.calendar.api.CalendarItem
 import java.time.Duration
-import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.temporal.Temporal
 
 @JvmInline
 value class GoogleCalendarItemId(val value: String)
 
-data class GoogleCalendarItem(
+data class GoogleCalendarItem<DATE : Temporal>(
     override val id: GoogleCalendarItemId,
     override val title: String,
     override val description: String,
-    override val dateTime: LocalDateTime,
+    override val dateTime: DATE,
     override val duration: Duration,
     override val location: String?
-) : CalendarItem<GoogleCalendarItemId, LocalDateTime>
+) : CalendarItem<GoogleCalendarItemId, DATE> {
+
+    fun toLocalizedCalendarItem(zoneId: ZoneId) =
+        GoogleCalendarItem(
+            id,
+            title,
+            description,
+            dateTime.toLocalDateTime(zoneId),
+            duration,
+            location
+        )
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarsClient.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarsClient.kt
@@ -12,7 +12,10 @@ import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
 import pro.qyoga.core.users.therapists.TherapistRef
 import java.net.URI
-import java.time.*
+import java.time.Duration
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZonedDateTime
 
 
 @Component
@@ -33,7 +36,7 @@ class GoogleCalendarsClient(
         account: GoogleAccount,
         calendarSettings: GoogleCalendarSettings,
         interval: Interval<ZonedDateTime>
-    ): List<GoogleCalendarItem> {
+    ): List<GoogleCalendarItem<ZonedDateTime>> {
         val service = servicesCache.getValue(account)
         val events =
             service.events().list(calendarSettings.calendarId)
@@ -56,11 +59,11 @@ class GoogleCalendarsClient(
         return events
     }
 
-    private fun startDate(event: Event): LocalDateTime =
+    private fun startDate(event: Event): ZonedDateTime =
         ZonedDateTime.ofInstant(
             Instant.ofEpochMilli(event.start.dateTime?.value ?: event.start.date?.value ?: 0),
             ZoneId.of(event.start.timeZone)
-        ).toLocalDateTime()
+        )
 
     private fun duration(event: Event): Duration =
         Duration.ofMillis(event.end.dateTime?.value ?: event.end.date?.value ?: 0) -
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarsService.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarsService.kt
@@ -5,6 +5,7 @@ import com.google.api.client.http.javanet.NetHttpTransport
 import com.google.api.client.json.gson.GsonFactory
 import org.springframework.stereotype.Service
 import pro.azhidkov.platform.java.time.Interval
+import pro.azhidkov.platform.java.time.zoneId
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
 import pro.qyoga.core.calendar.api.CalendarItem
 import pro.qyoga.core.calendar.api.CalendarsService
@@ -96,6 +97,7 @@ class GoogleCalendarsService(
                         googleCalendarsClient.getEvents(account, calendarSettings, interval)
                     }
             }
+            .map { it.toLocalizedCalendarItem(interval.zoneId) }
 
         return events
     }
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendar/google/GoogleCalendarsServiceTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendar/google/GoogleCalendarsServiceTest.kt
@@ -0,0 +1,53 @@
+package pro.qyoga.tests.cases.i9ns.calendar.google
+
+import io.kotest.core.annotation.DisplayName
+import io.kotest.matchers.collections.shouldHaveSize
+import io.kotest.matchers.shouldBe
+import pro.azhidkov.platform.java.time.Interval
+import pro.qyoga.core.calendar.google.GoogleCalendarsService
+import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleCalendarItem
+import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
+import pro.qyoga.tests.fixture.presets.googleCalendarFixturePresets
+import pro.qyoga.tests.infra.test_config.spring.context
+import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+
+
+@DisplayName("Сервис Google календарей")
+class GoogleCalendarsServiceTest : QYogaAppIntegrationBaseKoTest({
+
+    val googleCalendarsService = getBean<GoogleCalendarsService>()
+    val googleCalendarFixturePresets = context.googleCalendarFixturePresets()
+
+    "метод получения событий в интервале" - {
+
+        "должен возвращать события приведённые к таймзоне запрошенного интервала" {
+            // Сетап
+            googleCalendarFixturePresets.setupCalendar(
+                THE_THERAPIST_REF, GoogleCalendarObjectMother.aCalendarName(),
+                aGoogleCalendarItem(
+                    date = { ZonedDateTime.of(2025, 9, 16, 6, 0, 0, 0, ZoneId.of("Europe/Moscow")) },
+                    duration = Duration.ofMinutes(60)
+                ),
+                shouldBeShown = true
+            )
+
+            // Действие
+            val items = googleCalendarsService.findCalendarItemsInInterval(
+                THE_THERAPIST_REF,
+                Interval.of(ZonedDateTime.of(2025, 9, 16, 0, 0, 0, 0, asiaNovosibirskTimeZone), Duration.ofDays(1))
+            )
+
+            // Проверка
+            items shouldHaveSize 1
+            items.first().dateTime shouldBe LocalDateTime.of(2025, 9, 16, 10, 0, 0, 0)
+            items.first().endDateTime shouldBe LocalDateTime.of(2025, 9, 16, 11, 0, 0, 0)
+        }
+    }
+
+})
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/google/GoogleCalendarObjectMother.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/google/GoogleCalendarObjectMother.kt
@@ -1,9 +1,15 @@
 package pro.qyoga.tests.fixture.object_mothers.calendars.google
 
 import pro.qyoga.core.calendar.google.GoogleCalendar
+import pro.qyoga.core.calendar.google.GoogleCalendarItem
+import pro.qyoga.core.calendar.google.GoogleCalendarItemId
 import pro.qyoga.core.users.therapists.TherapistRef
 import pro.qyoga.tests.fixture.data.faker
 import pro.qyoga.tests.fixture.data.randomElementOf
+import pro.qyoga.tests.fixture.object_mothers.appointments.randomAppointmentDuration
+import pro.qyoga.tests.fixture.object_mothers.calendars.CalendarsObjectMother.aAppointmentEventTitle
+import java.time.Duration
+import java.time.temporal.Temporal
 
 
 object GoogleCalendarObjectMother {
@@ -18,6 +24,19 @@ object GoogleCalendarObjectMother {
         name,
     )
 
+    fun <DATE : Temporal> aGoogleCalendarItem(
+        date: () -> DATE,
+        duration: Duration = randomAppointmentDuration()
+    ) =
+        GoogleCalendarItem(
+            GoogleCalendarItemId(faker.internet().uuid()),
+            aAppointmentEventTitle(),
+            "",
+            date(),
+            duration,
+            null
+        )
+
     fun aCalendarName(): String = faker.random().randomElementOf(
         (1..10).map { faker.internet().emailAddress() } +
                 listOf(
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/GoogleCalendarFixturePresets.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/GoogleCalendarFixturePresets.kt
@@ -1,5 +1,6 @@
 package pro.qyoga.tests.fixture.presets
 
+import org.springframework.context.ApplicationContext
 import pro.qyoga.core.calendar.google.GoogleAccount
 import pro.qyoga.core.calendar.google.GoogleCalendarItem
 import pro.qyoga.core.users.therapists.TherapistRef
@@ -8,6 +9,8 @@ import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObj
 import pro.qyoga.tests.fixture.test_apis.GoogleCalendarTestApi
 import pro.qyoga.tests.fixture.wiremocks.MockGoogleCalendar
 import pro.qyoga.tests.fixture.wiremocks.MockGoogleOAuthServer
+import pro.qyoga.tests.infra.wiremock.WireMock
+import pro.qyoga.tests.platform.spring.context.getBean
 
 
 class GoogleCalendarFixturePresets(
@@ -19,7 +22,7 @@ class GoogleCalendarFixturePresets(
     fun setupCalendar(
         therapistRef: TherapistRef,
         calendarId: String,
-        vararg events: GoogleCalendarItem,
+        vararg events: GoogleCalendarItem<*>,
         shouldBeShown: Boolean = false,
     ): GoogleAccount {
         val refreshToken = "refreshToken"
@@ -34,4 +37,10 @@ class GoogleCalendarFixturePresets(
         return account
     }
 
-}
+}
+
+fun ApplicationContext.googleCalendarFixturePresets() = GoogleCalendarFixturePresets(
+    MockGoogleOAuthServer(WireMock.wiremock),
+    MockGoogleCalendar(WireMock.wiremock),
+    getBean()
+)
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockGoogleCalendar.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockGoogleCalendar.kt
@@ -1,11 +1,16 @@
 package pro.qyoga.tests.fixture.wiremocks
 
 import com.github.tomakehurst.wiremock.WireMockServer
+import com.github.tomakehurst.wiremock.client.MappingBuilder
 import com.github.tomakehurst.wiremock.client.WireMock.*
 import org.springframework.http.HttpStatus
+import org.springframework.web.util.UriUtils
 import pro.qyoga.core.calendar.google.GoogleCalendar
 import pro.qyoga.core.calendar.google.GoogleCalendarItem
 import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
+import java.nio.charset.StandardCharsets.UTF_8
+import java.time.LocalDateTime
+import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 
 /**
@@ -49,7 +54,7 @@ class MockGoogleCalendar(
         private val calendarId: String
     ) {
 
-        fun returnsEvents(vararg events: GoogleCalendarItem) {
+        fun returnsEvents(vararg events: GoogleCalendarItem<*>) {
             wiremockServer.stubFor(
                 get(
                     urlPathEqualTo("/google/calendar/v3/calendars/$calendarId/events")
@@ -82,9 +87,11 @@ private fun GoogleCalendar.toJson(): String =
         }
     """
 
-private fun GoogleCalendarItem.toJson(): String {
-    val start = dateTime.atZone(asiaNovosibirskTimeZone).format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
-    val end = endDateTime.atZone(asiaNovosibirskTimeZone).format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+private fun GoogleCalendarItem<*>.toJson(): String {
+    val start = ((dateTime as? ZonedDateTime) ?: (dateTime as LocalDateTime).atZone(asiaNovosibirskTimeZone))
+        .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    val end = ((endDateTime as? ZonedDateTime) ?: (endDateTime as LocalDateTime).atZone(asiaNovosibirskTimeZone))
+        .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
     return """
         {
             "id": "$id",

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import com.google.api.client.http.javanet.NetHttpTransport`
`5`	`5`	`import com.google.api.client.json.gson.GsonFactory`
`6`	`6`	`import org.springframework.stereotype.Service`
`7`	`7`	`import pro.azhidkov.platform.java.time.Interval`
	`8`	`+import pro.azhidkov.platform.java.time.zoneId`
`8`	`9`	`import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref`
`9`	`10`	`import pro.qyoga.core.calendar.api.CalendarItem`
`10`	`11`	`import pro.qyoga.core.calendar.api.CalendarsService`
`@@ -96,6 +97,7 @@ class GoogleCalendarsService(`
`96`	`97`	`googleCalendarsClient.getEvents(account, calendarSettings, interval)`
`97`	`98`	`}`
`98`	`99`	`}`
	`100`	`+ .map { it.toLocalizedCalendarItem(interval.zoneId) }`
`99`	`101`
`100`	`102`	`return events`
`101`	`103`	`}`