refactor/qg-290: ещё пачка мелкой полировки реализации пушей

Author: d-r-q

app/src/main/kotlin/pro/qyoga/i9ns/pushes/web/model/TherapistWebPushSubscription.kt

@@ -1,6 +1,9 @@
 package pro.qyoga.i9ns.pushes.web.model
 
+import org.simpleframework.xml.Version
+import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.Id
+import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.annotation.Transient
 import org.springframework.data.relational.core.mapping.Table
 import pro.azhidkov.platform.uuid.UUIDv7
@@ -15,9 +18,9 @@ data class TherapistWebPushSubscription(
     val subscription: WebPushSubscription,
 
     @Id val id: UUID = UUIDv7.randomUUID(),
-    val createdAt: Instant = Instant.now(),
-    val updatedAt: Instant? = null,
-    val version: Long = 0
+    @CreatedDate val createdAt: Instant = Instant.now(),
+    @LastModifiedDate val updatedAt: Instant? = null,
+    @Version val version: Long = 0
 ) {
 
     @Transient

app/src/test/kotlin/pro/qyoga/tests/cases/app/i9ns/pushes/web/DeleteSubscriptionApiTest.kt

@@ -5,6 +5,7 @@ import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import pro.qyoga.tests.clients.api.TrainerAdvisorApis
+import pro.qyoga.tests.clients.api.WebPushes
 import pro.qyoga.tests.fixture.object_mothers.pushes.web.WebPushesObjectMother.aWebPushSubscription
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 import pro.qyoga.tests.fixture.test_apis.WebPushesTestApi

app/src/test/kotlin/pro/qyoga/tests/cases/app/i9ns/pushes/web/GetWebPushesPublicKeyApiTest.kt

@@ -4,6 +4,7 @@ import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import pro.qyoga.tests.clients.api.TrainerAdvisorApis
+import pro.qyoga.tests.clients.api.WebPushes
 import pro.qyoga.tests.infra.test_config.spring.context
 import pro.qyoga.tests.infra.web.QYogaAppBaseTest
 

app/src/test/kotlin/pro/qyoga/tests/cases/app/i9ns/pushes/web/RegisterSubscriptionApiTest.kt

@@ -7,6 +7,7 @@ import io.kotest.matchers.shouldNotBe
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import pro.qyoga.tests.clients.api.TrainerAdvisorApis
+import pro.qyoga.tests.clients.api.WebPushes
 import pro.qyoga.tests.fixture.object_mothers.pushes.web.WebPushesObjectMother.aWebPushSubscription
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 import pro.qyoga.tests.fixture.test_apis.NotificationsTestApi

…clients/api/NotificationsTherapistApi.kt …ga/tests/clients/api/NotificationsApi.ktapp/src/test/kotlin/pro/qyoga/tests/clients/api/NotificationsTherapistApi.kt renamed to app/src/test/kotlin/pro/qyoga/tests/clients/api/NotificationsApi.kt app/src/test/kotlin/pro/qyoga/tests/clients/api/NotificationsTherapistApi.kt renamed to app/src/test/kotlin/pro/qyoga/tests/clients/api/NotificationsApi.kt

@@ -8,17 +8,17 @@ import pro.qyoga.app.therapist.appointments.core.schedule.settings.Notifications
 import pro.qyoga.tests.infra.web.mainWebTestClient
 import pro.qyoga.tests.platform.spring.web_test_client.getBodyAsString
 
-object Notifications {
+object NotificationsApiFactory {
 
     fun therapistApi(
         principal: Cookie,
     ) = NotificationsTherapistApi(principal, mainWebTestClient)
 
 }
 
-@Suppress("UnusedReceiverParameter", "RemoveRedundantQualifierName")
+@Suppress("UnusedReceiverParameter")
 val TrainerAdvisorApis.Notifications
-    get() = pro.qyoga.tests.clients.api.Notifications
+    get() = NotificationsApiFactory
 
 class NotificationsTherapistApi(
     override val authCookie: Cookie,

app/src/test/kotlin/pro/qyoga/tests/clients/api/TrainerAdvisorApis.kt

@@ -1,19 +1,4 @@
 package pro.qyoga.tests.clients.api
 
-import io.restassured.http.Cookie
-import pro.qyoga.tests.infra.web.mainWebTestClient
 
-
-object TrainerAdvisorApis {
-
-    object WebPushes {
-
-        val publicApi = WebPushesPublicApi(mainWebTestClient)
-
-        fun therapistApi(
-            principal: Cookie,
-        ) = WebPushesTherapistApi(principal, mainWebTestClient)
-
-    }
-
-}
+object TrainerAdvisorApis

app/src/test/kotlin/pro/qyoga/tests/clients/api/WebPushesPublicApi.kt

@@ -1,10 +1,26 @@
 package pro.qyoga.tests.clients.api
 
+import io.restassured.http.Cookie
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.reactive.server.returnResult
 import pro.qyoga.app.publc.pushes.web.PushesPublicKeyController
+import pro.qyoga.tests.infra.web.mainWebTestClient
 
 
+object WebPushesApiFactory {
+
+    val publicApi = WebPushesPublicApi(mainWebTestClient)
+
+    fun therapistApi(
+        principal: Cookie,
+    ) = WebPushesTherapistApi(principal, mainWebTestClient)
+
+}
+
+@Suppress("UnusedReceiverParameter")
+val TrainerAdvisorApis.WebPushes
+    get() = WebPushesApiFactory
+
 class WebPushesPublicApi(
     private val client: WebTestClient
 ) {

app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/clients/journal/list/ClientJournalFragment.kt

@@ -24,10 +24,10 @@ object ClientJournalFragment {
 
     fun fragmentFor(entries: List<JournalEntry>, hasMore: Boolean = false): ComponentMatcher =
         ComponentMatcher("#journal-fragment") { element ->
-        element shouldHaveComponent addEntryLink
+            element shouldHaveComponent addEntryLink
 
-        ClientJournalEntriesFragment.fragmentFor(entries, hasMore).match(element)
-    }
+            ClientJournalEntriesFragment.fragmentFor(entries, hasMore).match(element)
+        }
 
 }