refactor/qg-290: код настроек гугл-календарей перенесён в schedule.settings

Author: d-r-q

…dule/GoogleCalendarSettingsController.kt …ings/GoogleCalendarSettingsController.ktapp/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsController.kt renamed to app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/settings/GoogleCalendarSettingsController.kt app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsController.kt renamed to app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/settings/GoogleCalendarSettingsController.kt

@@ -1,4 +1,4 @@
-package pro.qyoga.app.therapist.appointments.core.schedule
+package pro.qyoga.app.therapist.appointments.core.schedule.settings
 
 import org.springframework.http.HttpStatus
 import org.springframework.security.core.annotation.AuthenticationPrincipal
@@ -41,7 +41,7 @@ class GoogleCalendarSettingsController(
 
         fun updateCalendarSettingsPath(googleAccount: GoogleAccountRef, calendarId: String): String =
             UPDATE_CALENDAR_SETTINGS_PATH
-                .replace("{googleAccount}", googleAccount.id?.toString() ?: "")
+                .replace("{googleAccount}", googleAccount.id.toString())
                 .replace("{calendarId}", calendarId)
 
     }

…edule/GoogleCalendarSettingsPageModel.kt …tings/GoogleCalendarSettingsPageModel.ktapp/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsPageModel.kt renamed to app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/settings/GoogleCalendarSettingsPageModel.kt app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsPageModel.kt renamed to app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/settings/GoogleCalendarSettingsPageModel.kt

@@ -1,4 +1,4 @@
-package pro.qyoga.app.therapist.appointments.core.schedule
+package pro.qyoga.app.therapist.appointments.core.schedule.settings
 
 import org.springframework.web.servlet.ModelAndView
 import pro.qyoga.i9ns.calendars.google.views.GoogleAccountCalendarsSettingsView

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

@@ -6,7 +6,7 @@ import org.jsoup.nodes.Document
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.web.reactive.function.BodyInserters.fromValue
-import pro.qyoga.app.therapist.appointments.core.schedule.GoogleCalendarSettingsController
+import pro.qyoga.app.therapist.appointments.core.schedule.settings.GoogleCalendarSettingsController
 import pro.qyoga.i9ns.calendars.google.model.GoogleAccountRef
 import pro.qyoga.tests.platform.spring.web_test_client.getBodyAsString
 import pro.qyoga.tests.platform.spring.web_test_client.redirectLocation

app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/GoogleCalendarTestApi.kt

@@ -1,7 +1,7 @@
 package pro.qyoga.tests.fixture.test_apis
 
 import org.springframework.stereotype.Component
-import pro.qyoga.app.therapist.appointments.core.schedule.GoogleCalendarSettingsController
+import pro.qyoga.app.therapist.appointments.core.schedule.settings.GoogleCalendarSettingsController
 import pro.qyoga.core.users.therapists.TherapistRef
 import pro.qyoga.i9ns.calendars.google.GoogleCalendarsService
 import pro.qyoga.i9ns.calendars.google.model.GoogleAccount
@@ -18,7 +18,7 @@ class GoogleCalendarTestApi(
 
     fun getGoogleCalendarsSettings(therapistRef: TherapistRef): List<GoogleAccountCalendarsSettingsView> {
         return googleCalendarSettingsController.getGoogleCalendarSettingsComponent(
-            idOnlyUserDetails(therapistRef.id!!)
+            idOnlyUserDetails(therapistRef.id)
         ).accounts
     }
 

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

@@ -2,7 +2,7 @@ package pro.qyoga.tests.pages.therapist.appointments.google_calendars
 
 import io.kotest.matchers.Matcher
 import org.jsoup.nodes.Element
-import pro.qyoga.app.therapist.appointments.core.schedule.GoogleCalendarSettingsController
+import pro.qyoga.app.therapist.appointments.core.schedule.settings.GoogleCalendarSettingsController
 import pro.qyoga.tests.assertions.haveAttributeValue
 import pro.qyoga.tests.platform.html.Component
 import pro.qyoga.tests.platform.kotest.all