diff --git a/.gitignore b/.gitignore
index 5f827af86..6fec507a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ out/
 /build/
 
 /deploy/host/secrets.sh
+/app/src/main/resources/application-local-dev-secrets.yaml
diff --git a/.run/QYogaApp.run.xml b/.run/QYogaApp.run.xml
index 0d01998fc..f52e0e456 100644
--- a/.run/QYogaApp.run.xml
+++ b/.run/QYogaApp.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
     <configuration default="false" name="QYogaApp" type="SpringBootApplicationConfigurationType"
                    factoryName="Spring Boot" nameIsGenerated="true">
-        <option name="ACTIVE_PROFILES" value="local-dev,demo"/>
+        <option name="ACTIVE_PROFILES" value="local-dev,demo,local-dev-secrets"/>
         <option name="ENABLE_LAUNCH_OPTIMIZATION" value="false"/>
         <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources"/>
         <module name="QYoga.app.main"/>
diff --git a/.run/Tests - Calendars Integration.run.xml b/.run/Tests - Calendars Integration.run.xml
new file mode 100644
index 000000000..e8ff528c6
--- /dev/null
+++ b/.run/Tests - Calendars Integration.run.xml	
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="Tests - Calendars Integration" type="JUnit" factoryName="JUnit">
+        <module name="QYoga.app.test"/>
+        <extension name="coverage">
+            <pattern>
+                <option name="PATTERN" value="pro.qyoga.tests.cases.app.therapist.clients.*"/>
+                <option name="ENABLED" value="true"/>
+            </pattern>
+        </extension>
+        <option name="PACKAGE_NAME" value="pro.qyoga.tests.cases.app.therapist.clients"/>
+        <option name="MAIN_CLASS_NAME" value=""/>
+        <option name="METHOD_NAME" value=""/>
+        <option name="TEST_OBJECT" value="pattern"/>
+        <patterns>
+            <pattern
+                    testClass="^(pro\.qyoga\.tests\.cases\.app\.therapist\.appointments).*|(pro\.azhidkov\.tests\.cases\.domain\.timezones).*|(pro\.qyoga\.tests\.cases\.i9ns\.calendars).*|(pro\.qyoga\.tests\.cases\.app\.therapist\.calendars).*$"/>
+        </patterns>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 59c818ffa..337ff9693 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,6 @@
 import kotlinx.kover.gradle.plugin.dsl.AggregationType
 import kotlinx.kover.gradle.plugin.dsl.CoverageUnit
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	alias(libs.plugins.kotlin.spring)
@@ -21,11 +22,14 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
 	implementation("org.springframework.boot:spring-boot-starter-mail")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
 	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
+    implementation("org.springframework.boot:spring-boot-starter-cache")
+    implementation(libs.caffeine)
 
-	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 	implementation("org.flywaydb:flyway-database-postgresql")
 	implementation(libs.jackarta.validation)
 	implementation(libs.thymeleaf.extras.java8time)
@@ -34,9 +38,13 @@ dependencies {
 	implementation(libs.bundles.poi)
     implementation(libs.nanocaptcha)
 	implementation(libs.ical4j)
+    implementation(libs.google.api.client)
+    implementation(libs.google.calendar.api)
+    implementation(libs.google.oauth.client)
+    implementation(platform(libs.google.auth.bom))
+    implementation("com.google.auth:google-auth-library-oauth2-http")
 
 	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
-	developmentOnly("org.springframework.boot:spring-boot-devtools")
 
 	testFixturesApi("org.springframework.boot:spring-boot-testcontainers")
 	testFixturesApi(testLibs.kotest.assertions)
@@ -53,17 +61,19 @@ dependencies {
 		exclude("org.eclipse.jetty.http2", "http2-server")
 	}
 	testFixturesApi(testLibs.wiremock.jetty12)
-	testFixturesApi(testLibs.wiremock.kotlin)
 
 	testFixturesImplementation(kotlin("reflect"))
 	testFixturesImplementation("org.springframework.boot:spring-boot-starter-data-jdbc")
 	testFixturesImplementation("org.springframework.boot:spring-boot-starter-web")
 	testFixturesImplementation("org.springframework.boot:spring-boot-starter-security")
+    testFixturesImplementation("org.springframework.boot:spring-boot-starter-oauth2-client")
 	testFixturesImplementation("com.fasterxml.jackson.core:jackson-databind")
 	testFixturesImplementation(libs.minio)
 	testFixturesImplementation(libs.ical4j)
 
 	testFixturesImplementation("org.springframework.boot:spring-boot-starter-test")
+    testFixturesImplementation("org.springframework.security:spring-security-test")
+    testFixturesImplementation("org.springframework.boot:spring-boot-starter-webflux")
 	testFixturesImplementation("org.testcontainers:junit-jupiter")
 	testFixturesImplementation("org.testcontainers:postgresql")
 	testFixturesImplementation(testLibs.testcontainers.minio)
@@ -221,3 +231,7 @@ configurations.matching { it.name == "detekt" }.all {
 		}
 	}
 }
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.compilerOptions {
+    freeCompilerArgs.set(listOf("-Xannotation-default-target=param-property"))
+}
diff --git a/app/src/main/kotlin/pro/azhidkov/platform/kotlin/ResultExt.kt b/app/src/main/kotlin/pro/azhidkov/platform/kotlin/ResultExt.kt
index a7e67bfed..f5987f15c 100644
--- a/app/src/main/kotlin/pro/azhidkov/platform/kotlin/ResultExt.kt
+++ b/app/src/main/kotlin/pro/azhidkov/platform/kotlin/ResultExt.kt
@@ -1,5 +1,8 @@
 package pro.azhidkov.platform.kotlin
 
+import kotlin.Result.Companion.failure
+import kotlin.Result.Companion.success
+
 inline fun <reified T : Throwable> Result<*>.isFailureOf(): Boolean = this.exceptionOrNull() is T
 
 fun Result<*>.value(): Any? = if (this.isSuccess) this.getOrThrow() else this.exceptionOrNull()!!
@@ -9,7 +12,7 @@ inline fun <R : Any, reified T : Any?> Result<T>.mapSuccessOrNull(transform: (T
 
     @Suppress("UNCHECKED_CAST")
     val result = when {
-        value != null -> Result.success(transform(value))
+        value != null -> success(transform(value))
         else -> this as Result<R>
     }
     return result
@@ -20,7 +23,7 @@ inline fun <R : Any, reified T : Any> Result<T>.mapSuccess(transform: (T) -> R):
 
     @Suppress("UNCHECKED_CAST")
     val result = when {
-        value != null -> Result.success(transform(value))
+        value != null -> success(transform(value))
         else -> this as Result<R>
     }
     return result
@@ -29,12 +32,22 @@ inline fun <R : Any, reified T : Any> Result<T>.mapSuccess(transform: (T) -> R):
 @Suppress("UNCHECKED_CAST")
 inline fun <R : Any, reified T : Any?> Result<T>.mapNull(transform: () -> R): Result<R> =
     when {
-        this.isSuccess && this.getOrNull() == null -> Result.success(transform())
+        this.isSuccess && this.getOrNull() == null -> success(transform())
         else -> this as Result<R>
     }
 
 inline fun <reified T : Throwable, V : R, R> Result<V>.recoverFailure(block: (T) -> R): Result<R> =
-    if (this.exceptionOrNull() is T) Result.success(block(this.exceptionOrNull() as T)) else this
+    if (this.exceptionOrNull() is T) success(block(this.exceptionOrNull() as T)) else this
+
+inline fun <reified T : Throwable, V : R, R> Result<V>.tryRecover(block: (T) -> Result<R>): Result<R> =
+    if (this.exceptionOrNull() is T) block(this.exceptionOrNull() as T) else this
 
 inline fun <reified T : Throwable, R> Result<R>.mapFailure(block: (T) -> Throwable): Result<R> =
-    if (this.exceptionOrNull() is T) Result.failure(block(this.exceptionOrNull() as T)) else this
+    if (this.exceptionOrNull() is T) failure(block(this.exceptionOrNull() as T)) else this
+
+fun <T> tryExecute(eventsRequest: () -> T): Result<T> =
+    try {
+        success(eventsRequest())
+    } catch (e: Exception) {
+        failure(e)
+    }
diff --git a/app/src/main/kotlin/pro/azhidkov/platform/secrets/SecretChars.kt b/app/src/main/kotlin/pro/azhidkov/platform/secrets/SecretChars.kt
new file mode 100644
index 000000000..5b392bb6a
--- /dev/null
+++ b/app/src/main/kotlin/pro/azhidkov/platform/secrets/SecretChars.kt
@@ -0,0 +1,27 @@
+package pro.azhidkov.platform.secrets
+
+data class SecretChars(
+    private val value: CharArray
+) {
+
+    fun show() =
+        String(value)
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as SecretChars
+
+        return value.contentEquals(other.value)
+    }
+
+    override fun hashCode(): Int {
+        return value.contentHashCode()
+    }
+
+    override fun toString(): String {
+        return "<hidden>"
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/azhidkov/platform/spring/jdbc/RowMapperExt.kt b/app/src/main/kotlin/pro/azhidkov/platform/spring/jdbc/RowMapperExt.kt
index 262febc13..8bf5831ad 100644
--- a/app/src/main/kotlin/pro/azhidkov/platform/spring/jdbc/RowMapperExt.kt
+++ b/app/src/main/kotlin/pro/azhidkov/platform/spring/jdbc/RowMapperExt.kt
@@ -1,7 +1,12 @@
 package pro.azhidkov.platform.spring.jdbc
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.springframework.core.convert.support.DefaultConversionService
+import org.springframework.jdbc.core.DataClassRowMapper
 import org.springframework.jdbc.core.RowMapper
+import pro.azhidkov.platform.spring.sdj.converters.PGIntervalToDurationConverter
+import pro.azhidkov.platform.spring.sdj.converters.StringToSecretChars
+import pro.azhidkov.platform.spring.sdj.converters.UuidToAggregateReferenceConverter
 
 
 inline fun <reified T> rowMapperFor(objectMapper: ObjectMapper, columnName: String? = null) = RowMapper<T> { rs, _ ->
@@ -11,4 +16,12 @@ inline fun <reified T> rowMapperFor(objectMapper: ObjectMapper, columnName: Stri
         rs.getString(1)
     }
     json?.let { objectMapper.readValue(it, T::class.java) }
-}
\ No newline at end of file
+}
+
+inline fun <reified T> taDataClassRowMapper() = DataClassRowMapper.newInstance(T::class.java).apply {
+    conversionService = DefaultConversionService().apply {
+        addConverter(PGIntervalToDurationConverter())
+        addConverter(UuidToAggregateReferenceConverter)
+        addConverter(StringToSecretChars())
+    }
+}
diff --git a/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/SecretCharsConverters.kt b/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/SecretCharsConverters.kt
new file mode 100644
index 000000000..8b2a1539a
--- /dev/null
+++ b/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/SecretCharsConverters.kt
@@ -0,0 +1,16 @@
+package pro.azhidkov.platform.spring.sdj.converters
+
+import org.springframework.core.convert.converter.Converter
+import org.springframework.data.convert.ReadingConverter
+import org.springframework.data.convert.WritingConverter
+import pro.azhidkov.platform.secrets.SecretChars
+
+@WritingConverter
+class SecretCharsToString : Converter<SecretChars, String> {
+    override fun convert(source: SecretChars) = source.show()
+}
+
+@ReadingConverter
+class StringToSecretChars : Converter<String, SecretChars> {
+    override fun convert(source: String) = SecretChars(source.toCharArray())
+}
diff --git a/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/UuidToAggregateReferenceConverter.kt b/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/UuidToAggregateReferenceConverter.kt
new file mode 100644
index 000000000..2a443b69c
--- /dev/null
+++ b/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/converters/UuidToAggregateReferenceConverter.kt
@@ -0,0 +1,11 @@
+package pro.azhidkov.platform.spring.sdj.converters
+
+import org.springframework.core.convert.converter.Converter
+import org.springframework.data.jdbc.core.mapping.AggregateReference
+import java.util.*
+
+object UuidToAggregateReferenceConverter : Converter<UUID, AggregateReference<*, UUID>> {
+    override fun convert(source: UUID): AggregateReference<*, UUID> {
+        return AggregateReference.to<Any, UUID>(source)
+    }
+}
diff --git a/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/ergo/hydration/Hydration.kt b/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/ergo/hydration/Hydration.kt
index 1800f1466..225587f1e 100644
--- a/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/ergo/hydration/Hydration.kt
+++ b/app/src/main/kotlin/pro/azhidkov/platform/spring/sdj/ergo/hydration/Hydration.kt
@@ -38,6 +38,10 @@ fun <T : Any> JdbcAggregateOperations.hydrate(
     entities: Iterable<T>,
     fetchSpec: FetchSpec<T>
 ): List<T> {
+    if (fetchSpec.propertyFetchSpecs.isEmpty()) {
+        return (entities as? List<T>) ?: entities.toList()
+    }
+
     val refs: Map<KProperty1<*, AggregateReference<*, *>?>, Map<Any, Any>> =
         fetchSpec.propertyFetchSpecs.filter {
             detectRefType(
@@ -116,4 +120,4 @@ private fun detectRefType(property: KProperty1<*, *>): RefType? = when {
 
 enum class RefType {
     SCALAR,
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/QYogaApp.kt b/app/src/main/kotlin/pro/qyoga/app/QYogaApp.kt
index 07574f2e0..27c173de9 100644
--- a/app/src/main/kotlin/pro/qyoga/app/QYogaApp.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/QYogaApp.kt
@@ -8,13 +8,16 @@ import pro.azhidkov.platform.spring.sdj.ErgoSdjConfig
 import pro.qyoga.app.publc.PublicAppConfig
 import pro.qyoga.app.therapist.TherapistWebAppConfig
 import pro.qyoga.core.appointments.AppointmentsConfig
-import pro.qyoga.core.calendar.ical.ICalCalendarsConfig
+import pro.qyoga.core.calendar.gateways.CalendarGatewaysConf
 import pro.qyoga.core.clients.ClientsConfig
 import pro.qyoga.core.survey_forms.SurveyFormsSettingsConfig
 import pro.qyoga.core.therapy.TherapyConfig
 import pro.qyoga.core.users.UsersConfig
+import pro.qyoga.i9ns.calendars.google.GoogleCalendarConf
+import pro.qyoga.i9ns.calendars.ical.ICalCalendarsConfig
 import pro.qyoga.i9ns.email.EmailsConfig
 import pro.qyoga.infra.auth.AuthConfig
+import pro.qyoga.infra.cache.CacheConf
 import pro.qyoga.infra.db.SdjConfig
 import pro.qyoga.infra.minio.MinioConfig
 import pro.qyoga.infra.timezones.TimeZonesConfig
@@ -33,10 +36,12 @@ import pro.qyoga.tech.captcha.CaptchaConf
     TherapyConfig::class,
     UsersConfig::class,
     SurveyFormsSettingsConfig::class,
-    ICalCalendarsConfig::class,
+    CalendarGatewaysConf::class,
 
     // I9ns
     EmailsConfig::class,
+    ICalCalendarsConfig::class,
+    GoogleCalendarConf::class,
 
     // Tech
     CaptchaConf::class,
@@ -49,7 +54,8 @@ import pro.qyoga.tech.captcha.CaptchaConf
     ErgoSdjConfig::class,
     MinioConfig::class,
     FilesStorageConfig::class,
-    TimeZonesConfig::class
+    TimeZonesConfig::class,
+    CacheConf::class
 )
 @SpringBootApplication
 class QYogaApp
diff --git a/app/src/main/kotlin/pro/qyoga/app/infra/WebSecurityConfig.kt b/app/src/main/kotlin/pro/qyoga/app/infra/WebSecurityConfig.kt
index 0f839be81..8d723273f 100644
--- a/app/src/main/kotlin/pro/qyoga/app/infra/WebSecurityConfig.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/infra/WebSecurityConfig.kt
@@ -9,6 +9,8 @@ import org.springframework.security.config.Customizer.withDefaults
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.FormLoginConfigurer
 import org.springframework.security.config.annotation.web.configurers.LogoutConfigurer
+import org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizedClientRepository
+import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository
@@ -54,8 +56,10 @@ class WebSecurityConfig(
                         HttpMethod.GET,
                         "/",
                         "/offline.html",
+                        "/privacy-policy.html",
                         "/manifest.json",
                         "/register",
+                        "/oauth2/**",
                         "/components/**",
                         "/styles/**",
                         "/img/**",
@@ -79,6 +83,7 @@ class WebSecurityConfig(
                     .failureForwardUrl("/error-p")
                     .permitAll()
             }
+            .oauth2Client(withDefaults())
             .logout { logout: LogoutConfigurer<HttpSecurity?> -> logout.permitAll() }
             .rememberMe { rememberMeConfigurer ->
                 rememberMeConfigurer
@@ -89,11 +94,16 @@ class WebSecurityConfig(
         return http.build()
     }
 
+    @Bean
+    fun authorizedClientRepository(): OAuth2AuthorizedClientRepository {
+        return HttpSessionOAuth2AuthorizedClientRepository()
+    }
+
     @Bean
     fun tokenRepository(): PersistentTokenRepository {
         val jdbcTokenRepositoryImpl = JdbcTokenRepositoryImpl()
-        jdbcTokenRepositoryImpl.setDataSource(dataSource)
+        jdbcTokenRepositoryImpl.dataSource = dataSource
         return jdbcTokenRepositoryImpl
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/CreateAppointmentPageController.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/CreateAppointmentPageController.kt
index 740b6857b..a3f1b0f0a 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/CreateAppointmentPageController.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/CreateAppointmentPageController.kt
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.servlet.ModelAndView
+import org.springframework.web.util.UriComponentsBuilder
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
 import pro.azhidkov.timezones.LocalizedTimeZone
 import pro.azhidkov.timezones.TimeZones
@@ -16,12 +17,12 @@ import pro.qyoga.app.publc.components.toComboBoxItem
 import pro.qyoga.app.therapist.appointments.core.edit.errors.AppointmentsIntersectionException
 import pro.qyoga.app.therapist.appointments.core.edit.ops.CreateAppointmentOp
 import pro.qyoga.app.therapist.appointments.core.edit.ops.GetAppointmentPrefillDataOp
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.edit.view_model.appointmentPageModelAndView
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController.Companion.calendarForDayWithFocus
 import pro.qyoga.core.appointments.core.commands.EditAppointmentRequest
 import pro.qyoga.core.users.auth.dtos.QyogaUserDetails
 import pro.qyoga.core.users.therapists.ref
+import java.net.URI
 import java.time.LocalDateTime
 
 @Controller
@@ -35,14 +36,9 @@ class CreateAppointmentPageController(
     @GetMapping
     fun getAppointmentPage(
         @RequestParam(DATE_TIME) dateTime: LocalDateTime?,
-        @RequestParam(SOURCE_ITEM_TYPE) sourceItemType: String?,
-        @RequestParam(SOURCE_ITEM_ID) sourceItemId: String?,
+        @RequestParam(SOURCE_ITEM) sourceItem: URI?,
         @AuthenticationPrincipal therapist: QyogaUserDetails
     ): ModelAndView {
-        val sourceItem = when {
-            sourceItemType != null && sourceItemId != null -> SourceItem(sourceItemType, sourceItemId)
-            else -> null
-        }
         val prefillData = getAppointmentPrefillData(therapist.ref, sourceItem, dateTime)
         return appointmentPageModelAndView(
             pageMode = EntityPageMode.CREATE,
@@ -77,17 +73,19 @@ class CreateAppointmentPageController(
     companion object {
         const val PATH = "/therapist/appointments/new"
         const val DATE_TIME = "dateTime"
-        const val SOURCE_ITEM_TYPE = "sourceItemType"
-        const val SOURCE_ITEM_ID = "sourceItemId"
+        const val SOURCE_ITEM = "sourceItem"
         const val CREATE_AT_DATE_TIME_URI = "/therapist/appointments/new?$DATE_TIME={$DATE_TIME}"
         private const val CREATE_FROM_SOURCE_ITEM_URI =
-            "/therapist/appointments/new?$DATE_TIME={$DATE_TIME}&$SOURCE_ITEM_TYPE={$SOURCE_ITEM_TYPE}&$SOURCE_ITEM_ID={$SOURCE_ITEM_ID}"
+            "/therapist/appointments/new"
 
-        fun addFromSourceItemUri(dateTime: LocalDateTime, sourceItem: SourceItem): String =
-            CREATE_FROM_SOURCE_ITEM_URI
-                .replace("{$DATE_TIME}", dateTime.toString())
-                .replace("{$SOURCE_ITEM_TYPE}", sourceItem.type)
-                .replace("{$SOURCE_ITEM_ID}", sourceItem.id)
+        fun addFromSourceItemUri(dateTime: LocalDateTime, sourceItem: URI): String =
+            UriComponentsBuilder
+                .fromPath(CREATE_FROM_SOURCE_ITEM_URI)
+                .queryParam("dateTime", dateTime)
+                .queryParam("sourceItem", sourceItem.toString())
+                .encode()
+                .build()
+                .toUriString()
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/forms/CreateAppointmentForm.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/forms/CreateAppointmentForm.kt
index 47bf289ef..2288b1477 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/forms/CreateAppointmentForm.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/forms/CreateAppointmentForm.kt
@@ -1,12 +1,12 @@
 package pro.qyoga.app.therapist.appointments.core.edit.forms
 
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.toQueryParamStr
 import pro.qyoga.core.appointments.core.model.AppointmentStatus
 import pro.qyoga.core.appointments.types.model.AppointmentTypeRef
 import pro.qyoga.core.calendar.api.CalendarItem
-import pro.qyoga.core.calendar.ical.model.ICalEventId
+import pro.qyoga.core.calendar.api.CalendarItemId
 import pro.qyoga.core.clients.cards.model.ClientRef
 import pro.qyoga.core.therapy.therapeutic_tasks.model.TherapeuticTaskRef
+import java.net.URI
 import java.time.Duration
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -29,22 +29,22 @@ data class CreateAppointmentForm(
     val payed: Boolean?,
     val appointmentStatus: AppointmentStatus?,
     val comment: String?,
-    val externalId: String?
+    val externalId: URI?
 ) {
 
     constructor(
-        iCalEvent: CalendarItem<ICalEventId, ZonedDateTime>?,
+        externalEvent: CalendarItem<out CalendarItemId, ZonedDateTime>?,
         dateTime: LocalDateTime?,
         timeZone: ZoneId,
         timeZoneTitle: String?
     ) : this(
-        externalId = iCalEvent?.id?.toQueryParamStr(),
+        externalId = externalEvent?.id?.toUri(),
         dateTime = dateTime,
         timeZone = timeZone,
         timeZoneTitle = timeZoneTitle,
-        duration = iCalEvent?.duration,
-        comment = iCalEvent?.description,
-        place = iCalEvent?.location,
+        duration = externalEvent?.duration,
+        comment = formatCommentFor(externalEvent),
+        place = externalEvent?.location,
         client = null,
         clientTitle = null,
         appointmentType = null,
@@ -56,4 +56,11 @@ data class CreateAppointmentForm(
         appointmentStatus = null,
     )
 
-}
\ No newline at end of file
+}
+
+fun formatCommentFor(externalEvent: CalendarItem<out CalendarItemId, ZonedDateTime>?): String =
+    listOfNotNull(
+        externalEvent?.title?.takeIf { !it.isBlank() },
+        externalEvent?.description?.takeIf { !it.isBlank() }
+    )
+        .joinToString("\n\n")
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt
index 0b5b77981..1ca7c6327 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/ops/GetAppointmentPrefillDataOp.kt
@@ -3,37 +3,33 @@ package pro.qyoga.app.therapist.appointments.core.edit.ops
 import org.springframework.stereotype.Component
 import pro.azhidkov.timezones.TimeZones
 import pro.qyoga.app.therapist.appointments.core.edit.forms.CreateAppointmentForm
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.icsEventId
-import pro.qyoga.core.calendar.ical.ICalCalendarsRepo
+import pro.qyoga.core.calendar.gateways.CalendarItemsResolver
 import pro.qyoga.core.users.auth.model.UserRef
 import pro.qyoga.core.users.settings.UserSettingsRepo
 import pro.qyoga.core.users.therapists.TherapistRef
+import java.net.URI
 import java.time.LocalDateTime
 
 
 @Component
 class GetAppointmentPrefillDataOp(
-    private val iCalCalendarsRepo: ICalCalendarsRepo,
+    private val calendarItemsResolver: CalendarItemsResolver,
     private val userSettingsRepo: UserSettingsRepo,
     private val timeZones: TimeZones,
-) : (TherapistRef, SourceItem?, LocalDateTime?) -> CreateAppointmentForm {
+) : (TherapistRef, URI?, LocalDateTime?) -> CreateAppointmentForm {
 
     override fun invoke(
         therapistRef: TherapistRef,
-        sourceItem: SourceItem?,
+        sourceItem: URI?,
         dateTime: LocalDateTime?
     ): CreateAppointmentForm {
         val currentUserTimeZone = userSettingsRepo.getUserTimeZone(UserRef(therapistRef))
 
-        val iCalEvent = sourceItem?.icsEventId()
-            ?.let { iCalCalendarsRepo.findById(therapistRef, it) }
+        val sourceEvent = sourceItem?.let { calendarItemsResolver.findCalendarItem(therapistRef, it) }
 
-        val timeZone = iCalEvent?.dateTime?.zone
-            ?: currentUserTimeZone
-        val timeZoneTitle = timeZones.findById(timeZone)?.displayName
+        val timeZoneTitle = timeZones.findById(currentUserTimeZone)?.displayName
 
-        return CreateAppointmentForm(iCalEvent, dateTime, timeZone, timeZoneTitle)
+        return CreateAppointmentForm(sourceEvent, dateTime, currentUserTimeZone, timeZoneTitle)
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/view_model/SourceItem.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/view_model/SourceItem.kt
deleted file mode 100644
index 5ed2d38aa..000000000
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/edit/view_model/SourceItem.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package pro.qyoga.app.therapist.appointments.core.edit.view_model
-
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
-import pro.qyoga.core.calendar.ical.model.ICalEventId
-
-data class SourceItem(
-    val type: String,
-    val id: String
-) {
-
-    companion object {
-        fun icsEvent(eventId: ICalEventId): SourceItem =
-            SourceItem(ICalCalendar.Companion.TYPE, eventId.toQueryParamStr())
-    }
-
-}
-
-fun ICalEventId.toQueryParamStr(): String =
-    "uid=${uid},rid=${recurrenceId ?: ""}"
-
-fun SourceItem.icsEventId(): ICalEventId {
-    check(type == ICalCalendar.TYPE)
-    val matcher = "uid=(.+),rid=(.*)".toRegex().matchEntire(id)
-    check(matcher != null)
-    val uid = matcher.groups[1]!!.value
-    val rid = matcher.groups[2]!!.value.takeIf { it.isNotBlank() }
-    return ICalEventId(uid, rid)
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GetCalendarAppointments.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GetCalendarAppointments.kt
index 15cac8713..7ac7a9f3f 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GetCalendarAppointments.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GetCalendarAppointments.kt
@@ -2,28 +2,47 @@ package pro.qyoga.app.therapist.appointments.core.schedule
 
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
+import pro.azhidkov.platform.kotlin.tryExecute
 import pro.qyoga.core.appointments.core.AppointmentsRepo
 import pro.qyoga.core.calendar.api.CalendarItem
-import pro.qyoga.core.calendar.ical.ICalCalendarsRepo
+import pro.qyoga.core.calendar.api.SearchResult
 import pro.qyoga.core.users.auth.model.UserRef
 import pro.qyoga.core.users.settings.UserSettingsRepo
 import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.GoogleCalendarsService
+import pro.qyoga.i9ns.calendars.ical.ICalCalendarsRepo
 import java.time.*
 
 
+data class GetCalendarAppointmentsRs(
+    val appointments: List<CalendarItem<*, LocalDateTime>>,
+    val hasErrors: Boolean
+)
+
 @Component
 class GetCalendarAppointmentsOp(
     private val userSettingsRepo: UserSettingsRepo,
     private val appointmentsRepo: AppointmentsRepo,
-    private val iCalCalendarsRepo: ICalCalendarsRepo
-) : (TherapistRef, LocalDate) -> Iterable<CalendarItem<*, LocalDateTime>> {
+    private val iCalCalendarsRepo: ICalCalendarsRepo,
+    private val googleCalendarsService: GoogleCalendarsService
+) : (TherapistRef, LocalDate) -> GetCalendarAppointmentsRs {
 
-    override fun invoke(therapist: TherapistRef, date: LocalDate): Iterable<CalendarItem<*, LocalDateTime>> {
+    override fun invoke(therapist: TherapistRef, date: LocalDate): GetCalendarAppointmentsRs {
         val currentUserTimeZone = userSettingsRepo.getUserTimeZone(UserRef(therapist))
         val interval = calendarIntervalAround(date, currentUserTimeZone)
         val appointments = appointmentsRepo.findCalendarItemsInInterval(therapist, interval)
-        val drafts = iCalCalendarsRepo.findCalendarItemsInInterval(therapist, interval)
-        return appointments + drafts
+
+        val iCalEventsResult =
+            tryExecute { iCalCalendarsRepo.findCalendarItemsInInterval(therapist, interval) }
+
+        val googleCalendarEventsResult =
+            tryExecute { googleCalendarsService.findCalendarItemsInInterval(therapist, interval) }
+
+        val drafts = iCalEventsResult.items() + googleCalendarEventsResult.items()
+
+        val hasErrors = iCalEventsResult.hasErrors() || googleCalendarEventsResult.hasErrors()
+
+        return GetCalendarAppointmentsRs(appointments + drafts, hasErrors)
     }
 
 }
@@ -32,6 +51,12 @@ private fun calendarIntervalAround(
     date: LocalDate,
     currentUserTimeZone: ZoneId
 ): Interval<ZonedDateTime> {
-    val from = date.minusDays((CalendarPageModel.DAYS_IN_CALENDAR / 2).toLong()).atStartOfDay(currentUserTimeZone)
-    return Interval.of(from, Duration.ofDays(CalendarPageModel.DAYS_IN_CALENDAR.toLong()))
+    val from = date.minusDays((SchedulePageModel.DAYS_IN_CALENDAR / 2).toLong()).atStartOfDay(currentUserTimeZone)
+    return Interval.of(from, Duration.ofDays(SchedulePageModel.DAYS_IN_CALENDAR.toLong()))
 }
+
+private fun Result<SearchResult<*>>.items(): Iterable<CalendarItem<out Any?, LocalDateTime>> =
+    this.getOrNull() ?: emptyList()
+
+private fun Result<SearchResult<*>>.hasErrors() =
+    this.isFailure || this.getOrThrow().hasErrors
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsController.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsController.kt
new file mode 100644
index 000000000..98db4da98
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsController.kt
@@ -0,0 +1,49 @@
+package pro.qyoga.app.therapist.appointments.core.schedule
+
+import org.springframework.http.HttpStatus
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.stereotype.Controller
+import org.springframework.web.bind.annotation.*
+import pro.qyoga.core.users.auth.dtos.QyogaUserDetails
+import pro.qyoga.core.users.therapists.ref
+import pro.qyoga.i9ns.calendars.google.GoogleCalendarsService
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccountRef
+
+@Controller
+class GoogleCalendarSettingsController(
+    private val googleCalendarsService: GoogleCalendarsService
+) {
+
+    @GetMapping(PATH)
+    fun getGoogleCalendarSettingsComponent(
+        @AuthenticationPrincipal therapist: QyogaUserDetails
+    ): GoogleCalendarSettingsPageModel {
+        val googleAccounts = googleCalendarsService.findGoogleAccountCalendars(therapist.ref)
+        return GoogleCalendarSettingsPageModel(googleAccounts)
+    }
+
+    @PatchMapping(UPDATE_CALENDAR_SETTINGS_PATH)
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    fun updateCalendarSettings(
+        @PathVariable googleAccount: GoogleAccountRef,
+        @PathVariable calendarId: String,
+        @RequestBody settingsPatch: Map<String, Any>,
+        @AuthenticationPrincipal therapist: QyogaUserDetails
+    ) {
+        googleCalendarsService.updateCalendarSettings(therapist.ref, googleAccount, calendarId, settingsPatch)
+    }
+
+    companion object {
+
+        const val PATH = "/therapist/schedule/settings/google-calendar"
+
+        const val UPDATE_CALENDAR_SETTINGS_PATH = "$PATH/{googleAccount}/calendars/{calendarId}"
+
+        fun updateCalendarSettingsPath(googleAccount: GoogleAccountRef, calendarId: String): String =
+            UPDATE_CALENDAR_SETTINGS_PATH
+                .replace("{googleAccount}", googleAccount.id?.toString() ?: "")
+                .replace("{calendarId}", calendarId)
+
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsPageModel.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsPageModel.kt
new file mode 100644
index 000000000..f2ad53701
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/GoogleCalendarSettingsPageModel.kt
@@ -0,0 +1,15 @@
+package pro.qyoga.app.therapist.appointments.core.schedule
+
+import org.springframework.web.servlet.ModelAndView
+import pro.qyoga.i9ns.calendars.google.views.GoogleAccountCalendarsSettingsView
+
+data class GoogleCalendarSettingsPageModel(
+    val accounts: List<GoogleAccountCalendarsSettingsView>
+) : ModelAndView("therapist/appointments/google-settings-component.html") {
+
+    init {
+        addObject("accounts", accounts)
+        addObject("hasAccounts", accounts.isNotEmpty())
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageController.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageController.kt
index 6c54cef16..beed0f018 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageController.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageController.kt
@@ -23,21 +23,21 @@ class SchedulePageController(
         @RequestParam(DATE) date: LocalDate = LocalDate.now(),
         @RequestParam(FOCUSED_APPOINTMENT) focusedAppointment: UUID? = null,
         @AuthenticationPrincipal therapist: QyogaUserDetails
-    ): CalendarPageModel {
+    ): SchedulePageModel {
         val appointments = getCalendarAppointments(therapist.ref, date)
-        return CalendarPageModel.of(date, appointments, focusedAppointment)
+        return SchedulePageModel.of(date, appointments, focusedAppointment)
     }
 
     companion object {
         const val PATH = "/therapist/schedule"
         const val DATE = "date"
-        const val FOCUSED_APPOINTMENT = CalendarPageModel.FOCUSED_APPOINTMENT
+        const val FOCUSED_APPOINTMENT = SchedulePageModel.FOCUSED_APPOINTMENT
         const val DATE_PATH = "$PATH?$DATE={$DATE}"
         const val DATE_APPOINTMENT_PATH = "$PATH?$DATE={$DATE}&$FOCUSED_APPOINTMENT={$FOCUSED_APPOINTMENT}"
         fun calendarForDateUrl(date: LocalDate) = DATE_PATH.replace("{$DATE}", date.toString())
         fun calendarForDayWithFocus(date: LocalDate, appointmentRef: AppointmentRef) = DATE_APPOINTMENT_PATH
             .replace("{$DATE}", date.toString())
-            .replace("{$FOCUSED_APPOINTMENT}", appointmentRef.id.toString())
+            .replace("{$FOCUSED_APPOINTMENT}", appointmentRef.id?.toString() ?: "")
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/CalendarPageModel.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageModel.kt
similarity index 89%
rename from app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/CalendarPageModel.kt
rename to app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageModel.kt
index b74e985ad..02fe4a213 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/CalendarPageModel.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/appointments/core/schedule/SchedulePageModel.kt
@@ -1,21 +1,22 @@
+@file:Suppress("IDENTITY_SENSITIVE_OPERATIONS_WITH_VALUE_TYPE")
+
 package pro.qyoga.app.therapist.appointments.core.schedule
 
 import org.springframework.web.servlet.ModelAndView
 import pro.qyoga.app.therapist.appointments.core.edit.CreateAppointmentPageController
 import pro.qyoga.app.therapist.appointments.core.edit.EditAppointmentPageController
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.CLIENT_CAME_CARD
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.CLIENT_DO_NOT_CAME_CARD
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.DRAFT_CARD
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard.CssClasses.PENDING_CARD
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel.Companion.DAYS_IN_CALENDAR
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel.Companion.DAYS_IN_WEEK
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel.Companion.DEFAULT_END_HOUR
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel.Companion.DEFAULT_START_HOUR
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel.Companion.DAYS_IN_CALENDAR
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel.Companion.DAYS_IN_WEEK
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel.Companion.DEFAULT_END_HOUR
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel.Companion.DEFAULT_START_HOUR
 import pro.qyoga.core.appointments.core.model.AppointmentStatus
 import pro.qyoga.core.appointments.core.views.LocalizedAppointmentSummary
 import pro.qyoga.core.calendar.api.CalendarItem
-import pro.qyoga.core.calendar.ical.model.ICalEventId
+import pro.qyoga.core.calendar.api.CalendarItemId
 import pro.qyoga.l10n.russianDayOfMonthLongFormat
 import pro.qyoga.l10n.russianTimeFormat
 import pro.qyoga.l10n.systemLocale
@@ -38,11 +39,12 @@ import java.util.*
  * Контрол быстрого выбора дня состоит из строки с 7 днями - выбранный день +/- 3 дня
  *
  */
-data class CalendarPageModel(
+data class SchedulePageModel(
     val date: LocalDate,
     val timeMarks: List<TimeMark>,
-    val calendarDays: Collection<CalendarDay>,
-    val appointmentToFocus: UUID?
+    private val calendarDays: Collection<CalendarDay>,
+    private val appointmentToFocus: UUID?,
+    private val hasSyncErrors: Boolean
 ) : ModelAndView("therapist/appointments/schedule.html") {
 
     init {
@@ -51,18 +53,19 @@ data class CalendarPageModel(
         addObject("calendarDays", calendarDays)
         addObject("selectedDayLabel", date.format(russianDayOfMonthLongFormat))
         addObject(FOCUSED_APPOINTMENT, appointmentToFocus)
+        addObject("hasSyncErrors", hasSyncErrors)
     }
 
     companion object {
 
         fun of(
             date: LocalDate,
-            appointments: Iterable<CalendarItem<*, LocalDateTime>>,
+            getAppointmentsRs: GetCalendarAppointmentsRs,
             appointmentToFocus: UUID? = null
-        ): CalendarPageModel {
-            val timeMarks = generateTimeMarks(appointments, date)
+        ): SchedulePageModel {
+            val timeMarks = generateTimeMarks(getAppointmentsRs.appointments, date)
             val weekCalendar = generateDaysAround(date)
-            return CalendarPageModel(date, timeMarks, weekCalendar, appointmentToFocus)
+            return SchedulePageModel(date, timeMarks, weekCalendar, appointmentToFocus, getAppointmentsRs.hasErrors)
         }
 
         const val FOCUSED_APPOINTMENT = "focusedAppointment"
@@ -261,10 +264,9 @@ data class CalendarDay(
 private fun CalendarItem<*, LocalDateTime>.editUri() =
     when (id) {
         is UUID -> EditAppointmentPageController.editUri(id as UUID)
-        is ICalEventId -> CreateAppointmentPageController.addFromSourceItemUri(
+        is CalendarItemId -> CreateAppointmentPageController.addFromSourceItemUri(
             dateTime,
-            SourceItem.icsEvent(id as ICalEventId)
+            (id as CalendarItemId).toUri()
         )
-
         else -> error("Unsupported type: $id")
-    }
\ No newline at end of file
+    }
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/clients/list/SearchClientsOp.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/clients/list/SearchClientsOp.kt
index 46cc67b25..73161a5bb 100644
--- a/app/src/main/kotlin/pro/qyoga/app/therapist/clients/list/SearchClientsOp.kt
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/clients/list/SearchClientsOp.kt
@@ -1,17 +1,16 @@
 package pro.qyoga.app.therapist.clients.list
 
 import org.intellij.lang.annotations.Language
-import org.springframework.core.convert.converter.Converter
-import org.springframework.core.convert.support.DefaultConversionService
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
-import org.springframework.data.jdbc.core.mapping.AggregateReference
-import org.springframework.jdbc.core.DataClassRowMapper
+import pro.azhidkov.platform.spring.jdbc.taDataClassRowMapper
 import pro.qyoga.core.clients.cards.ClientsRepo
 import pro.qyoga.core.clients.cards.dtos.ClientSearchDto
-import pro.qyoga.core.users.therapists.Therapist
 import java.util.*
 
+
+val clientListItemViewRowMapper = taDataClassRowMapper<ClientListItemView>()
+
 fun ClientsRepo.findTherapistClientsPageBySearchForm(
     therapistId: UUID,
     clientSearchDto: ClientSearchDto,
@@ -36,16 +35,6 @@ fun ClientsRepo.findTherapistClientsPageBySearchForm(
         "lastName" to (clientSearchDto.lastName ?: ""),
         "phoneNumber" to (clientSearchDto.digitsOnlyPhoneNumber ?: "")
     )
-    val clientListItemViewRowMapper = DataClassRowMapper(ClientListItemView::class.java).apply {
-        conversionService = DefaultConversionService().apply {
-            @Suppress("ObjectLiteralToLambda") val converter =
-                object : Converter<UUID, AggregateReference<Therapist, UUID>> {
-                    override fun convert(source: UUID): AggregateReference<Therapist, UUID>? {
-                        return AggregateReference.to(source)
-                    }
-                }
-            addConverter(converter)
-        }
-    }
+
     return findPage(query, paramMap, pageRequest, clientListItemViewRowMapper)
 }
\ No newline at end of file
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
new file mode 100644
index 000000000..69b348dc0
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/app/therapist/oauth2/GoogleCallbackController.kt
@@ -0,0 +1,61 @@
+package pro.qyoga.app.therapist.oauth2
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClient
+import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient
+import org.springframework.stereotype.Controller
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.client.RestClient
+import pro.qyoga.core.users.auth.dtos.QyogaUserDetails
+import pro.qyoga.core.users.therapists.Therapist
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.GoogleCalendarsService
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccount
+import java.util.*
+
+/**
+ * Общая логика авторизации в Гугле:
+ * 1. Пользователь в браузере нажимает кнопку "Подключить Google Calendar", которая ведёт на oauth2/authorization/google
+ * 2. Этот эндпоинт обрабатывается Spring Security, которая складывает запрос на авторизацию в сессию и перенаправляет на https://accounts.google.com/o/oauth2/v2/auth
+ * 3. Далее пользователь в Google выдаёт доступ приложению, после чего Google перенаправляет его на /therapist/oauth2/google/callback передавая параметры авторизации (code, state etc) в параметрах запроса
+ * 4. Этот запрос обрабатывается Spring Security, которая сохраняет параметры в сессию и снова делает редирект на тот же эндпоинт, но уже без параметров
+ * 5. Этот запрос снова сначала обрабатывается Spring Security, которая достаёт данные из сессии и идёт в гугл, чтобы обменять code на токены и собрать из них OAuth2AuthorizedClient
+ * 6. После чего (уже без редиректа) запрос доходит в этот эндпоинт
+ */
+@Controller
+class GoogleOAuthController(
+    private val googleCalendarsService: GoogleCalendarsService
+) {
+
+    @GetMapping(PATH)
+    fun handleOAuthCallback(
+        @RegisteredOAuth2AuthorizedClient("google") authorizedClient: OAuth2AuthorizedClient,
+        @AuthenticationPrincipal userDetails: QyogaUserDetails,
+        @Value("\${spring.security.oauth2.client.provider.google.user-info-uri}") googleOicUserInfoUri: String
+    ): String {
+        val therapistId = TherapistRef.to<Therapist, UUID>(userDetails.id)
+
+        val response = RestClient.create(googleOicUserInfoUri)
+            .get()
+            .headers { it.setBearerAuth(authorizedClient.accessToken.tokenValue) }
+            .retrieve()
+            .body(Map::class.java)
+        val email = response
+            ?.get("email") as String
+
+        googleCalendarsService.addGoogleAccount(
+            GoogleAccount(therapistId, email, authorizedClient.refreshToken!!.tokenValue)
+        )
+
+        // Греем кэш, чтобы улучшить UX пользователя при возврате на страницу расписания
+        googleCalendarsService.findGoogleAccountCalendars(therapistId)
+
+        return "redirect:/therapist/schedule?google-connected=true"
+    }
+
+    companion object {
+        const val PATH = "/therapist/oauth2/google/callback"
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/appointments/core/AppointmentsRepo.kt b/app/src/main/kotlin/pro/qyoga/core/appointments/core/AppointmentsRepo.kt
index e2ba5d935..cf8e97291 100644
--- a/app/src/main/kotlin/pro/qyoga/core/appointments/core/AppointmentsRepo.kt
+++ b/app/src/main/kotlin/pro/qyoga/core/appointments/core/AppointmentsRepo.kt
@@ -1,22 +1,19 @@
 package pro.qyoga.core.appointments.core
 
 import org.intellij.lang.annotations.Language
-import org.springframework.core.convert.support.DefaultConversionService
 import org.springframework.data.jdbc.core.JdbcAggregateOperations
 import org.springframework.data.jdbc.core.convert.JdbcConverter
 import org.springframework.data.relational.core.mapping.RelationalMappingContext
-import org.springframework.jdbc.core.DataClassRowMapper
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations
 import org.springframework.stereotype.Repository
 import pro.azhidkov.platform.java.time.Interval
 import pro.azhidkov.platform.java.time.zoneId
 import pro.azhidkov.platform.postgresql.toPGInterval
-import pro.azhidkov.platform.spring.sdj.converters.PGIntervalToDurationConverter
+import pro.azhidkov.platform.spring.jdbc.taDataClassRowMapper
 import pro.azhidkov.platform.spring.sdj.ergo.ErgoRepository
 import pro.qyoga.core.appointments.core.model.Appointment
 import pro.qyoga.core.appointments.core.views.LocalizedAppointmentSummary
 import pro.qyoga.core.calendar.api.CalendarItem
-import pro.qyoga.core.calendar.api.CalendarsService
 import pro.qyoga.core.users.therapists.TherapistRef
 import java.sql.Timestamp
 import java.time.Duration
@@ -37,9 +34,9 @@ class AppointmentsRepo(
     Appointment::class,
     jdbcConverter,
     relationalMappingContext
-), CalendarsService {
+) {
 
-    override fun findCalendarItemsInInterval(
+    fun findCalendarItemsInInterval(
         therapist: TherapistRef,
         interval: Interval<ZonedDateTime>,
     ): Iterable<CalendarItem<*, LocalDateTime>> {
@@ -98,9 +95,4 @@ fun AppointmentsRepo.findIntersectingAppointment(
     return findOne(query, params, Appointment.Fetch.summaryRefs)
 }
 
-private val localizedAppointmentSummaryRowMapper =
-    DataClassRowMapper(LocalizedAppointmentSummary::class.java).apply {
-        conversionService = DefaultConversionService().apply {
-            addConverter(PGIntervalToDurationConverter())
-        }
-    }
\ No newline at end of file
+private val localizedAppointmentSummaryRowMapper = taDataClassRowMapper<LocalizedAppointmentSummary>()
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/api/Calendar.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/api/Calendar.kt
index bca230b69..5627b684c 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/api/Calendar.kt
+++ b/app/src/main/kotlin/pro/qyoga/core/calendar/api/Calendar.kt
@@ -6,5 +6,5 @@ import pro.qyoga.core.users.therapists.TherapistRef
 interface Calendar {
     val ownerRef: TherapistRef
     val name: String
-    val type: String
-}
\ No newline at end of file
+    val type: CalendarType
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarItem.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarItem.kt
index 10c8862c9..ee0cf0d19 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarItem.kt
+++ b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarItem.kt
@@ -1,8 +1,64 @@
 package pro.qyoga.core.calendar.api
 
+import org.springframework.util.MultiValueMap
+import org.springframework.web.util.UriComponentsBuilder
+import org.springframework.web.util.UriTemplate
+import java.net.URI
 import java.time.Duration
 import java.time.temporal.Temporal
 
+data class CalendarItemUri(
+    val type: String,
+    val params: Map<String, String?>
+) {
+
+    companion object {
+
+        private const val SCHEMA = "qyoga"
+        private const val HOST = "calendars"
+        private const val PATH = "{type}/events"
+        const val TEMPLATE = "$SCHEMA://$HOST/$PATH"
+
+        private val pathTemplate = UriTemplate("/$PATH")
+
+        fun parseOrNull(uri: URI): CalendarItemUri? {
+            if (uri.scheme != SCHEMA) {
+                return null
+            }
+            if (uri.host != HOST) {
+                return null
+            }
+
+            val comps = UriComponentsBuilder.fromUri(uri).build()
+            if (!pathTemplate.matches(comps.path)) {
+                return null
+            }
+
+            val type = comps.pathSegments.getOrNull(0)
+                ?: return null
+
+            val params: Map<String, String?> = comps.queryParams.toSingleValueMap()
+
+            return CalendarItemUri(type, params)
+        }
+
+    }
+
+}
+
+interface CalendarItemId {
+
+    val type: CalendarType
+
+    fun toUri(): URI = UriComponentsBuilder.fromUriString(CalendarItemUri.TEMPLATE)
+        .queryParams(MultiValueMap.fromSingleValue(toMap()))
+        .buildAndExpand(type.name)
+        .toUri()
+
+    fun toMap(): Map<String, String?>
+
+}
+
 interface CalendarItem<ID, DATE : Temporal> {
     val id: ID
     val title: String
@@ -14,4 +70,4 @@ interface CalendarItem<ID, DATE : Temporal> {
     val endDateTime: DATE
         get() = this.dateTime.plus(this.duration) as DATE
     val location: String?
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarType.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarType.kt
new file mode 100644
index 000000000..68a3f1920
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarType.kt
@@ -0,0 +1,8 @@
+package pro.qyoga.core.calendar.api
+
+
+interface CalendarType {
+
+    val name: String
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt
index 00f477a11..25f307aa9 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt
+++ b/app/src/main/kotlin/pro/qyoga/core/calendar/api/CalendarsService.kt
@@ -6,11 +6,22 @@ import java.time.LocalDateTime
 import java.time.ZonedDateTime
 
 
-interface CalendarsService {
+data class SearchResult<ID>(
+    val items: Iterable<CalendarItem<ID, LocalDateTime>>,
+    val hasErrors: Boolean = false
+) : Iterable<CalendarItem<ID, LocalDateTime>> by items
+
+interface CalendarsService<ID> {
+
+    val type: CalendarType
 
     fun findCalendarItemsInInterval(
         therapist: TherapistRef,
         interval: Interval<ZonedDateTime>
-    ): Iterable<CalendarItem<*, LocalDateTime>>
+    ): SearchResult<ID>
+
+    fun findById(therapistRef: TherapistRef, eventId: ID): CalendarItem<ID, ZonedDateTime>?
+
+    fun createItemId(itemId: Map<String, String?>): ID
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarGatewaysConf.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarGatewaysConf.kt
new file mode 100644
index 000000000..ae77a7f65
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarGatewaysConf.kt
@@ -0,0 +1,9 @@
+package pro.qyoga.core.calendar.gateways
+
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+
+
+@ComponentScan
+@Configuration
+class CalendarGatewaysConf
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarItemsResolver.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarItemsResolver.kt
new file mode 100644
index 000000000..fb95b03ed
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/core/calendar/gateways/CalendarItemsResolver.kt
@@ -0,0 +1,32 @@
+package pro.qyoga.core.calendar.gateways
+
+import org.springframework.stereotype.Service
+import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarItemId
+import pro.qyoga.core.calendar.api.CalendarItemUri
+import pro.qyoga.core.calendar.api.CalendarsService
+import pro.qyoga.core.users.therapists.TherapistRef
+import java.net.URI
+import java.time.ZonedDateTime
+
+@Service
+class CalendarItemsResolver(
+    calendarsServices: List<CalendarsService<*>>
+) {
+
+    private val services = calendarsServices.associateBy { it.type.name }
+
+    fun findCalendarItem(
+        therapistRef: TherapistRef,
+        sourceItem: URI
+    ): CalendarItem<CalendarItemId, ZonedDateTime>? {
+        val calendarItemUri = CalendarItemUri.parseOrNull(sourceItem)
+            ?: throw IllegalArgumentException("Invalid calendar item URI: $sourceItem")
+
+        @Suppress("UNCHECKED_CAST")
+        val service = services[calendarItemUri.type] as CalendarsService<CalendarItemId>
+        val id = service.createItemId(calendarItemUri.params)
+        return service.findById(therapistRef, id)
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalEventId.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalEventId.kt
deleted file mode 100644
index 92909b843..000000000
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalEventId.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package pro.qyoga.core.calendar.ical.model
-
-
-data class ICalEventId(
-    val uid: String,
-    val recurrenceId: String? = null
-)
\ No newline at end of file
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/LocalizedICalCalendarItem.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/LocalizedICalCalendarItem.kt
deleted file mode 100644
index 29a6159d6..000000000
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/LocalizedICalCalendarItem.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package pro.qyoga.core.calendar.ical.model
-
-import pro.qyoga.core.calendar.api.CalendarItem
-import java.time.Duration
-import java.time.LocalDateTime
-
-
-data class LocalizedICalCalendarItem(
-    override val id: ICalEventId,
-    override val title: String,
-    override val description: String,
-    override val dateTime: LocalDateTime,
-    override val duration: Duration,
-    override val location: String?
-) : CalendarItem<ICalEventId, LocalDateTime>
\ No newline at end of file
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/CalendarExt.kt b/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/CalendarExt.kt
deleted file mode 100644
index 9803dab8a..000000000
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/CalendarExt.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package pro.qyoga.core.calendar.ical.platform.ical4j
-
-import net.fortuna.ical4j.data.CalendarBuilder
-import net.fortuna.ical4j.model.Calendar
-import net.fortuna.ical4j.util.CompatibilityHints
-import java.io.StringReader
-
-
-fun parseIcs(icsData: String): Calendar {
-    CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true)
-    val sin = StringReader(icsData.replace("\n", "\r\n"))
-    val builder = CalendarBuilder()
-    return builder.build(sin)
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/pro/qyoga/core/clients/cards/model/Client.kt b/app/src/main/kotlin/pro/qyoga/core/clients/cards/model/Client.kt
index 837d14397..9e32a3a74 100644
--- a/app/src/main/kotlin/pro/qyoga/core/clients/cards/model/Client.kt
+++ b/app/src/main/kotlin/pro/qyoga/core/clients/cards/model/Client.kt
@@ -15,6 +15,7 @@ import java.time.LocalDate
 import java.util.*
 
 typealias ClientRef = AggregateReference<Client, UUID>
+typealias ClientId = UUID
 
 @Table("clients")
 data class Client(
@@ -32,7 +33,7 @@ data class Client(
     val therapistRef: TherapistRef,
 
     @Id
-    override val id: UUID = UUIDv7.randomUUID(),
+    override val id: ClientId = UUIDv7.randomUUID(),
     @CreatedDate
     val createdAt: Instant = Instant.now(),
     @LastModifiedDate
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarConf.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarConf.kt
new file mode 100644
index 000000000..b07213e0e
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarConf.kt
@@ -0,0 +1,47 @@
+package pro.qyoga.i9ns.calendars.google
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import org.springframework.cache.CacheManager
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.cache.caffeine.CaffeineCache
+import org.springframework.cache.support.SimpleCacheManager
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+import java.util.concurrent.TimeUnit
+
+
+@ComponentScan
+@Configuration
+@EnableCaching
+class GoogleCalendarConf {
+
+    object CacheNames {
+        const val CALENDAR_EVENTS = "calendarEvents"
+        const val GOOGLE_ACCOUNT_CALENDARS = "googleAccountCalendars"
+    }
+
+    @Bean
+    fun cacheManager(): CacheManager {
+        val eventsCache = CaffeineCache(
+            CacheNames.CALENDAR_EVENTS,
+            Caffeine.newBuilder()
+                .expireAfterWrite(5, TimeUnit.MINUTES)
+                .maximumSize(5_000)
+                .build()
+        )
+
+        val calendarsCache = CaffeineCache(
+            CacheNames.GOOGLE_ACCOUNT_CALENDARS,
+            Caffeine.newBuilder()
+                .expireAfterWrite(30, TimeUnit.MINUTES)
+                .maximumSize(1_000)
+                .build()
+        )
+
+        return SimpleCacheManager().apply {
+            setCaches(listOf(eventsCache, calendarsCache))
+        }
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarsService.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarsService.kt
new file mode 100644
index 000000000..5eb98d364
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/GoogleCalendarsService.kt
@@ -0,0 +1,138 @@
+package pro.qyoga.i9ns.calendars.google
+
+import jakarta.annotation.PreDestroy
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Service
+import pro.azhidkov.platform.java.time.Interval
+import pro.azhidkov.platform.java.time.zoneId
+import pro.azhidkov.platform.kotlin.tryExecute
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.resolveOrThrow
+import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarType
+import pro.qyoga.core.calendar.api.CalendarsService
+import pro.qyoga.core.calendar.api.SearchResult
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.client.GoogleCalendarsClient
+import pro.qyoga.i9ns.calendars.google.model.*
+import pro.qyoga.i9ns.calendars.google.persistance.GoogleAccountsDao
+import pro.qyoga.i9ns.calendars.google.persistance.GoogleCalendarSettingsPatch
+import pro.qyoga.i9ns.calendars.google.persistance.GoogleCalendarsDao
+import pro.qyoga.i9ns.calendars.google.views.GoogleAccountCalendarsSettingsView
+import java.time.ZonedDateTime
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletableFuture.supplyAsync
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+import java.util.function.Supplier
+
+
+private typealias GoogleCalendarItemsFetchResult = Result<List<GoogleCalendarItem<ZonedDateTime>>>
+
+@Service
+class GoogleCalendarsService(
+    private val googleAccountsDao: GoogleAccountsDao,
+    private val googleCalendarsDao: GoogleCalendarsDao,
+    private val googleCalendarsClient: GoogleCalendarsClient,
+) : CalendarsService<GoogleCalendarItemId> {
+
+    private val log = LoggerFactory.getLogger(GoogleCalendarsService::class.java)
+
+    private val executor = Executors.newVirtualThreadPerTaskExecutor()
+
+    override val type: CalendarType = GoogleCalendar.Type
+
+    @PreDestroy
+    fun tearDown() {
+        executor.shutdown()
+    }
+
+    fun addGoogleAccount(googleAccount: GoogleAccount) {
+        googleAccountsDao.addGoogleAccount(googleAccount)
+    }
+
+    fun findGoogleAccountCalendars(
+        therapist: TherapistRef
+    ): List<GoogleAccountCalendarsSettingsView> {
+        val accounts = googleAccountsDao.findGoogleAccounts(therapist)
+
+        val accountCalendars = accounts.map { acc ->
+            acc to googleCalendarsClient.getAccountCalendars(therapist, acc)
+        }
+
+        val calendarSettings = googleCalendarsDao.findCalendarsSettings(therapist)
+            .associateBy { it.calendarId }
+
+        return accountCalendars.map { (account, calendars) ->
+            GoogleAccountCalendarsSettingsView.of(account, calendars, calendarSettings)
+        }
+    }
+
+    override fun findCalendarItemsInInterval(
+        therapist: TherapistRef,
+        interval: Interval<ZonedDateTime>
+    ): SearchResult<GoogleCalendarItemId> {
+        val enabledGoogleCalendars = googleCalendarsDao.findCalendarsSettings(
+            therapist = therapist,
+            shouldBeShown = true,
+            fetch = listOf(GoogleCalendarSettings::googleAccountRef)
+        )
+        if (enabledGoogleCalendars.isEmpty()) {
+            return SearchResult(emptyList())
+        }
+
+        val calendarEventsFetchResults: List<GoogleCalendarItemsFetchResult> =
+            enabledGoogleCalendars.map { cal ->
+                Supplier {
+                    tryExecute {
+                        googleCalendarsClient.getEvents(cal.googleAccountRef.resolveOrThrow(), interval, cal.calendarId)
+                    }.onFailure {
+                        log.warn("Failed to fetch events for account", it)
+                    }
+                }
+            }
+                .submitAll(executor)
+                .awaitAll()
+
+        val items = calendarEventsFetchResults
+            .mapNotNull { it.getOrNull() }
+            .flatten()
+            .map { it.toLocalizedCalendarItem(interval.zoneId) }
+
+        return SearchResult(
+            items = items,
+            hasErrors = calendarEventsFetchResults.any { it.isFailure }
+        )
+    }
+
+    override fun findById(
+        therapistRef: TherapistRef,
+        eventId: GoogleCalendarItemId
+    ): CalendarItem<GoogleCalendarItemId, ZonedDateTime>? {
+        // Выбирается список, потому что один терапевт может подключить несколько аккаунтов, между которыми
+        // подключен один календарь. И для чтения события можно воспользоватья любым из этих аккаунтов
+        val account = googleAccountsDao.findGoogleAccounts(therapistRef, eventId.calendarId).first()
+        return googleCalendarsClient.findById(account, eventId)
+    }
+
+    override fun createItemId(itemId: Map<String, String?>): GoogleCalendarItemId {
+        return GoogleCalendarItemId(itemId["cid"]!!, itemId["eid"]!!)
+    }
+
+    fun updateCalendarSettings(
+        therapist: TherapistRef,
+        googleAccount: GoogleAccountRef,
+        calendarId: String,
+        settingsPatch: GoogleCalendarSettingsPatch
+    ) {
+        googleCalendarsDao.patchCalendarSettings(therapist, googleAccount, calendarId, settingsPatch)
+    }
+
+}
+
+private fun List<Supplier<GoogleCalendarItemsFetchResult>>.submitAll(executor: Executor): List<CompletableFuture<GoogleCalendarItemsFetchResult>> =
+    this.map { task ->
+        supplyAsync(task, executor)
+    }
+
+private fun List<CompletableFuture<GoogleCalendarItemsFetchResult>>.awaitAll(): List<GoogleCalendarItemsFetchResult> =
+    this.map(CompletableFuture<GoogleCalendarItemsFetchResult>::get)
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/client/GoogleCalendarsClient.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/client/GoogleCalendarsClient.kt
new file mode 100644
index 000000000..e8edd1969
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/client/GoogleCalendarsClient.kt
@@ -0,0 +1,159 @@
+package pro.qyoga.i9ns.calendars.google.client
+
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
+import com.google.api.client.googleapis.json.GoogleJsonResponseException
+import com.google.api.client.http.javanet.NetHttpTransport
+import com.google.api.client.json.gson.GsonFactory
+import com.google.api.client.util.DateTime
+import com.google.api.services.calendar.Calendar
+import com.google.api.services.calendar.model.Event
+import com.google.auth.http.HttpCredentialsAdapter
+import com.google.auth.oauth2.UserCredentials
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties
+import org.springframework.cache.annotation.Cacheable
+import org.springframework.http.HttpStatus
+import org.springframework.stereotype.Component
+import pro.azhidkov.platform.java.time.Interval
+import pro.azhidkov.platform.kotlin.tryExecute
+import pro.azhidkov.platform.kotlin.tryRecover
+import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.GoogleCalendarConf
+import pro.qyoga.i9ns.calendars.google.model.*
+import java.net.URI
+import java.time.Duration
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import kotlin.Result.Companion.failure
+import kotlin.Result.Companion.success
+
+
+private const val APPLICATION_NAME = "Trainer Advisor"
+private val gsonFactory: GsonFactory = GsonFactory.getDefaultInstance()
+private val httpTransport: NetHttpTransport = GoogleNetHttpTransport.newTrustedTransport()
+
+@Component
+class GoogleCalendarsClient(
+    private val googleOAuthProps: OAuth2ClientProperties,
+    @Value("\${spring.security.oauth2.client.provider.google.token-uri}") private val tokenUri: URI,
+    @Value("\${trainer-advisor.integrations.google-calendar.root-url}") private val googleCalendarRootUri: URI
+) {
+
+    private val log = LoggerFactory.getLogger(javaClass)
+
+    private val calendarServicesCache = mutableMapOf<GoogleAccount, Calendar>()
+        .withDefault { createCalendarService(it) }
+
+    @Cacheable(
+        cacheNames = [GoogleCalendarConf.CacheNames.CALENDAR_EVENTS],
+        key = "#calendarId + ':' + #interval.from.toInstant().toEpochMilli() + ':' + #interval.to.toInstant().toEpochMilli()"
+    )
+    fun getEvents(
+        account: GoogleAccount,
+        interval: Interval<ZonedDateTime>,
+        calendarId: String
+    ): List<GoogleCalendarItem<ZonedDateTime>> {
+        log.info("Fetching events in {} for calendar {} using {}", interval, calendarId, account)
+
+        val service = calendarServicesCache.getValue(account)
+        val events =
+            service.events().list(calendarId)
+                .setTimeMin(DateTime(interval.from.toInstant().toEpochMilli()))
+                .setTimeMax(DateTime(interval.to.toInstant().toEpochMilli()))
+                .setOrderBy("startTime")
+                .setSingleEvents(true)
+                .execute()
+                .items
+                .map { mapToCalendarItem(calendarId, it) }
+        return events
+    }
+
+    @Cacheable(
+        cacheNames = [GoogleCalendarConf.CacheNames.GOOGLE_ACCOUNT_CALENDARS],
+        key = "#therapist.id + ':' + #account.id"
+    )
+    fun getAccountCalendars(
+        therapist: TherapistRef,
+        account: GoogleAccount
+    ): Result<List<GoogleCalendar>> {
+        log.info("Fetching calendars for therapist {} using {}", therapist, account)
+        val service = calendarServicesCache.getValue(account)
+
+        val getCalendarsListRequest = service.CalendarList().list()
+
+        val calendarListDto = tryExecute { getCalendarsListRequest.execute() }
+            .getOrElse {
+                log.warn("Failed to fetch calendars for therapist {} using {}", therapist, account, it)
+                return failure(it)
+            }
+
+        val calendarsList = calendarListDto.items.map {
+            GoogleCalendar(therapist, it.id, it.summary)
+        }
+
+        return success(calendarsList)
+    }
+
+    @Cacheable(
+        cacheNames = [GoogleCalendarConf.CacheNames.CALENDAR_EVENTS],
+        key = "#eventId"
+    )
+    fun findById(
+        account: GoogleAccount,
+        eventId: GoogleCalendarItemId
+    ): CalendarItem<GoogleCalendarItemId, ZonedDateTime>? {
+        val service = calendarServicesCache.getValue(account)
+
+        val getEventRequest = service.events().get(eventId.calendarId, eventId.itemId)
+
+        val event = tryExecute { getEventRequest.execute() }
+            .tryRecover<GoogleJsonResponseException, _, _> {
+                if (it.statusCode == HttpStatus.NOT_FOUND.value()) {
+                    success(null)
+                } else {
+                    failure(it)
+                }
+            }
+            .getOrThrow()
+
+        return event?.let { mapToCalendarItem(eventId.calendarId, it) }
+    }
+
+    private fun createCalendarService(account: GoogleAccount): Calendar {
+        val credentials = UserCredentials.newBuilder()
+            .setClientId(googleOAuthProps.registration["google"]!!.clientId)
+            .setClientSecret(googleOAuthProps.registration["google"]!!.clientSecret)
+            .setRefreshToken(account.refreshToken.show())
+            .setTokenServerUri(tokenUri)
+            .build()
+
+        val service = Calendar.Builder(httpTransport, gsonFactory, HttpCredentialsAdapter(credentials))
+            .setApplicationName(APPLICATION_NAME)
+            .setRootUrl(googleCalendarRootUri.toURL().toString())
+            .build()
+        return service
+    }
+
+}
+
+private fun mapToCalendarItem(calendarId: String, event: Event): GoogleCalendarItem<ZonedDateTime> = GoogleCalendarItem(
+    GoogleCalendarItemId(calendarId, event.id),
+    event.summary,
+    event.description ?: "",
+    startDate(event),
+    duration(event),
+    event.location
+)
+
+private fun startDate(event: Event): ZonedDateTime =
+    ZonedDateTime.ofInstant(
+        Instant.ofEpochMilli(event.start.dateTime?.value ?: event.start.date?.value ?: 0),
+        ZoneId.of(event.start.timeZone)
+    )
+
+private fun duration(event: Event): Duration =
+    Duration.ofMillis(event.end.dateTime?.value ?: event.end.date?.value ?: 0) -
+            Duration.ofMillis(event.start.dateTime?.value ?: event.start.date?.value ?: 0)
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleAccount.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleAccount.kt
new file mode 100644
index 000000000..3d9f93afb
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleAccount.kt
@@ -0,0 +1,32 @@
+package pro.qyoga.i9ns.calendars.google.model
+
+import org.springframework.data.annotation.Id
+import org.springframework.data.jdbc.core.mapping.AggregateReference
+import org.springframework.data.relational.core.mapping.Table
+import pro.azhidkov.platform.secrets.SecretChars
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.Identifiable
+import pro.azhidkov.platform.uuid.UUIDv7
+import pro.qyoga.core.users.therapists.TherapistRef
+import java.util.*
+
+
+typealias GoogleAccountRef = AggregateReference<GoogleAccount, UUID>
+
+typealias GoogleAccountId = UUID
+
+@Table("therapist_google_accounts")
+data class GoogleAccount(
+    val ownerRef: TherapistRef,
+    val email: String,
+    val refreshToken: SecretChars,
+
+    @Id override val id: GoogleAccountId = UUIDv7.randomUUID()
+) : Identifiable<UUID> {
+
+    constructor(
+        ownerRef: TherapistRef,
+        email: String,
+        refreshToken: String
+    ) : this(ownerRef, email, SecretChars(refreshToken.toCharArray()))
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendar.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendar.kt
new file mode 100644
index 000000000..74239321e
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendar.kt
@@ -0,0 +1,22 @@
+package pro.qyoga.i9ns.calendars.google.model
+
+import pro.qyoga.core.calendar.api.Calendar
+import pro.qyoga.core.calendar.api.CalendarType
+import pro.qyoga.core.users.therapists.TherapistRef
+
+
+typealias GoogleCalendarId = String
+
+data class GoogleCalendar(
+    override val ownerRef: TherapistRef,
+    val externalId: GoogleCalendarId,
+    override val name: String,
+) : Calendar {
+
+    override val type: CalendarType = Type
+
+    object Type : CalendarType {
+        override val name = "Google"
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendarItem.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendarItem.kt
new file mode 100644
index 000000000..824fb3cb4
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendarItem.kt
@@ -0,0 +1,45 @@
+package pro.qyoga.i9ns.calendars.google.model
+
+import pro.azhidkov.platform.java.time.toLocalDateTime
+import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarItemId
+import pro.qyoga.core.calendar.api.CalendarType
+import java.time.Duration
+import java.time.ZoneId
+import java.time.temporal.Temporal
+
+
+data class GoogleCalendarItemId(
+    val calendarId: String,
+    val itemId: String
+) : CalendarItemId {
+
+    override val type: CalendarType = GoogleCalendar.Type
+
+    override fun toMap(): Map<String, String> = mapOf(
+        "cid" to calendarId,
+        "eid" to itemId
+    )
+
+}
+
+data class GoogleCalendarItem<DATE : Temporal>(
+    override val id: GoogleCalendarItemId,
+    override val title: String,
+    override val description: String,
+    override val dateTime: DATE,
+    override val duration: Duration,
+    override val location: String?
+) : 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/i9ns/calendars/google/model/GoogleCalendarSettings.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendarSettings.kt
new file mode 100644
index 000000000..06be90087
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/model/GoogleCalendarSettings.kt
@@ -0,0 +1,10 @@
+package pro.qyoga.i9ns.calendars.google.model
+
+import pro.qyoga.core.users.therapists.TherapistRef
+
+data class GoogleCalendarSettings(
+    val ownerRef: TherapistRef,
+    val googleAccountRef: GoogleAccountRef,
+    val calendarId: GoogleCalendarId,
+    val shouldBeShown: Boolean,
+)
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/persistance/GoogleAccountsDao.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/persistance/GoogleAccountsDao.kt
new file mode 100644
index 000000000..7e3089537
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/persistance/GoogleAccountsDao.kt
@@ -0,0 +1,58 @@
+package pro.qyoga.i9ns.calendars.google.persistance
+
+import org.springframework.data.jdbc.core.JdbcAggregateTemplate
+import org.springframework.jdbc.core.simple.JdbcClient
+import org.springframework.stereotype.Repository
+import pro.azhidkov.platform.spring.jdbc.taDataClassRowMapper
+import pro.azhidkov.platform.spring.sdj.query.query
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccount
+
+
+private val googleAccountRowMapper = taDataClassRowMapper<GoogleAccount>()
+
+@Repository
+class GoogleAccountsDao(
+    private val jdbcAggregateTemplate: JdbcAggregateTemplate,
+    private val jdbcClient: JdbcClient
+) {
+
+    fun addGoogleAccount(googleAccount: GoogleAccount) {
+        val sql = """
+            INSERT INTO therapist_google_accounts (id, owner_ref, refresh_token, email)
+            VALUES (:id, :ownerRef, :refreshToken, :email)
+            ON CONFLICT (owner_ref, email) DO UPDATE SET refresh_token = :refreshToken
+        """.trimIndent()
+        jdbcClient.sql(sql)
+            .param("id", googleAccount.id)
+            .param("ownerRef", googleAccount.ownerRef.id)
+            .param("refreshToken", googleAccount.refreshToken.show())
+            .param("email", googleAccount.email)
+            .update()
+    }
+
+    fun findGoogleAccounts(therapist: TherapistRef): List<GoogleAccount> {
+        val query = query {
+            GoogleAccount::ownerRef isEqual therapist
+        }
+        return jdbcAggregateTemplate.findAll(query, GoogleAccount::class.java)
+    }
+
+    fun findGoogleAccounts(therapistRef: TherapistRef, calendarId: String): List<GoogleAccount> {
+        val query = """
+            SELECT *
+            FROM therapist_google_accounts
+                JOIN therapist_google_calendar_settings 
+                    ON therapist_google_accounts.id = therapist_google_calendar_settings.google_account_ref
+            WHERE therapist_google_accounts.owner_ref = :therapistRef
+                AND calendar_id = :calendarId
+        """.trimIndent()
+
+        return jdbcClient.sql(query)
+            .param("therapistRef", therapistRef.id)
+            .param("calendarId", calendarId)
+            .query(googleAccountRowMapper)
+            .list()
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/persistance/GoogleCalendarsDao.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/persistance/GoogleCalendarsDao.kt
new file mode 100644
index 000000000..9394a12e5
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/persistance/GoogleCalendarsDao.kt
@@ -0,0 +1,69 @@
+package pro.qyoga.i9ns.calendars.google.persistance
+
+import org.springframework.data.jdbc.core.JdbcAggregateTemplate
+import org.springframework.jdbc.core.simple.JdbcClient
+import org.springframework.stereotype.Repository
+import pro.azhidkov.platform.spring.jdbc.taDataClassRowMapper
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.FetchSpec
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.hydrate
+import pro.azhidkov.platform.uuid.UUIDv7
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccountRef
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendarSettings
+import kotlin.reflect.KProperty1
+
+typealias GoogleCalendarSettingsPatch = Map<String, Any>
+
+@Repository
+class GoogleCalendarsDao(
+    private val jdbcClient: JdbcClient,
+    private val jdbcAggregateTemplate: JdbcAggregateTemplate
+) {
+
+    private val googleCalendarSettingsRowMapper = taDataClassRowMapper<GoogleCalendarSettings>()
+
+    fun patchCalendarSettings(
+        therapist: TherapistRef,
+        googleAccount: GoogleAccountRef,
+        calendarId: String,
+        settingsPatch: GoogleCalendarSettingsPatch
+    ) {
+        val query = """
+            INSERT INTO therapist_google_calendar_settings (id, owner_ref, google_account_ref, calendar_id, should_be_shown)
+            VALUES (:id, :ownerRef, :googleAccountRef::uuid, :calendarId, :shouldBeShown)
+            ON CONFLICT (owner_ref, google_account_ref, calendar_id) DO UPDATE SET should_be_shown = EXCLUDED.should_be_shown
+        """.trimIndent()
+
+        jdbcClient.sql(query)
+            .param("id", UUIDv7.randomUUID())
+            .param("ownerRef", therapist.id)
+            .param("googleAccountRef", googleAccount.id)
+            .param("calendarId", calendarId)
+            .param("shouldBeShown", settingsPatch["shouldBeShown"] as Boolean)
+            .update()
+    }
+
+    fun findCalendarsSettings(
+        therapist: TherapistRef,
+        shouldBeShown: Boolean? = null,
+        fetch: Iterable<KProperty1<GoogleCalendarSettings, *>> = emptyList()
+    ): List<GoogleCalendarSettings> {
+        val query = """
+            SELECT * 
+            FROM therapist_google_calendar_settings 
+            WHERE owner_ref = :ownerRef
+                ${shouldBeShown?.let { "AND should_be_shown = :shouldBeShown" } ?: ""}
+        """
+
+        @Suppress("SqlSourceToSinkFlow")
+        var calendars = jdbcClient.sql(query)
+            .param("ownerRef", therapist.id)
+            .param("shouldBeShown", shouldBeShown)
+            .query(googleCalendarSettingsRowMapper)
+            .list()
+
+        calendars = jdbcAggregateTemplate.hydrate(calendars, FetchSpec(fetch))
+        return calendars
+    }
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/views/GoogleAccountCalendarsSettingsView.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/views/GoogleAccountCalendarsSettingsView.kt
new file mode 100644
index 000000000..e0fd0edb2
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/google/views/GoogleAccountCalendarsSettingsView.kt
@@ -0,0 +1,73 @@
+package pro.qyoga.i9ns.calendars.google.views
+
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccount
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendar
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendarSettings
+import java.util.*
+
+
+private const val DEFAULT_CALENDAR_VISIBILITY = false
+
+data class GoogleAccountCalendarsSettingsView(
+    val id: UUID,
+    val email: String,
+    val content: GoogleCalendarsSettingsView
+) {
+
+    companion object {
+
+        fun of(
+            account: GoogleAccount,
+            calendars: Result<List<GoogleCalendar>>,
+            calendarSettings: Map<String, GoogleCalendarSettings>
+        ): GoogleAccountCalendarsSettingsView = GoogleAccountCalendarsSettingsView(
+            account.id,
+            account.email,
+            GoogleCalendarsSettingsView(calendars, calendarSettings)
+        )
+    }
+
+}
+
+sealed interface GoogleCalendarsSettingsView {
+
+    val calendars: List<GoogleCalendarSettingsView>
+    val isError: Boolean
+
+    data class Calendars(
+        override val calendars: List<GoogleCalendarSettingsView>,
+    ) : GoogleCalendarsSettingsView {
+        override val isError: Boolean = false
+    }
+
+    data object Error : GoogleCalendarsSettingsView {
+        override val calendars: List<GoogleCalendarSettingsView> = emptyList()
+        override val isError: Boolean = true
+    }
+
+    companion object {
+
+        operator fun invoke(
+            calendars: Result<List<GoogleCalendar>>,
+            calendarSettings: Map<String, GoogleCalendarSettings>
+        ): GoogleCalendarsSettingsView =
+            if (calendars.isSuccess) {
+                Calendars(calendars.getOrThrow().map {
+                    GoogleCalendarSettingsView(
+                        it.externalId,
+                        it.name,
+                        calendarSettings[it.externalId]?.shouldBeShown ?: DEFAULT_CALENDAR_VISIBILITY
+                    )
+                })
+            } else {
+                Error
+            }
+    }
+
+}
+
+data class GoogleCalendarSettingsView(
+    val id: String,
+    val title: String,
+    val shouldBeShown: Boolean
+)
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/ICalCalendarsConfig.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsConfig.kt
similarity index 78%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/ICalCalendarsConfig.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsConfig.kt
index 76e25de8e..a9da21af0 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/ICalCalendarsConfig.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsConfig.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.core.calendar.ical
+package pro.qyoga.i9ns.calendars.ical
 
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
@@ -8,4 +8,4 @@ import org.springframework.scheduling.annotation.EnableScheduling
 @ComponentScan
 @Configuration
 @EnableScheduling
-class ICalCalendarsConfig
\ No newline at end of file
+class ICalCalendarsConfig
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/ICalCalendarsRepo.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsRepo.kt
similarity index 53%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/ICalCalendarsRepo.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsRepo.kt
index 4abeb57b8..02242cb5a 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/ICalCalendarsRepo.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ICalCalendarsRepo.kt
@@ -1,18 +1,20 @@
-package pro.qyoga.core.calendar.ical
+package pro.qyoga.i9ns.calendars.ical
 
 import org.slf4j.LoggerFactory
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.java.time.Interval
 import pro.qyoga.core.calendar.api.CalendarItem
+import pro.qyoga.core.calendar.api.CalendarType
 import pro.qyoga.core.calendar.api.CalendarsService
-import pro.qyoga.core.calendar.ical.commands.CreateICalRq
-import pro.qyoga.core.calendar.ical.commands.createFrom
-import pro.qyoga.core.calendar.ical.model.*
-import pro.qyoga.core.calendar.ical.persistance.ICalCalendarsDao
-import pro.qyoga.core.calendar.ical.persistance.findAllByOwner
-import pro.qyoga.core.calendar.ical.platform.ical4j.toICalCalendarItem
+import pro.qyoga.core.calendar.api.SearchResult
 import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.ical.commands.CreateICalRq
+import pro.qyoga.i9ns.calendars.ical.commands.createFrom
+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
 
@@ -20,10 +22,12 @@ import java.time.ZonedDateTime
 @Component
 class ICalCalendarsRepo(
     private val iCalCalendarsDao: ICalCalendarsDao
-) : CalendarsService {
+) : CalendarsService<ICalEventId> {
 
     private val log = LoggerFactory.getLogger(javaClass)
 
+    override val type: CalendarType = ICalCalendar.Type
+
     fun addICal(createICalRq: CreateICalRq): ICalCalendar {
         val icsData = createICalRq.icsUrl.readText()
         val ical = ICalCalendar.createFrom(createICalRq, icsData)
@@ -33,26 +37,32 @@ class ICalCalendarsRepo(
     override fun findCalendarItemsInInterval(
         therapist: TherapistRef,
         interval: Interval<ZonedDateTime>
-    ): Iterable<CalendarItem<*, LocalDateTime>> {
+    ): SearchResult<ICalEventId> {
         val res = iCalCalendarsDao
             .findAllByOwner(therapist)
             .flatMap { ical -> ical.localizedICalCalendarItemsIn(interval) }
 
-        return res
+        return SearchResult(res)
     }
 
-    fun findById(therapist: TherapistRef, icsEventId: ICalEventId): CalendarItem<ICalEventId, ZonedDateTime>? {
-        return iCalCalendarsDao.findAllByOwner(therapist)
+    override fun findById(
+        therapistRef: TherapistRef,
+        eventId: ICalEventId
+    ): CalendarItem<ICalEventId, ZonedDateTime>? {
+        return iCalCalendarsDao.findAllByOwner(therapistRef)
             .asSequence()
-            .mapNotNull { it.findById(icsEventId) }
+            .mapNotNull { it.findById(eventId) }
             .firstOrNull()
             ?.toICalCalendarItem()
     }
 
+    override fun createItemId(itemId: Map<String, String?>): ICalEventId {
+        return ICalEventId(itemId["uid"]!!, itemId["rid"])
+    }
 
     @Scheduled(cron = "0 */10 * * * *")
     fun sync() {
-        log.info("Syncing calendars")
+        log.info("Syncing ical calendars")
         iCalCalendarsDao.forAll {
             Sync.syncCalendar(iCalCalendarsDao, it)
         }
@@ -62,6 +72,6 @@ class ICalCalendarsRepo(
 
 private fun ICalCalendar.localizedICalCalendarItemsIn(
     interval: Interval<ZonedDateTime>,
-): List<LocalizedICalCalendarItem> =
-    this.calendarItemsIn(interval)
-        .map(ICalCalendarItem::toLocalizedICalCalendarItem)
\ No newline at end of file
+): List<ICalCalendarItem<LocalDateTime>> =
+    (this.calendarItemsIn(interval) ?: emptyList())
+        .map { it.toLocalizedICalCalendarItem() }
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/Sync.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/Sync.kt
similarity index 81%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/Sync.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/Sync.kt
index a29862e1b..ecf400932 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/Sync.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/Sync.kt
@@ -1,8 +1,8 @@
-package pro.qyoga.core.calendar.ical
+package pro.qyoga.i9ns.calendars.ical
 
 import org.slf4j.LoggerFactory
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
-import pro.qyoga.core.calendar.ical.persistance.ICalCalendarsDao
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
+import pro.qyoga.i9ns.calendars.ical.persistance.ICalCalendarsDao
 import java.io.IOException
 
 
@@ -29,4 +29,4 @@ object Sync {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/commands/CreateICalRq.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/commands/CreateICalRq.kt
similarity index 80%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/commands/CreateICalRq.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/commands/CreateICalRq.kt
index de36acf5a..790a184bd 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/commands/CreateICalRq.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/commands/CreateICalRq.kt
@@ -1,7 +1,7 @@
-package pro.qyoga.core.calendar.ical.commands
+package pro.qyoga.i9ns.calendars.ical.commands
 
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
 import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
 import java.net.URL
 
 data class CreateICalRq(
@@ -21,4 +21,4 @@ fun ICalCalendar.Companion.createFrom(
         icsData
     )
     return ical
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/CalendarExt.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/CalendarExt.kt
new file mode 100644
index 000000000..20349d47a
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/CalendarExt.kt
@@ -0,0 +1,22 @@
+package pro.qyoga.i9ns.calendars.ical.ical4j
+
+import net.fortuna.ical4j.data.CalendarBuilder
+import net.fortuna.ical4j.data.ParserException
+import net.fortuna.ical4j.model.Calendar
+import net.fortuna.ical4j.util.CompatibilityHints
+import org.slf4j.LoggerFactory
+import java.io.StringReader
+
+private val log = LoggerFactory.getLogger(ICalIntegration::class.java)
+
+fun tryParseIcs(icsData: String): Calendar? {
+    CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true)
+    val sin = StringReader(icsData)
+    val builder = CalendarBuilder()
+    return try {
+        builder.build(sin)
+    } catch (e: ParserException) {
+        log.error("ics-file parsing failed", e)
+        null
+    }
+}
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/ICalIntegration.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/ICalIntegration.kt
new file mode 100644
index 000000000..0fc4796ec
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/ICalIntegration.kt
@@ -0,0 +1,4 @@
+package pro.qyoga.i9ns.calendars.ical.ical4j
+
+
+object ICalIntegration
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/PeriodExt.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/PeriodExt.kt
similarity index 70%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/PeriodExt.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/PeriodExt.kt
index bf8290984..b9737d3eb 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/PeriodExt.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/PeriodExt.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.core.calendar.ical.platform.ical4j
+package pro.qyoga.i9ns.calendars.ical.ical4j
 
 import net.fortuna.ical4j.model.Period
 import pro.azhidkov.platform.java.time.Interval
@@ -6,4 +6,4 @@ import java.time.temporal.Temporal
 
 
 fun <T : Temporal> Interval<T>.toICalPeriod() =
-    Period(from, to)
\ No newline at end of file
+    Period(from, to)
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/VEventExt.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/VEventExt.kt
similarity index 86%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/VEventExt.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/VEventExt.kt
index 2b880d011..ad49c8ca3 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/platform/ical4j/VEventExt.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/ical4j/VEventExt.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.core.calendar.ical.platform.ical4j
+package pro.qyoga.i9ns.calendars.ical.ical4j
 
 import net.fortuna.ical4j.model.Period
 import net.fortuna.ical4j.model.component.VEvent
@@ -6,8 +6,9 @@ import net.fortuna.ical4j.model.parameter.TzId
 import net.fortuna.ical4j.model.property.DtStart
 import net.fortuna.ical4j.model.property.RecurrenceId
 import pro.azhidkov.platform.java.time.toLocalDateTime
-import pro.qyoga.core.calendar.ical.model.ICalCalendarItem
-import pro.qyoga.core.calendar.ical.model.ICalEventId
+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,14 +56,14 @@ val VEvent.geographicsPosOrNull: String?
 val VEvent.locationOrNull: String?
     get() = this.location?.value
 
-fun VEvent.toICalCalendarItem(): ICalCalendarItem =
+fun VEvent.toICalCalendarItem(): ICalZonedCalendarItem =
     toICalCalendarItem(Period(startDateTime, startDateTime + javaDuration))
 
-fun VEvent.toICalCalendarItem(period: Period<ZonedDateTime>): ICalCalendarItem = ICalCalendarItem(
+fun VEvent.toICalCalendarItem(period: Period<ZonedDateTime>): ICalZonedCalendarItem = ICalCalendarItem(
     id,
     title,
     descriptionOrNull ?: "",
     period.start,
     period.duration as Duration,
     listOfNotNull(geographicsPosOrNull, locationOrNull).joinToString(", ")
-)
\ No newline at end of file
+)
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalCalendar.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalCalendar.kt
similarity index 60%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalCalendar.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalCalendar.kt
index 34bedd3f0..58c17799f 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalCalendar.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalCalendar.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.core.calendar.ical.model
+package pro.qyoga.i9ns.calendars.ical.model
 
 import net.fortuna.ical4j.model.component.VEvent
 import org.springframework.data.annotation.*
@@ -6,11 +6,12 @@ import org.springframework.data.relational.core.mapping.Table
 import pro.azhidkov.platform.java.time.Interval
 import pro.azhidkov.platform.uuid.UUIDv7
 import pro.qyoga.core.calendar.api.Calendar
-import pro.qyoga.core.calendar.ical.platform.ical4j.parseIcs
-import pro.qyoga.core.calendar.ical.platform.ical4j.recurrenceId
-import pro.qyoga.core.calendar.ical.platform.ical4j.toICalCalendarItem
-import pro.qyoga.core.calendar.ical.platform.ical4j.toICalPeriod
+import pro.qyoga.core.calendar.api.CalendarType
 import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.ical.ical4j.recurrenceId
+import pro.qyoga.i9ns.calendars.ical.ical4j.toICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.ical4j.toICalPeriod
+import pro.qyoga.i9ns.calendars.ical.ical4j.tryParseIcs
 import java.net.URL
 import java.time.Instant
 import java.time.ZonedDateTime
@@ -35,33 +36,35 @@ data class ICalCalendar(
 ) : Calendar {
 
     @Transient
-    override val type: String = TYPE
+    override val type: CalendarType = Type
 
-    val calendar by lazy {
-        parseIcs(icsFile)
+    val calendar: net.fortuna.ical4j.model.Calendar? by lazy {
+        tryParseIcs(icsFile)
     }
 
     fun withIcsFile(icsFile: String) =
         copy(icsFile = icsFile)
 
-    companion object {
-        const val TYPE = "ICAL"
+    object Type : CalendarType {
+        override val name = "ICAL"
     }
 
+    companion object
+
 }
 
-fun ICalCalendar.vEvents(): List<VEvent> =
-    calendar.getComponents("VEVENT")
+fun ICalCalendar.vEvents(): List<VEvent>? =
+    calendar?.getComponents("VEVENT")
 
 fun ICalCalendar.findById(eventId: ICalEventId) =
     vEvents()
-        .find { it.uid.get().value == eventId.uid && it.recurrenceId == eventId.recurrenceId }
+        ?.find { it.uid.get().value == eventId.uid && it.recurrenceId == eventId.recurrenceId }
 
 fun ICalCalendar.calendarItemsIn(
     interval: Interval<ZonedDateTime>
-): List<ICalCalendarItem> =
+): List<ICalZonedCalendarItem>? =
     vEvents()
-        .flatMap { ve: VEvent ->
+        ?.flatMap { ve: VEvent ->
             ve.calculateRecurrenceSet<ZonedDateTime>(interval.toICalPeriod())
                 .map { ve.toICalCalendarItem(it) }
-        }
\ No newline at end of file
+        }
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalCalendarItem.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalCalendarItem.kt
similarity index 51%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalCalendarItem.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalCalendarItem.kt
index 346529dd9..882d5282e 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/model/ICalCalendarItem.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalCalendarItem.kt
@@ -1,25 +1,29 @@
-package pro.qyoga.core.calendar.ical.model
+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(
+typealias ICalZonedCalendarItem = ICalCalendarItem<ZonedDateTime>
+
+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 ICalZonedCalendarItem.toLocalizedICalCalendarItem(): ICalCalendarItem<LocalDateTime> =
+    ICalCalendarItem(
         this.id,
         this.title,
         this.description,
         this.dateTime.toLocalDateTime(),
         this.duration,
         this.location
-    )
\ No newline at end of file
+    )
diff --git a/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalEventId.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalEventId.kt
new file mode 100644
index 000000000..c844724ab
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/model/ICalEventId.kt
@@ -0,0 +1,19 @@
+package pro.qyoga.i9ns.calendars.ical.model
+
+import pro.qyoga.core.calendar.api.CalendarItemId
+import pro.qyoga.core.calendar.api.CalendarType
+
+
+data class ICalEventId(
+    val uid: String,
+    val recurrenceId: String? = null
+) : CalendarItemId {
+
+    override val type: CalendarType = ICalCalendar.Type
+
+    override fun toMap(): Map<String, String?> = mapOf(
+        "uid" to uid,
+        "rid" to recurrenceId
+    )
+
+}
diff --git a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/persistance/ICalCalendarsDao.kt b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/persistance/ICalCalendarsDao.kt
similarity index 91%
rename from app/src/main/kotlin/pro/qyoga/core/calendar/ical/persistance/ICalCalendarsDao.kt
rename to app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/persistance/ICalCalendarsDao.kt
index 4cb1e485b..a17bbc286 100644
--- a/app/src/main/kotlin/pro/qyoga/core/calendar/ical/persistance/ICalCalendarsDao.kt
+++ b/app/src/main/kotlin/pro/qyoga/i9ns/calendars/ical/persistance/ICalCalendarsDao.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.core.calendar.ical.persistance
+package pro.qyoga.i9ns.calendars.ical.persistance
 
 import org.slf4j.LoggerFactory
 import org.springframework.data.domain.PageRequest
@@ -8,8 +8,8 @@ import org.springframework.data.relational.core.mapping.RelationalMappingContext
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations
 import org.springframework.stereotype.Repository
 import pro.azhidkov.platform.spring.sdj.ergo.ErgoRepository
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
 import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
 
 
 private val log = LoggerFactory.getLogger(ICalCalendarsDao::class.java)
@@ -33,4 +33,4 @@ fun ICalCalendarsDao.findAllByOwner(ownerRef: TherapistRef): List<ICalCalendar>
         ICalCalendar::ownerRef isEqual ownerRef
     }
         .also { if (it.hasNext()) log.warn("Therapist $ownerRef has more that 100 calendars") }
-        .content
\ No newline at end of file
+        .content
diff --git a/app/src/main/kotlin/pro/qyoga/infra/cache/CacheConf.kt b/app/src/main/kotlin/pro/qyoga/infra/cache/CacheConf.kt
new file mode 100644
index 000000000..9b45cf20e
--- /dev/null
+++ b/app/src/main/kotlin/pro/qyoga/infra/cache/CacheConf.kt
@@ -0,0 +1,9 @@
+package pro.qyoga.infra.cache
+
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.context.annotation.Configuration
+
+
+@EnableCaching
+@Configuration
+class CacheConf
\ No newline at end of file
diff --git a/app/src/main/kotlin/pro/qyoga/infra/db/SdjConfig.kt b/app/src/main/kotlin/pro/qyoga/infra/db/SdjConfig.kt
index c908e427b..605d313d5 100644
--- a/app/src/main/kotlin/pro/qyoga/infra/db/SdjConfig.kt
+++ b/app/src/main/kotlin/pro/qyoga/infra/db/SdjConfig.kt
@@ -18,6 +18,8 @@ class SdjConfig(
             PGIntervalToDurationConverter(),
             URLToStringConverter(),
             StringToURLConverter(),
+            SecretCharsToString(),
+            StringToSecretChars(),
             *modulesConverters.flatMap { it.converters() }.toTypedArray()
         )
     }
diff --git a/app/src/main/kotlin/pro/qyoga/infra/web/ThymeleafConfig.kt b/app/src/main/kotlin/pro/qyoga/infra/web/ThymeleafConfig.kt
index 673eb926c..4a165a844 100644
--- a/app/src/main/kotlin/pro/qyoga/infra/web/ThymeleafConfig.kt
+++ b/app/src/main/kotlin/pro/qyoga/infra/web/ThymeleafConfig.kt
@@ -3,12 +3,14 @@ package pro.qyoga.infra.web
 import com.fasterxml.jackson.databind.ObjectMapper
 import jakarta.annotation.PostConstruct
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Lazy
 import org.thymeleaf.spring6.SpringTemplateEngine
 import org.thymeleaf.standard.StandardDialect
 import org.thymeleaf.standard.serializer.IStandardJavaScriptSerializer
 
 
 @Configuration
+@Lazy(false)
 class ThymeleafConfig(
     private val objectMapper: ObjectMapper,
     private val engine: SpringTemplateEngine
diff --git a/app/src/main/resources/application-local-dev.yaml b/app/src/main/resources/application-local-dev.yaml
index 279479064..815f7c2c8 100644
--- a/app/src/main/resources/application-local-dev.yaml
+++ b/app/src/main/resources/application-local-dev.yaml
@@ -26,6 +26,13 @@ spring:
           starttls:
             enable: true
 
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            redirect-uri: "http://localhost:${server.port:8080}/therapist/oauth2/google/callback"
+
 management:
   health:
     mail:
@@ -34,4 +41,4 @@ management:
 
 logging:
   level:
-    org.springframework.jdbc.core.JdbcTemplate: TRACE
\ No newline at end of file
+    org.springframework.jdbc.core.JdbcTemplate: INFO
diff --git a/app/src/main/resources/application.yaml b/app/src/main/resources/application.yaml
index 86f7054d9..f8904d6dc 100644
--- a/app/src/main/resources/application.yaml
+++ b/app/src/main/resources/application.yaml
@@ -36,6 +36,29 @@ spring:
         cachecontrol:
           max-age: 1h
 
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            client-id: ${GOOGLE_CLIENT_ID:client-id}
+            client-secret: ${GOOGLE_CLIENT_SECRET:client-secret}
+            scope:
+              - openid
+              - email
+              - https://www.googleapis.com/auth/calendar.readonly
+            redirect-uri: "https://trainer-advisor.pro/therapist/oauth2/google/callback"
+            authorization-grant-type: authorization_code
+            client-name: Trainer Advisor
+            client-authentication-method: client_secret_post
+
+        provider:
+          google:
+            authorization-uri: https://accounts.google.com/o/oauth2/v2/auth?access_type=offline&prompt=consent
+            token-uri: https://oauth2.googleapis.com/token
+            user-info-uri: https://openidconnect.googleapis.com/v1/userinfo
+            user-name-attribute: email
+
 management:
   endpoints:
     web:
@@ -47,9 +70,9 @@ management:
   endpoint:
     configprops:
       show-values: when_authorized
-      enabled: true
+      access: read_only
     env:
-      enabled: true
+      access: read_only
       show-values: when_authorized
 
   info:
@@ -77,4 +100,8 @@ trainer-advisor:
   admin:
     email: ta@azhidkov.pro
 
-debug: false
\ No newline at end of file
+  integrations:
+    google-calendar:
+      root-url: https://www.googleapis.com/
+
+debug: false
diff --git a/app/src/main/resources/db/migration/common/current/V25091101__add_google_calendars.sql b/app/src/main/resources/db/migration/common/current/V25091101__add_google_calendars.sql
new file mode 100644
index 000000000..bdc5afac1
--- /dev/null
+++ b/app/src/main/resources/db/migration/common/current/V25091101__add_google_calendars.sql
@@ -0,0 +1,20 @@
+CREATE TABLE therapist_google_accounts
+(
+    id            UUID PRIMARY KEY,
+    owner_ref     UUID REFERENCES therapists NOT NULL,
+    email         VARCHAR NOT NULL,
+    refresh_token VARCHAR NOT NULL,
+
+    UNIQUE (owner_ref, email)
+);
+
+CREATE TABLE therapist_google_calendar_settings
+(
+    id                 UUID PRIMARY KEY,
+    owner_ref          UUID REFERENCES therapists                NOT NULL,
+    google_account_ref UUID REFERENCES therapist_google_accounts NOT NULL,
+    calendar_id VARCHAR NOT NULL,
+    should_be_shown    BOOLEAN                                   NOT NULL,
+
+    UNIQUE (owner_ref, google_account_ref, calendar_id)
+);
diff --git a/app/src/main/resources/static/privacy-policy.html b/app/src/main/resources/static/privacy-policy.html
new file mode 100644
index 000000000..a6427ca8c
--- /dev/null
+++ b/app/src/main/resources/static/privacy-policy.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="utf-8"/>
+    <meta content="IE=edge" http-equiv="X-UA-Compatible"/>
+    <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport"/>
+    <meta content="#e6e6e6" name="theme-color"/>
+    <meta content="yes" name="mobile-web-app-capable">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="default" name="apple-mobile-web-app-status-bar-style">
+    <meta content="TrainerAdvisor" name="apple-mobile-web-app-title">
+
+    <link href="/img/icon.png" rel="icon" type="image/x-icon">
+    <link href="/img/icon-192x192.png" rel="icon" sizes="192x192" type="image/png">
+    <link href="/img/icon-512x512.png" rel="icon" sizes="512x512" type="image/png">
+    <link href="/img/icon-192x192.png" rel="apple-touch-icon">
+    <link href="/vendor/bootstrap/css/bootstrap.css" rel="stylesheet"/>
+    <title>Trainer Advisor - Политика конфиденциальности</title>
+</head>
+<body>
+
+<div class="container my-5">
+    <div class="row justify-content-center">
+        <div class="col-lg-8">
+            <h1 class="mb-4">Политика конфиденциальности</h1>
+            <p class="text-muted">Дата вступления в силу: 26 сентября 2025</p>
+
+            <p>
+                Настоящая Политика конфиденциальности описывает, как сервис <strong>Trainer Advisor</strong>
+                (далее — «Сервис», «мы», «нас», «наш») собирает, использует, хранит и передаёт информацию о
+                пользователях.
+            </p>
+
+            <h2 class="mt-5">1. Кто мы</h2>
+            <p>
+                Оператор данных: <strong>Trainer Advisor</strong>.
+                Контактный адрес для вопросов по обработке персональных данных: <a href="mailto:ta@azhidkov.pro">ta@azhidkov.pro</a>.
+            </p>
+
+            <h2 class="mt-5">2. Какие данные мы собираем</h2>
+            <p>В зависимости от того, как вы используете Сервис, мы можем обрабатывать следующие категории данных:</p>
+            <ul>
+                <li><strong>Данные учётной записи</strong>: имя, адрес электронной почты, идентификатор аккаунта.</li>
+                <li><strong>Данные аутентификации</strong>: токены доступа/обновления, выданные провайдерами (например,
+                    Google), метаданные сессий.
+                </li>
+                <li><strong>Данные использования</strong>: технические лог‑данные, события в приложении, тип устройства,
+                    версия браузера, IP-адрес, дата и время запросов.
+                </li>
+                <li><strong>Контент, который вы предоставляете</strong> в рамках использования функциональности Сервиса.
+                </li>
+            </ul>
+
+            <h2 class="mt-5">3. Источники данных</h2>
+            <ul>
+                <li>Непосредственно от вас при регистрации и использовании Сервиса.</li>
+                <li>От сторонних провайдеров идентификации (например, Google) при вашем явном согласии на авторизацию
+                    через их аккаунт.
+                </li>
+                <li>Автоматически при взаимодействии с нашим веб‑сайтом и приложениями (cookies, журналы событий).</li>
+            </ul>
+
+            <h2 class="mt-5">4. Цели и правовые основания обработки</h2>
+            <ul>
+                <li><strong>Предоставление функциональности Сервиса</strong> (исполнение договора с пользователем).</li>
+                <li><strong>Аутентификация и безопасность</strong> (наш законный интерес в обеспечении безопасности
+                    учётных записей и инфраструктуры).
+                </li>
+            </ul>
+
+            <h2 class="mt-5">5. Использование данных Google и «Limited Use»</h2>
+            <p>
+                Если вы входите через Google или предоставляете доступ к данным Google, мы соблюдаем <a
+                    href="https://developers.google.com/terms/api-services-user-data-policy" rel="noopener"
+                    target="_blank">Политику использования данных пользователей API Google</a>, включая требования
+                «Limited Use».
+            </p>
+            <ul>
+                <li>Мы используем данные Google строго для предоставления заявленной функциональности пользователю.</li>
+                <li>Мы не передаём данные Google третьим лицам и не используем их для рекламы без вашего явного
+                    согласия.
+                </li>
+                <li>Доступ к данным ограничен минимально необходимым и предоставляется только системам/сотрудникам при
+                    необходимости.
+                </li>
+                <li>Мы не используем данные Google для создания профилей вне заявленных целей.</li>
+            </ul>
+
+            <h2 class="mt-5">6. Файлы cookie и аналогичные технологии</h2>
+            <p>
+                Мы используем строго необходимые cookies для обеспечения работы Сервиса.
+                Вы можете управлять cookies через настройки браузера.
+            </p>
+
+            <h2 class="mt-5">7. Передача и совместное использование данных</h2>
+            <p>
+                Мы не продаём ваши персональные данные. Мы можем передавать данные следующим категориям получателей при
+                наличии оснований:
+            </p>
+            <ul>
+                <li>Провайдерам облачной инфраструктуры, мониторинга, аналитики и уведомлений (как операторам по
+                    поручению) — на основании договоров обработки данных.
+                </li>
+                <li>Компетентным государственным органам — если это требуется законом.</li>
+                <li>Правопреемникам в случае реорганизации/слияния при соблюдении применимых требований.</li>
+            </ul>
+
+            <h2 class="mt-5">8. Сроки хранения</h2>
+            <p>
+                Мы храним персональные данные только столько, сколько необходимо для целей, для которых они были
+                собраны, и/или в сроки, требуемые законом.
+                По удалению учётной записи ваши персональные данные будут удалены или анонимизированы в разумный срок,
+                за исключением данных, которые мы обязаны хранить дольше в силу закона.
+            </p>
+
+            <h2 class="mt-5">9. Безопасность</h2>
+            <p>
+                Мы применяем организационные и технические меры защиты, включая шифрование при передаче, контроль
+                доступа, аудит и журналирование.
+                Однако ни один метод передачи данных через Интернет или хранения не может быть абсолютно безопасным.
+            </p>
+
+            <h2 class="mt-5">10. Ваши права</h2>
+            <p>
+                В зависимости от юрисдикции вам могут быть доступны следующие права: доступ к данным, исправление,
+                удаление, ограничение обработки, возражение против обработки, переносимость данных, отзыв согласия.
+                Чтобы реализовать права, свяжитесь с нами по адресу <a href="mailto:ta@azhidkov.pro">ta@azhidkov.pro</a>.
+            </p>
+
+            <h2 class="mt-5">11. Детская аудитория</h2>
+            <p>
+                Сервис не предназначен для лиц младше 18 лет.
+                Мы не собираем умышленно персональные данные детей.
+                Если вы считаете, что ребёнок предоставил нам данные, свяжитесь с нами для удаления таких данных.
+            </p>
+
+            <h2 class="mt-5">12. Изменения настоящей политики</h2>
+            <p>
+                Мы можем периодически обновлять Политику.
+                Актуальная версия всегда доступна на этой странице.
+                При существенных изменениях мы уведомим пользователей через интерфейс Сервиса или иными доступными
+                способами.
+            </p>
+
+            <h2 class="mt-5">13. Контакты</h2>
+            <p>
+                По вопросам конфиденциальности свяжитесь с нами:
+            </p>
+            <ul>
+                <li>Email: <a href="mailto:ta@azhidkov.pro">ta@azhidkov.pro</a></li>
+            </ul>
+
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/app/src/main/resources/static/vendor/htmx/js/json-enc-2.0.2.min.js b/app/src/main/resources/static/vendor/htmx/js/json-enc-2.0.2.min.js
new file mode 100644
index 000000000..248169716
--- /dev/null
+++ b/app/src/main/resources/static/vendor/htmx/js/json-enc-2.0.2.min.js
@@ -0,0 +1 @@
+(function(){let s;htmx.defineExtension("json-enc",{init:function(n){s=n},onEvent:function(n,e){if(n==="htmx:configRequest"){e.detail.headers["Content-Type"]="application/json"}},encodeParameters:function(n,e,t){n.overrideMimeType("text/json");const i={};e.forEach(function(n,e){if(Object.hasOwn(i,e)){if(!Array.isArray(i[e])){i[e]=[i[e]]}i[e].push(n)}else{i[e]=n}});const o=s.getExpressionVars(t);Object.keys(i).forEach(function(n){i[n]=Object.hasOwn(o,n)?o[n]:i[n]});return JSON.stringify(i)}})})();
\ No newline at end of file
diff --git a/app/src/main/resources/templates/fragments/header.html b/app/src/main/resources/templates/fragments/header.html
index 8b5c4d3a8..85ff8ede6 100644
--- a/app/src/main/resources/templates/fragments/header.html
+++ b/app/src/main/resources/templates/fragments/header.html
@@ -10,6 +10,7 @@
 <link href="/vendor/bootstrap/css/bootstrap.css" rel="stylesheet"/>
 
 <script src="/vendor/htmx/js/htmx-2.0.4.min.js"></script>
+<script src="/vendor/htmx/js/json-enc-2.0.2.min.js"></script>
 
 <script defer src="/vendor/alpinejs/js/alipnejs-mask-3.14.8.min.js"></script>
 <script defer src="/vendor/alpinejs/js/alpinejs-3.14.8.min.js"></script>
diff --git a/app/src/main/resources/templates/public/landing.html b/app/src/main/resources/templates/public/landing.html
index f28ab3f0b..5271ec051 100644
--- a/app/src/main/resources/templates/public/landing.html
+++ b/app/src/main/resources/templates/public/landing.html
@@ -94,8 +94,17 @@ <h4>Расписание занятий</h4>
             </a>
         </div>
     </div>
+
+    <div class="row mb-3">
+        <div class="col text-center">
+            <small class="text-muted">
+                <a href="/privacy-policy.html">Политика конфиденциальности</a>
+            </small>
+        </div>
+    </div>
+
 </main>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/app/src/main/resources/templates/therapist/appointments/google-settings-component.html b/app/src/main/resources/templates/therapist/appointments/google-settings-component.html
new file mode 100644
index 000000000..d1d8c994d
--- /dev/null
+++ b/app/src/main/resources/templates/therapist/appointments/google-settings-component.html
@@ -0,0 +1,69 @@
+<div id="google-calendar-settings">
+    <h6>Google Calendar</h6>
+    <div class="d-grid gap-2 pt-2 pb-3">
+        <div class="text-muted" th:unless="${hasAccounts}">
+            Нет подключенных аккаунтов
+        </div>
+
+        <div th:if="${hasAccounts}">
+            <div class="mb-2 google-account-item" th:each="account : ${accounts}">
+                <div class="border-bottom pb-1 mb-2 text-body-secondary small" th:text="${account.email}">
+                    email@example.com
+                </div>
+                <div th:if="${!account.content.isError}">
+                    <ul class="list-unstyled ms-3 my-1">
+                        <li
+                                class="calendar-list-item d-flex justify-content-between align-items-center py-2"
+                                th:each="cal : ${account.content.calendars}"
+                                th:id="${cal.id}"
+                        >
+                            <span
+                                    class="calendar-name"
+                                    th:text="${cal.title}"
+                            >
+                                Calendar name
+                            </span>
+                            <div class="form-check form-switch m-0">
+                                <input
+                                        aria-label="Показывать календарь"
+                                        class="should-be-shown-toggle form-check-input"
+                                        name="shouldBeShown"
+                                        style="height: 22px;width: 44px;"
+                                        hx-ext="json-enc"
+                                        hx-swap="none"
+                                        hx-trigger="change"
+                                        hx-vals='js:{ "shouldBeShown": !!event.target.checked }'
+                                        th:checked="${cal.shouldBeShown}"
+                                        type="checkbox"
+                                        th:attr="hx-patch=@{/therapist/schedule/settings/google-calendar/{accountId}/calendars/{id}(accountId=${account.id},id=${cal.id})}"
+                                >
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div
+                        class="text-danger ms-3 my-1 google-account-error-content d-inline-flex align-items-center"
+                        th:if="${account.content.isError}"
+                >
+                    <svg aria-hidden="true" class="me-2 align-middle" height="14" style="fill: currentColor;"
+                         viewBox="0 0 16 16" width="14" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"/>
+                        <path d="M7.002 11a1 1 0 1 0 2 0 1 1 0 0 0-2 0M7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.555.555 0 0 1-1.1 0z"/>
+                    </svg>
+                    Ошибка получения календарей аккаунта
+                </div>
+            </div>
+        </div>
+    </div>
+    <a
+            class="btn btn-outline-secondary"
+            th:href="@{/oauth2/authorization/google}"
+            id="connect-google-calendar"
+    >
+        <img alt="G"
+             class="me-2"
+             src="https://www.gstatic.com/marketing-cms/assets/images/d5/dc/cfe9ce8b4425b410b49b7f2dd3f3/g.webp=s48-fcrop64=1,00000000ffffffff-rw"
+             width="20"> Добавить аккаунт
+    </a>
+
+</div>
diff --git a/app/src/main/resources/templates/therapist/appointments/schedule.html b/app/src/main/resources/templates/therapist/appointments/schedule.html
index 05a1eaef0..726611e1a 100644
--- a/app/src/main/resources/templates/therapist/appointments/schedule.html
+++ b/app/src/main/resources/templates/therapist/appointments/schedule.html
@@ -58,14 +58,31 @@
 
         window.addEventListener("load", () => {
             document.body.addEventListener('htmx:afterSwap', function (evt) {
-                if (evt.detail.xhr.status === 200) {
+                const openedUrl = new URL(evt.detail.requestConfig.path, window.location.origin);
+                if (evt.detail.xhr.status === 200 && openedUrl.pathname === '/therapist/schedule') {
                     revealAppointment();
                 }
             })
 
             revealAppointment();
         });
+    </script>
+
+    <script defer id="autoOpenSettingsModal">
+        function autoOpenSettingsModal() {
+            const urlParams = new URLSearchParams(window.location.search);
+            if (urlParams.get('google-connected') !== 'true') {
+                return;
+            }
+
+            const settingsModal = new bootstrap.Modal(document.getElementById('settingsModal'));
+            settingsModal.show();
+            urlParams.delete('google-connected');
+            const newUrl = window.location.pathname + (urlParams.toString() ? '?' + urlParams.toString() : '');
+            window.history.replaceState({}, '', newUrl);
+        }
 
+        window.addEventListener("load", autoOpenSettingsModal);
     </script>
 
 </head>
@@ -75,30 +92,48 @@
 <div th:replace="~{fragments/headerNavPanel :: headerNavPanel(pageName='Расписание', controlsView=~{:: #datePickerView})}">
 
     <div class="calendar-header bg-white z-3" id="datePickerView">
-        <button class="btn btn-outline-secondary"
-                name="datePickerButton"
-                onclick="document.getElementById('datePicker').showPicker()"
-                th:href="@{/therapist/schedule?calendar=true&date={date}(date=${today})}"
-
+        <div class="position-relative d-inline-block">
+            <button
+                    class="btn btn-outline-secondary"
+                    name="datePickerButton"
+                    th:href="@{/therapist/schedule?calendar=true&date={date}(date=${today})}"
+                    onclick="document.getElementById('datePicker').showPicker()"
+            >
+                <i class="fa-solid fa-calendar"></i>
+            </button>
+
+            <input class="position-absolute top-50 opacity-0 pointer-event"
+                   hx-push-url="true"
+                   hx-select="main"
+                   hx-swap="outerHTML"
+                   hx-target="main"
+                   hx-trigger="change"
+                   id="datePicker"
+                   name="date"
+                   style="transform: translateX(-200%);"
+                   th:hx-get="@{/therapist/schedule}"
+                   th:value="${date}"
+                   type="date"
+            >
+        </div>
+
+        <button
+                class="btn btn-outline-secondary ms-2 position-relative"
+                data-bs-target="#settingsModal"
+                data-bs-toggle="modal"
         >
-                        <span th:text="${selectedDayLabel}">
-                        </span>
-            &nbsp;
-            <i class="fa-solid fa-chevron-down"></i>
+            <i class="fa-solid fa-gear"></i>
+            <i
+                    aria-hidden="true"
+                    class="sync-error-icon
+                           fa-solid fa-circle-exclamation text-danger bg-white
+                           position-absolute top-0 start-0 translate-middle
+                           "
+                    style="border-radius: 50%;"
+                    th:if="${hasSyncErrors}"
+                    title="Ошибки синхронизации"
+            ></i>
         </button>
-
-        <input class="d-none"
-               hx-push-url="true"
-               hx-select="main"
-               hx-swap="outerHTML"
-               hx-target="main"
-               hx-trigger="change"
-               id="datePicker"
-               name="date"
-               th:hx-get="@{/therapist/schedule}"
-               th:value="${date}"
-               type="date"
-        >
     </div>
 </div>
 
@@ -108,7 +143,6 @@
 
     <div id="layoutSidenav_content">
         <main class="container px-4">
-
             <section class="mt-3" id="calendar" th:fragment="calendarSchedule" xmlns:th="http://www.w3.org/1999/html">
 
                 <div class="calendar-body mb-4">
@@ -147,6 +181,31 @@
     </div>
 </div>
 
-</body>
+<div aria-hidden="true" aria-labelledby="settingsModalLabel" class="modal fade" id="settingsModal" tabindex="-1">
+    <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="settingsModalLabel">Настройки календарей</h5>
+                <button aria-label="Close" class="btn-close" data-bs-dismiss="modal" type="button"></button>
+            </div>
+            <div class="modal-body">
+                <div hx-get="/therapist/schedule/settings/google-calendar"
+                     hx-swap="innerHTML"
+                     hx-trigger="intersect"
+                     id="google-calendar-settings-container">
+                    <div class="text-center py-3">
+                        <div class="mt-2">
+                            <small class="text-muted">Загрузка настроек Google Calendar...</small>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-outline-secondary" data-bs-dismiss="modal" type="button">Закрыть</button>
+            </div>
+        </div>
+    </div>
+</div>
 
+</body>
 </html>
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/publc/surveys/SubmitSurveyTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/publc/surveys/SubmitSurveyTest.kt
index 2860a27f6..f042764cd 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/app/publc/surveys/SubmitSurveyTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/publc/surveys/SubmitSurveyTest.kt
@@ -22,12 +22,13 @@ import pro.qyoga.tests.fixture.object_mothers.survey_forms.SurveyFormsSettingsOb
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_ADMIN_LOGIN
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
+import pro.qyoga.tests.infra.web.mainWebTestClient
 
 
 @DisplayName("Операция создания анкеты")
 class SubmitSurveyTest : QYogaAppIntegrationBaseKoTest({
 
-    val yandexFormsClient by lazy { YandexFormsClient(client) }
+    val yandexFormsClient by lazy { YandexFormsClient(mainWebTestClient) }
 
     "при отправке новым клиентом корректного запроса со всеми значениями карточки должна" - {
         // Сетап
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CalendarPageModelTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CalendarPageModelTest.kt
index f6d5eb64b..3a3f4610b 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CalendarPageModelTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CalendarPageModelTest.kt
@@ -6,7 +6,8 @@ import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel
+import pro.qyoga.app.therapist.appointments.core.schedule.GetCalendarAppointmentsRs
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel
 import pro.qyoga.app.therapist.appointments.core.schedule.TimeMark
 import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMother.randomLocalizedAppointmentSummary
 import java.time.Duration
@@ -31,10 +32,10 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(today, appointments)
+        val schedulePageModel = SchedulePageModel.of(today, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        calendarPageModel.timeMarks.first().time shouldBe firstAppointmentStartTime
+        schedulePageModel.timeMarks.first().time shouldBe firstAppointmentStartTime
     }
 
 
@@ -56,10 +57,10 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(today, appointments)
+        val schedulePageModel = SchedulePageModel.of(today, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        val lastTimeMark = calendarPageModel.timeMarks.last()
+        val lastTimeMark = schedulePageModel.timeMarks.last()
         (lastTimeMark.time + TimeMark.length) shouldBeGreaterThanOrEqualTo (lastAppointmentStartTime + lastAppointmentDuration)
     }
 
@@ -78,10 +79,10 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(today, appointments)
+        val schedulePageModel = SchedulePageModel.of(today, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        calendarPageModel.timeMarks.first().time shouldBe LocalTime.MIDNIGHT
+        schedulePageModel.timeMarks.first().time shouldBe LocalTime.MIDNIGHT
     }
 
     @Test
@@ -99,10 +100,10 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(yesterday, appointments)
+        val schedulePageModel = SchedulePageModel.of(yesterday, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        calendarPageModel.timeMarks.first().time shouldBe LocalTime.MIDNIGHT
+        schedulePageModel.timeMarks.first().time shouldBe LocalTime.MIDNIGHT
     }
 
     @Test
@@ -121,11 +122,11 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(today, appointments)
+        val schedulePageModel = SchedulePageModel.of(today, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        calendarPageModel.timeMarks.first().time.hour shouldBe CalendarPageModel.DEFAULT_START_HOUR
-        calendarPageModel.timeMarks.last().time.hour shouldBe 23
+        schedulePageModel.timeMarks.first().time.hour shouldBe SchedulePageModel.DEFAULT_START_HOUR
+        schedulePageModel.timeMarks.last().time.hour shouldBe 23
     }
 
     @Test
@@ -144,11 +145,11 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(today, appointments)
+        val schedulePageModel = SchedulePageModel.of(today, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        calendarPageModel.timeMarks.first().time shouldBe LocalTime.MIDNIGHT
-        calendarPageModel.timeMarks.last().time.hour shouldBe CalendarPageModel.DEFAULT_END_HOUR
+        schedulePageModel.timeMarks.first().time shouldBe LocalTime.MIDNIGHT
+        schedulePageModel.timeMarks.last().time.hour shouldBe SchedulePageModel.DEFAULT_END_HOUR
     }
 
     @Test
@@ -185,13 +186,13 @@ class CalendarPageModelTest {
         )
 
         // Действие
-        val calendarPageModel = CalendarPageModel.of(today, appointments)
+        val schedulePageModel = SchedulePageModel.of(today, GetCalendarAppointmentsRs(appointments, false))
 
         // Проверка
-        calendarPageModel.appointmentCards() shouldHaveSize 2
+        schedulePageModel.appointmentCards() shouldHaveSize 2
     }
 
 }
 
-fun CalendarPageModel.appointmentCards() =
+fun SchedulePageModel.appointmentCards() =
     timeMarks.flatMap { it.days }.mapNotNull { it.second }
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt
index 8e78bd8a4..4564f0da6 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/CreateAppointmentPageTest.kt
@@ -6,9 +6,8 @@ import org.junit.jupiter.api.Test
 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.view_model.SourceItem
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.toQueryParamStr
-import pro.qyoga.core.calendar.ical.model.ICalCalendarItem
+import pro.qyoga.app.therapist.appointments.core.edit.forms.formatCommentFor
+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
@@ -21,7 +20,9 @@ import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMot
 import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMother.randomFullEditAppointmentRequest
 import pro.qyoga.tests.fixture.object_mothers.appointments.randomAppointmentDate
 import pro.qyoga.tests.fixture.object_mothers.calendars.CalendarsObjectMother.aCalendarItem
-import pro.qyoga.tests.fixture.presets.CalendarsFixturePresets
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother
+import pro.qyoga.tests.fixture.presets.GoogleCalendarsFixturePresets
+import pro.qyoga.tests.fixture.presets.ICalsCalendarsFixturePresets
 import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseTest
 import pro.qyoga.tests.pages.therapist.appointments.CreateAppointmentForm
 import pro.qyoga.tests.pages.therapist.appointments.CreateAppointmentPage
@@ -43,7 +44,8 @@ private val aTime = LocalTime.now()
 @DisplayName("Страница создания приёма")
 class CreateAppointmentPageTest : QYogaAppIntegrationBaseTest() {
 
-    private val calendarsFixturePresets = getBean<CalendarsFixturePresets>()
+    private val iCalsCalendarsFixturePresets = getBean<ICalsCalendarsFixturePresets>()
+    private val googleCalendarsFixturePresets = getBean<GoogleCalendarsFixturePresets>()
 
     @Test
     fun `должна рендерится корректно`() {
@@ -155,24 +157,51 @@ 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(ICalZonedCalendarItem::dateTime),
+                randomAppointmentDate().atZone(asiaNovosibirskTimeZone)
+            )
+            set(field(ICalZonedCalendarItem::duration), Duration.ofMinutes(75))
+            set(field(ICalZonedCalendarItem::description), randomSentence())
         }
-        calendarsFixturePresets.createICalCalendarWithSingleEvent(event)
+        iCalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(event)
 
         // Действие
         val document = theTherapist.appointments.getCreateAppointmentPage(
             dateTime = event.dateTime.toLocalDateTime(),
-            sourceItem = SourceItem.icsEvent(event.id)
+            sourceItem = event.id.toUri()
         )
 
         // Проверка
-        CreateAppointmentForm.externalIdInput.value(document) shouldBe event.id.toQueryParamStr()
+        CreateAppointmentForm.externalIdInput.value(document) shouldBe event.id.toUri().toString()
         CreateAppointmentForm.dateTime.value(document) shouldBe event.dateTime.toLocalDateTime().toString()
         CreateAppointmentForm.timeZone.value(document) shouldBe event.dateTime.zone.id
         CreateAppointmentForm.duration.value(document) shouldBe event.duration.toLocalTimeString()
-        CreateAppointmentForm.comment.value(document) shouldBe event.description
+        CreateAppointmentForm.comment.value(document) shouldBe formatCommentFor(event)
     }
 
-}
\ No newline at end of file
+    @Test
+    @DisplayName("должна предзаполнять дату, время, длительность и идентификатор события источника данными из события goolge-календаря, если его ид был передан в запросе") // длина имени файла с лямбдой превышает ограничение Линукса
+    fun createAppointmentWithGoogleEventId() {
+        // Сетап
+        val event = GoogleCalendarObjectMother.aGoogleCalendarItem(
+            date = { randomAppointmentDate().atZone(asiaNovosibirskTimeZone) }
+        )
+        val singleEventFixture = GoogleCalendarsFixturePresets.withSingleCalendarAndEvent(event)
+        googleCalendarsFixturePresets.insertFixture(singleEventFixture)
+
+        // Действие
+        val document = theTherapist.appointments.getCreateAppointmentPage(
+            dateTime = event.dateTime.toLocalDateTime(),
+            sourceItem = event.id.toUri()
+        )
+
+        // Проверка
+        CreateAppointmentForm.externalIdInput.value(document) shouldBe event.id.toUri().toString()
+        CreateAppointmentForm.dateTime.value(document) shouldBe event.dateTime.toLocalDateTime().toString()
+        CreateAppointmentForm.timeZone.value(document) shouldBe asiaNovosibirskTimeZone.id
+        CreateAppointmentForm.duration.value(document) shouldBe event.duration.toLocalTimeString()
+        CreateAppointmentForm.comment.value(document) shouldBe formatCommentFor(event)
+    }
+
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageControllerTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageControllerTest.kt
index 4498add99..86f0fc8d9 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageControllerTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageControllerTest.kt
@@ -4,15 +4,21 @@ import io.kotest.core.annotation.DisplayName
 import io.kotest.matchers.collections.shouldHaveSize
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController
 import pro.qyoga.tests.assertions.shouldMatch
+import pro.qyoga.tests.fixture.data.randomWorkingTime
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleCalendarItem
 import pro.qyoga.tests.fixture.object_mothers.therapists.theTherapistUserDetails
 import pro.qyoga.tests.fixture.presets.AppointmentsFixturePresets
+import pro.qyoga.tests.fixture.presets.GoogleCalendarsFixturePresets
 import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
+import java.time.LocalDate
 
 
 @DisplayName("Контроллер страницы календаря")
 class SchedulePageControllerTest : QYogaAppIntegrationBaseKoTest({
 
     val appointmentsFixturePresets = getBean<AppointmentsFixturePresets>()
+    val googleCalendarsFixturePresets = getBean<GoogleCalendarsFixturePresets>()
+
     val schedulePageController = getBean<SchedulePageController>()
 
     "при наличии приёма, созданного на базе события ics-календаря" - {
@@ -30,4 +36,41 @@ class SchedulePageControllerTest : QYogaAppIntegrationBaseKoTest({
         }
     }
 
-})
\ No newline at end of file
+    "если есть подключенный, но не настроенный Google-аккаунт с календарём с событием 14 сентября 25 года, то при запросе расписания за 13-15 сентября метод должен не включать это событие" {
+        // Сетап
+        val date = LocalDate.of(2025, 9, 14)
+        val event = aGoogleCalendarItem(
+            date = { date.atTime(randomWorkingTime()) }
+        )
+        val singleEventFixture = GoogleCalendarsFixturePresets.withSingleCalendarAndEvent(
+            event,
+            shouldBeShown = false
+        )
+        googleCalendarsFixturePresets.insertFixture(singleEventFixture)
+
+        // Действие
+        val calendarPageModel =
+            schedulePageController.getCalendarPage(date, null, theTherapistUserDetails)
+
+        // Проверка
+        calendarPageModel.appointmentCards() shouldHaveSize 0
+    }
+
+    "если есть подключенный и настроенный Google-аккаунт с календарём с событием 14 сентября 25 года, то при запросе расписания за 13-15 сентября метод должен включать это событие" {
+        // Сетап
+        val date = LocalDate.of(2025, 9, 14)
+        val event = aGoogleCalendarItem(
+            date = { date.atTime(randomWorkingTime()) },
+        )
+        val singleEventFixture = GoogleCalendarsFixturePresets.withSingleCalendarAndEvent(event)
+        googleCalendarsFixturePresets.insertFixture(singleEventFixture)
+
+        // Действие
+        val calendarPageModel =
+            schedulePageController.getCalendarPage(date, null, theTherapistUserDetails)
+
+        // Проверка
+        calendarPageModel.appointmentCards() shouldHaveSize 1
+    }
+
+})
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageTest.kt
index 3de462205..1e43dbeec 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/appointments/core/SchedulePageTest.kt
@@ -6,15 +6,19 @@ 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.core.calendar.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
 import pro.qyoga.tests.clients.TherapistClient
 import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
 import pro.qyoga.tests.fixture.data.randomWorkingTime
 import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMother
 import pro.qyoga.tests.fixture.object_mothers.appointments.DURATION_FOR_FULL_LABEL
 import pro.qyoga.tests.fixture.object_mothers.calendars.CalendarsObjectMother.aCalendarItem
-import pro.qyoga.tests.fixture.presets.CalendarsFixturePresets
+import pro.qyoga.tests.fixture.presets.GoogleCalendarsFixturePresets
+import pro.qyoga.tests.fixture.presets.ICalsCalendarsFixturePresets
+import pro.qyoga.tests.fixture.presets.ScheduleFixturePreset
 import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseTest
 import pro.qyoga.tests.pages.therapist.appointments.CalendarPage
 import pro.qyoga.tests.pages.therapist.appointments.appointmentCards
@@ -26,7 +30,7 @@ import java.time.LocalDate
 @DisplayName("Страница календаря")
 class SchedulePageTest : QYogaAppIntegrationBaseTest() {
 
-    private val calendarsFixturePresets = getBean<CalendarsFixturePresets>()
+    private val iCalsCalendarsFixturePresets = getBean<ICalsCalendarsFixturePresets>()
 
     @Test
     fun `должна корректно рендерить пустой календарь за текущую дату`() {
@@ -112,11 +116,14 @@ 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(ICalZonedCalendarItem::dateTime),
+                today.atTime(randomWorkingTime()).atZone(asiaNovosibirskTimeZone)
+            )
+            set(field(ICalZonedCalendarItem::duration), AppointmentsObjectMother.fullCardDuration)
         }
 
-        calendarsFixturePresets.createICalCalendarWithSingleEvent(event)
+        iCalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(event)
 
         // Действие
         val document = theTherapist.appointments.getScheduleForDay(today)
@@ -127,4 +134,25 @@ class SchedulePageTest : QYogaAppIntegrationBaseTest() {
         document.appointmentCards().single() shouldMatch event
     }
 
-}
\ No newline at end of file
+    @Test
+    fun `должна рендериться корректно, даже если у терапевта есть подключенный Google-календарь и запрос событий из него приводит к ошибке`() {
+        // Arrange
+        val fixture = ScheduleFixturePreset.withSingleAppointmentAndEnabledGoogleCalendar()
+        val appointment = fixture.theAppointment()
+        val day = appointment.dateTime.toLocalDate()
+        val scheduleFixturePresets = getBean<ScheduleFixturePreset>()
+        scheduleFixturePresets.insertFixture(fixture)
+        val googleCalendarsFixturePresets = getBean<GoogleCalendarsFixturePresets>()
+        googleCalendarsFixturePresets.setFailureOnRequestForEvents(fixture.googleCalendarsFixture)
+
+        // Act
+        val document = theTherapist.appointments.getScheduleForDay(day)
+
+        // Assert
+        document shouldBePage CalendarPage
+        document.appointmentCards() shouldHaveSize 1
+        document.appointmentCards().single() shouldMatch appointment
+        document shouldHaveComponent SelectorOnlyComponent(CalendarPage.SYNC_ERROR_ICON_SELECTOR)
+    }
+
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GetGoogleCalendarsSettingsEndpointTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GetGoogleCalendarsSettingsEndpointTest.kt
new file mode 100644
index 000000000..3e7fc0a14
--- /dev/null
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GetGoogleCalendarsSettingsEndpointTest.kt
@@ -0,0 +1,92 @@
+package pro.qyoga.tests.cases.app.therapist.calendars.google
+
+import io.kotest.core.annotation.DisplayName
+import pro.qyoga.i9ns.calendars.google.views.GoogleAccountCalendarsSettingsView
+import pro.qyoga.i9ns.calendars.google.views.GoogleCalendarSettingsView
+import pro.qyoga.i9ns.calendars.google.views.GoogleCalendarsSettingsView
+import pro.qyoga.tests.assertions.shouldHaveComponent
+import pro.qyoga.tests.clients.TherapistClient
+import pro.qyoga.tests.fixture.data.faker
+import pro.qyoga.tests.fixture.presets.GoogleCalendarsFixturePresets
+import pro.qyoga.tests.infra.test_config.spring.context
+import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
+import pro.qyoga.tests.pages.therapist.appointments.google_calendars.GoogleCalendarsSettingsComponent
+import pro.qyoga.tests.platform.spring.context.getBean
+import java.util.*
+
+
+@DisplayName("Эндпоинт получения компонента настройки интеграции с Google Calendar")
+class GetGoogleCalendarsSettingsEndpointTest : QYogaAppIntegrationBaseKoTest({
+
+    val googleCalendarsFixturePresets = context.getBean<GoogleCalendarsFixturePresets>()
+
+    "должен возвращать пустой список аккаунтов для терапевта без настроенной интеграции" {
+        // Сетап
+        val therapist = TherapistClient.loginAsTheTherapist()
+        val accounts = emptyList<GoogleAccountCalendarsSettingsView>()
+
+        // Действие
+        val res = therapist.googleCalendarIntegration.getGoogleCalendarComponent()
+
+        // Проверка
+        res shouldHaveComponent GoogleCalendarsSettingsComponent(accounts)
+    }
+
+    "должен корректно рендерить компонент настройки интеграции с Google Calendar с календарями" - {
+        // Сетап
+        val therapist = TherapistClient.loginAsTheTherapist()
+        val twoCalendarsFixture = GoogleCalendarsFixturePresets.withTwoCalendars(
+            shouldBeShown = listOf(true, false)
+        )
+        googleCalendarsFixturePresets.insertFixture(twoCalendarsFixture)
+
+        val expectedCalendarsSettings =
+            GoogleCalendarsSettingsView.Calendars(twoCalendarsFixture.calendarsAndSettings.map { (cal, settings) ->
+                GoogleCalendarSettingsView(
+                    cal.externalId,
+                    cal.name,
+                    settings.shouldBeShown
+                )
+            })
+        val expectedAccounts = listOf(
+            GoogleAccountCalendarsSettingsView(
+                UUID.fromString(faker.internet().uuid()),
+                twoCalendarsFixture.theGoogleAccount.email,
+                expectedCalendarsSettings
+            )
+        )
+
+        // Действие
+        val res = therapist.googleCalendarIntegration.getGoogleCalendarComponent()
+
+        "должен корректно вернуть компонент, в котором у аккаунта вместо списка календарей выведена ошибка" {
+            // Проверка
+            res shouldHaveComponent GoogleCalendarsSettingsComponent(expectedAccounts)
+        }
+    }
+
+    "в случае если запрос календарей в гугле возвращает ошибку" - {
+        // Сетап
+        val therapist = TherapistClient.loginAsTheTherapist()
+        val singleCalendarFixture = GoogleCalendarsFixturePresets.withSingleCalendar()
+        googleCalendarsFixturePresets.insertFixture(singleCalendarFixture)
+        googleCalendarsFixturePresets.setFailureOnRequestForCalendars(singleCalendarFixture)
+
+        val expectedAccounts = listOf(
+            GoogleAccountCalendarsSettingsView(
+                UUID.fromString(faker.internet().uuid()),
+                singleCalendarFixture.theGoogleAccount.email,
+                GoogleCalendarsSettingsView.Error
+            )
+        )
+
+        // Действие
+        val res = therapist.googleCalendarIntegration.getGoogleCalendarComponent()
+
+        "должен корректно вернуть компонент, в котором у аккаунта вместо списка календарей выведена ошибка" {
+            // Проверка
+            res shouldHaveComponent GoogleCalendarsSettingsComponent(expectedAccounts)
+        }
+
+    }
+})
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GoogleAuthorizationIntegrationTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GoogleAuthorizationIntegrationTest.kt
new file mode 100644
index 000000000..55e6fa193
--- /dev/null
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/GoogleAuthorizationIntegrationTest.kt
@@ -0,0 +1,143 @@
+package pro.qyoga.tests.cases.app.therapist.calendars.google
+
+import io.kotest.core.annotation.DisplayName
+import io.kotest.matchers.shouldBe
+import org.springframework.core.env.get
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController
+import pro.qyoga.app.therapist.oauth2.GoogleOAuthController
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendar
+import pro.qyoga.i9ns.calendars.google.views.GoogleCalendarsSettingsView
+import pro.qyoga.tests.assertions.shouldBeRedirectToGoogleOAuth
+import pro.qyoga.tests.clients.TherapistClient
+import pro.qyoga.tests.fixture.data.faker
+import pro.qyoga.tests.fixture.oauth.OAuthObjectMother
+import pro.qyoga.tests.fixture.oauth.OAuthObjectMother.aOAuth2AuthorizationResponse
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleAccount
+import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
+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.test_config.spring.context
+import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
+import pro.qyoga.tests.infra.wiremock.WireMock
+import pro.qyoga.tests.platform.spring.web_test_client.redirectLocation
+
+
+@DisplayName("Интеграция с Google OAuth")
+class GoogleAuthorizationIntegrationTest : QYogaAppIntegrationBaseKoTest({
+
+    val therapist by lazy { TherapistClient.loginAsTheTherapist() }
+    val clientId = context.environment["spring.security.oauth2.client.registration.google.client-id"]!!
+    val clientSecret = context.environment["spring.security.oauth2.client.registration.google.client-secret"]!!
+    val googleCalendarsTestApi = getBean<GoogleCalendarTestApi>()
+
+    "Spring Security" - {
+        "при запросе на авторизацию в Google" - {
+            // Сетап
+
+            // Действие
+            val redirectLocation = therapist.googleCalendarIntegration.authorizeInGoogle()
+
+            "должна возвращать корректный редирект" {
+                redirectLocation.shouldBeRedirectToGoogleOAuth(clientId)
+            }
+        }
+
+        "при корректном запросе с колбэком OAuth-авторизации" - {
+            // Сетап
+            val oAuthRequest = therapist.googleCalendarIntegration.authorizeInGoogle()
+                .let { OAuthObjectMother.oAuth2AuthorizationRequest(it) }
+            val aOAuthResponse = aOAuth2AuthorizationResponse(oAuthRequest.state)
+
+            // Действие
+            val response = therapist.googleCalendarIntegration.handleOAuthCallbackForResponse(aOAuthResponse)
+
+            "должна возвращать очищенный редирект на URL обработчика авторизации в Google" {
+
+                val location = response.redirectLocation()
+
+                location.path shouldBe GoogleOAuthController.PATH
+            }
+        }
+
+    }
+
+    "метод обработки результата авторизации" - {
+        "в случае успешной авторизации должен" - {
+            // Сетап
+            val googleEmail = faker.internet().emailAddress()
+            val mockGoogleOAuthServer = MockGoogleOAuthServer(WireMock.wiremock)
+            val mockGoogleCalendar = MockGoogleCalendar(WireMock.wiremock)
+            val oAuthRequest = therapist.googleCalendarIntegration.authorizeInGoogle()
+                .let { OAuthObjectMother.oAuth2AuthorizationRequest(it) }
+            val aOAuthResponse = aOAuth2AuthorizationResponse(oAuthRequest.state)
+            val accessToken = "accessToken"
+            val refreshToken = "refreshToken"
+            val calendars = emptyList<GoogleCalendar>()
+            mockGoogleOAuthServer.OnGetToken(clientId, clientSecret, aOAuthResponse.code)
+                .returnsToken(accessToken, refreshToken)
+            mockGoogleOAuthServer.OnGetUserInfo(accessToken).returnsUserInfo(googleEmail)
+            mockGoogleOAuthServer.OnRefreshToken(refreshToken).returnsToken(accessToken)
+            mockGoogleCalendar.OnGetCalendars(accessToken).returnsCalendars(calendars)
+
+            therapist.googleCalendarIntegration.handleOAuthCallbackForResponse(aOAuthResponse)
+
+            // Действие
+            val response = therapist.googleCalendarIntegration.finalizeOAuthCallbackForResponse()
+
+            // Проверка
+            "возвращать редирект на страницу календаря с параметром google-connected=true" {
+                with(response.redirectLocation()) {
+                    path shouldBe SchedulePageController.PATH
+                    query shouldBe "google-connected=true"
+                }
+            }
+
+            "обеспечивать возможность дальнейших запросов к Google Calendar" {
+                val gotCalendars = googleCalendarsTestApi.getGoogleCalendarsSettings(THE_THERAPIST_REF)
+                (gotCalendars.single().content as GoogleCalendarsSettingsView.Calendars).calendars shouldBe calendars
+            }
+
+        }
+
+        "в случае успешной авторизации уже подключенного аккаунта должен" - {
+            // Сетап
+            val googleEmail = faker.internet().emailAddress()
+            googleCalendarsTestApi.addAccount(aGoogleAccount(THE_THERAPIST_REF, googleEmail))
+
+            val mockGoogleOAuthServer = MockGoogleOAuthServer(WireMock.wiremock)
+            val mockGoogleCalendar = MockGoogleCalendar(WireMock.wiremock)
+            val oAuthRequest = therapist.googleCalendarIntegration.authorizeInGoogle()
+                .let { OAuthObjectMother.oAuth2AuthorizationRequest(it) }
+            val aOAuthResponse = aOAuth2AuthorizationResponse(oAuthRequest.state)
+            val accessToken = "accessToken"
+            val refreshToken = "refreshToken"
+            val calendars = emptyList<GoogleCalendar>()
+            mockGoogleOAuthServer.OnGetToken(clientId, clientSecret, aOAuthResponse.code)
+                .returnsToken(accessToken, refreshToken)
+            mockGoogleOAuthServer.OnGetUserInfo(accessToken).returnsUserInfo(googleEmail)
+            mockGoogleOAuthServer.OnRefreshToken(refreshToken).returnsToken(accessToken)
+            mockGoogleCalendar.OnGetCalendars(accessToken).returnsCalendars(calendars)
+
+            therapist.googleCalendarIntegration.handleOAuthCallbackForResponse(aOAuthResponse)
+
+            // Действие
+            val response = therapist.googleCalendarIntegration.finalizeOAuthCallbackForResponse()
+
+            // Проверка
+            "возвращать редирект на страницу календаря с параметром google-connected=true" {
+                with(response.redirectLocation()) {
+                    path shouldBe SchedulePageController.PATH
+                    query shouldBe "google-connected=true"
+                }
+            }
+
+            "обеспечивать возможность дальнейших запросов к Google Calendar" {
+                val gotCalendars = googleCalendarsTestApi.getGoogleCalendarsSettings(THE_THERAPIST_REF)
+                (gotCalendars.single().content as GoogleCalendarsSettingsView.Calendars).calendars shouldBe calendars
+            }
+
+        }
+    }
+
+})
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/SetCalendarShouldBeShownTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/SetCalendarShouldBeShownTest.kt
new file mode 100644
index 000000000..786ecfb2b
--- /dev/null
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/calendars/google/SetCalendarShouldBeShownTest.kt
@@ -0,0 +1,39 @@
+package pro.qyoga.tests.cases.app.therapist.calendars.google
+
+import io.kotest.core.annotation.DisplayName
+import io.kotest.matchers.shouldBe
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
+import pro.qyoga.i9ns.calendars.google.views.GoogleCalendarsSettingsView
+import pro.qyoga.tests.clients.TherapistClient.Companion.loginAsTheTherapist
+import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
+import pro.qyoga.tests.fixture.presets.GoogleCalendarsFixturePresets
+import pro.qyoga.tests.fixture.test_apis.GoogleCalendarTestApi
+import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseKoTest
+
+
+@DisplayName("Эндпоинт установки флага отображения Google-календаря")
+class SetCalendarShouldBeShownTest : QYogaAppIntegrationBaseKoTest({
+
+    val googleCalendarsTestApi = getBean<GoogleCalendarTestApi>()
+    val googleCalendarsFixturePresets = getBean<GoogleCalendarsFixturePresets>()
+
+    "должен сохранять заданное значение в БД" {
+        // Сетап
+        val therapist = loginAsTheTherapist()
+        val singleDisabledCalendarFixture = GoogleCalendarsFixturePresets.withSingleCalendar(shouldBeShown = false)
+        val calendarId = singleDisabledCalendarFixture.theCalendar.calendarId
+        googleCalendarsFixturePresets.insertFixture(singleDisabledCalendarFixture)
+
+        // Действие
+        therapist.googleCalendarIntegration.setShouldBeShown(
+            googleAccount = singleDisabledCalendarFixture.theGoogleAccount.ref(),
+            calendarId = calendarId,
+            shouldBeShown = true
+        )
+
+        // Проверка
+        val settings = googleCalendarsTestApi.getGoogleCalendarsSettings(THE_THERAPIST_REF)
+        (settings.single().content as GoogleCalendarsSettingsView.Calendars).calendars.single { it.id == calendarId }.shouldBeShown shouldBe true
+    }
+
+})
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/arch/ArchTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/arch/ArchTest.kt
index 1c2b014ca..21490a235 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/arch/ArchTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/arch/ArchTest.kt
@@ -24,15 +24,17 @@ class ArchTest {
             .consideringAllDependencies()
             .layer(testsAbstractionLayer).definedBy("pro.qyoga.tests.(assertions|clients|fixture|infra|pages|platform)..")
             .layer("App").definedBy("pro.qyoga.app..")
+            .layer("I9ns").definedBy("pro.qyoga.i9ns..")
             .layer("Core").definedBy("pro.qyoga.core..")
             .layer("Infra").definedBy("pro.qyoga.infra..")
             .layer("Platform").definedBy("pro.azhidkov.platform..")
 
             .whereLayer("App").mayOnlyBeAccessedByLayers(testsAbstractionLayer)
-            .whereLayer("Core").mayOnlyBeAccessedByLayers("App", testsAbstractionLayer)
+            .whereLayer("I9ns").mayOnlyBeAccessedByLayers("App", testsAbstractionLayer)
+            .whereLayer("Core").mayOnlyBeAccessedByLayers("App", "I9ns", testsAbstractionLayer)
             .whereLayer("Infra").mayOnlyBeAccessedByLayers("Core", "App", testsAbstractionLayer)
-            .whereLayer("Platform").mayOnlyBeAccessedByLayers("App", "Core", "Infra", testsAbstractionLayer)
+            .whereLayer("Platform").mayOnlyBeAccessedByLayers("App", "I9ns", "Core", "Infra", testsAbstractionLayer)
             .check(qyogaClasses)
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/google/GoogleCalendarsServiceTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/google/GoogleCalendarsServiceTest.kt
new file mode 100644
index 000000000..cc8c64dc0
--- /dev/null
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/google/GoogleCalendarsServiceTest.kt
@@ -0,0 +1,49 @@
+package pro.qyoga.tests.cases.i9ns.calendars.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.i9ns.calendars.google.GoogleCalendarsService
+import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
+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.GoogleCalendarsFixturePresets
+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 googleCalendarsFixturePresets = getBean<GoogleCalendarsFixturePresets>()
+
+    "метод получения событий в интервале" - {
+
+        "должен возвращать события приведённые к таймзоне запрошенного интервала" {
+            // Сетап
+            val event = aGoogleCalendarItem(
+                date = { ZonedDateTime.of(2025, 9, 16, 6, 0, 0, 0, ZoneId.of("Europe/Moscow")) },
+                duration = Duration.ofMinutes(60)
+            )
+            val singleEventFixture = GoogleCalendarsFixturePresets.withSingleCalendarAndEvent(event)
+            googleCalendarsFixturePresets.insertFixture(singleEventFixture)
+
+            // Действие
+            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/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/ICalCalendarTest.kt
similarity index 81%
rename from app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarTest.kt
rename to app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/ICalCalendarTest.kt
index bc043844e..b5a653bcb 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/ICalCalendarTest.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.tests.cases.core.calendar.ical
+package pro.qyoga.tests.cases.i9ns.calendars.ical
 
 import io.kotest.core.annotation.DisplayName
 import io.kotest.core.spec.style.FreeSpec
@@ -7,11 +7,11 @@ import io.kotest.matchers.date.shouldBeBefore
 import io.kotest.matchers.shouldBe
 import net.fortuna.ical4j.model.component.VEvent
 import pro.azhidkov.platform.java.time.Interval
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
-import pro.qyoga.core.calendar.ical.model.calendarItemsIn
-import pro.qyoga.core.calendar.ical.model.findById
-import pro.qyoga.core.calendar.ical.model.vEvents
-import pro.qyoga.core.calendar.ical.platform.ical4j.id
+import pro.qyoga.i9ns.calendars.ical.ical4j.id
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
+import pro.qyoga.i9ns.calendars.ical.model.calendarItemsIn
+import pro.qyoga.i9ns.calendars.ical.model.findById
+import pro.qyoga.i9ns.calendars.ical.model.vEvents
 import pro.qyoga.tests.fixture.object_mothers.calendars.ical.ICalCalendarsObjectMother.aICalCalendar
 import java.time.Duration
 import java.time.ZonedDateTime
@@ -26,7 +26,7 @@ class ICalCalendarTest : FreeSpec({
 
         "при запросе событий за период включающим это событие" - {
             val interval = Interval.of(ZonedDateTime.now(), Duration.ofDays(7))
-            val events = ical.calendarItemsIn(interval)
+            val events = ical.calendarItemsIn(interval)!!
 
             "должен вернуть одно событие" {
                 events.size shouldBe 1
@@ -57,4 +57,4 @@ class ICalCalendarTest : FreeSpec({
 })
 
 private val ICalCalendar.lastEvent: VEvent
-    get() = vEvents().last()
+    get() = vEvents()!!.last()
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarsRepoTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/ICalCalendarsRepoTest.kt
similarity index 78%
rename from app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarsRepoTest.kt
rename to app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/ICalCalendarsRepoTest.kt
index c77af48f0..7cbc5e327 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/ICalCalendarsRepoTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/ICalCalendarsRepoTest.kt
@@ -1,14 +1,14 @@
-package pro.qyoga.tests.cases.core.calendar.ical
+package pro.qyoga.tests.cases.i9ns.calendars.ical
 
 import io.kotest.core.annotation.DisplayName
 import io.kotest.matchers.shouldBe
-import pro.qyoga.core.calendar.ical.ICalCalendarsRepo
-import pro.qyoga.core.calendar.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.ICalCalendarsRepo
+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.CalendarsFixturePresets
+import pro.qyoga.tests.fixture.presets.ICalsCalendarsFixturePresets
 import pro.qyoga.tests.infra.web.QYogaAppBaseKoTest
 import pro.qyoga.tests.platform.instancio.KSelect.Companion.field
 
@@ -23,9 +23,9 @@ class ICalCalendarsRepoTest : QYogaAppBaseKoTest({
         "при изменении состояния календаря в источнике" - {
             // Сетап
             val iCalEvent = aCalendarItem()
-            val iCal = getBean<CalendarsFixturePresets>().createICalCalendarWithSingleEvent(iCalEvent)
+            val iCal = getBean<ICalsCalendarsFixturePresets>().createICalCalendarWithSingleEvent(iCalEvent)
             val updatedEvent = aCalendarItem {
-                set(field(ICalCalendarItem::id), iCalEvent.id)
+                set(field(ICalZonedCalendarItem::id), iCalEvent.id)
             }
             getBean<ICalCalendarsBackgrounds>().updateICalSource(
                 iCal.icsUrl,
@@ -45,4 +45,4 @@ class ICalCalendarsRepoTest : QYogaAppBaseKoTest({
         }
     }
 
-})
\ No newline at end of file
+})
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/IcsFiles.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/IcsFiles.kt
similarity index 98%
rename from app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/IcsFiles.kt
rename to app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/IcsFiles.kt
index f3dcbc335..38bc504b2 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/cases/core/calendar/ical/IcsFiles.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/cases/i9ns/calendars/ical/IcsFiles.kt
@@ -1,4 +1,4 @@
-package pro.qyoga.tests.cases.core.calendar.ical
+package pro.qyoga.tests.cases.i9ns.calendars.ical
 
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
@@ -113,4 +113,4 @@ object MovedRecurringEvent {
     """.trimIndent()
         .replace("\n", "\r\n")
 
-}
\ No newline at end of file
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt
index e7328a3f7..dfb6a1f2d 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/clients/TherapistClient.kt
@@ -8,16 +8,21 @@ import io.restassured.module.kotlin.extensions.When
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.springframework.http.HttpStatus
+import org.springframework.test.web.reactive.server.WebTestClient
 import pro.qyoga.tests.clients.api.*
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_LOGIN
 import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_PASSWORD
+import pro.qyoga.tests.infra.web.mainWebTestClient
 
 
-class TherapistClient(val authCookie: Cookie) {
-
+class TherapistClient(
+    val authCookie: Cookie,
+    webTestClient: WebTestClient = mainWebTestClient
+) {
 
     // Work
     val appointments = TherapistAppointmentsApi(authCookie)
+    val googleCalendarIntegration = TherapistGoogleCalendarIntegrationApi(authCookie, webTestClient)
     val clients = TherapistClientsApi(authCookie)
     val clientJournal = TherapistClientJournalApi(authCookie)
     val clientFiles = TherapistClientFilesApi(authCookie)
@@ -56,4 +61,4 @@ class TherapistClient(val authCookie: Cookie) {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/api/AuthorizedApi.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/api/AuthorizedApi.kt
index 14c63e4d3..2e491dd3b 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/clients/api/AuthorizedApi.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/clients/api/AuthorizedApi.kt
@@ -2,6 +2,7 @@ package pro.qyoga.tests.clients.api
 
 import io.restassured.http.Cookie
 import io.restassured.specification.RequestSpecification
+import org.springframework.test.web.reactive.server.WebTestClient
 
 
 interface AuthorizedApi {
@@ -12,4 +13,8 @@ interface AuthorizedApi {
         return cookie(authCookie)
     }
 
+    fun WebTestClient.RequestHeadersSpec<*>.authorized(): WebTestClient.RequestHeadersSpec<*> {
+        return cookie(authCookie.name, authCookie.value)
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistAppointmentsApi.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistAppointmentsApi.kt
index 9e05efb63..aa07634e5 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistAppointmentsApi.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistAppointmentsApi.kt
@@ -14,18 +14,20 @@ import org.springframework.http.HttpStatus
 import pro.azhidkov.platform.java.time.toLocalTimeString
 import pro.qyoga.app.therapist.appointments.core.edit.CreateAppointmentPageController
 import pro.qyoga.app.therapist.appointments.core.edit.EditAppointmentPageController
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController
+import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageModel
 import pro.qyoga.core.appointments.core.commands.EditAppointmentRequest
 import pro.qyoga.core.appointments.core.model.AppointmentRef
 import pro.qyoga.tests.pages.therapist.appointments.CreateAppointmentPage
 import pro.qyoga.tests.pages.therapist.appointments.EditAppointmentPage
+import java.net.URI
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
-class TherapistAppointmentsApi(override val authCookie: Cookie) : AuthorizedApi {
+class TherapistAppointmentsApi(
+    override val authCookie: Cookie
+) : AuthorizedApi {
 
     fun getScheduleForDay(date: LocalDate? = null, appointmentToFocus: AppointmentRef? = null): Document {
         return Given {
@@ -34,7 +36,7 @@ class TherapistAppointmentsApi(override val authCookie: Cookie) : AuthorizedApi
                 queryParam(SchedulePageController.DATE, date.toString())
             }
             if (appointmentToFocus != null) {
-                queryParam(CalendarPageModel.FOCUSED_APPOINTMENT, appointmentToFocus.id.toString())
+                queryParam(SchedulePageModel.FOCUSED_APPOINTMENT, appointmentToFocus.id.toString())
             }
             this
         } When {
@@ -48,7 +50,7 @@ class TherapistAppointmentsApi(override val authCookie: Cookie) : AuthorizedApi
 
     fun getCreateAppointmentPage(
         dateTime: LocalDateTime? = null,
-        sourceItem: SourceItem? = null
+        sourceItem: URI? = null
     ): Document {
         return Given {
             authorized()
@@ -56,8 +58,7 @@ class TherapistAppointmentsApi(override val authCookie: Cookie) : AuthorizedApi
                 queryParam(CreateAppointmentPageController.DATE_TIME, dateTime.toString())
             }
             if (sourceItem != null) {
-                queryParam(CreateAppointmentPageController.SOURCE_ITEM_TYPE, sourceItem.type)
-                queryParam(CreateAppointmentPageController.SOURCE_ITEM_ID, sourceItem.id)
+                queryParam(CreateAppointmentPageController.SOURCE_ITEM, sourceItem.toASCIIString())
             }
             this
         } When {
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistGoogleCalendarIntegrationApi.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistGoogleCalendarIntegrationApi.kt
new file mode 100644
index 000000000..b2461f97d
--- /dev/null
+++ b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistGoogleCalendarIntegrationApi.kt
@@ -0,0 +1,78 @@
+package pro.qyoga.tests.clients.api
+
+import io.restassured.http.Cookie
+import org.jsoup.Jsoup
+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.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
+import java.net.URI
+
+class TherapistGoogleCalendarIntegrationApi(
+    override val authCookie: Cookie,
+    private val webTestClient: WebTestClient
+) : AuthorizedApi {
+
+    fun authorizeInGoogle(): URI {
+        val response = webTestClient.get()
+            .uri("/oauth2/authorization/google")
+            .authorized()
+            .exchange()
+            .expectStatus().isFound
+
+        return response.redirectLocation()
+    }
+
+    // curl 'http://localhost:8080/therapist/oauth2/google/callback?
+    //           state=EWWVlMDBuTT8NzQvO1MZjrpRa3Kr6Jz_8WRkK9d3gBA%3D^&
+    //           code=4/0AVMBsJi2rnHTaWamYvvRVOxmp8CkQQ4ymoRZsiASDMjPnX7phooZ-P5YnOyQuunowx8F2g^&
+    //           scope=https://www.googleapis.com/auth/calendar.readonly' \
+    fun handleOAuthCallbackForResponse(
+        authResponse: OAuth2AuthorizationResponse
+    ): WebTestClient.ResponseSpec {
+        return webTestClient.get()
+            .uri {
+                it.path("/therapist/oauth2/google/callback")
+                    .queryParam("state", authResponse.state)
+                    .queryParam("code", authResponse.code)
+                    .build()
+            }
+            .authorized()
+            .exchange()
+    }
+
+    fun finalizeOAuthCallbackForResponse(): WebTestClient.ResponseSpec {
+        return webTestClient.get()
+            .uri("/therapist/oauth2/google/callback")
+            .authorized()
+            .exchange()
+    }
+
+    fun getGoogleCalendarComponent(): Document {
+        return webTestClient.get()
+            .uri(GoogleCalendarSettingsController.PATH)
+            .authorized()
+            .exchange()
+            .expectStatus().isOk
+            .getBodyAsString()
+            .let { Jsoup.parse(it) }
+    }
+
+    fun setShouldBeShown(googleAccount: GoogleAccountRef, calendarId: String, shouldBeShown: Boolean) {
+        val body = mapOf(
+            "shouldBeShown" to shouldBeShown
+        )
+
+        webTestClient.patch()
+            .uri(GoogleCalendarSettingsController.updateCalendarSettingsPath(googleAccount, calendarId))
+            .body(fromValue(body))
+            .authorized()
+            .exchange()
+            .expectStatus().isNoContent
+    }
+
+}
diff --git a/app/src/test/kotlin/pro/qyoga/tests/infra/rest_assured/RestAssuredExt.kt b/app/src/test/kotlin/pro/qyoga/tests/infra/rest_assured/RestAssuredExt.kt
index 926958d69..957d61670 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/infra/rest_assured/RestAssuredExt.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/infra/rest_assured/RestAssuredExt.kt
@@ -1,10 +1,30 @@
 package pro.qyoga.tests.infra.rest_assured
 
+import io.restassured.RestAssured
+import io.restassured.builder.RequestSpecBuilder
+import io.restassured.config.LogConfig
+import io.restassured.config.RestAssuredConfig
 import io.restassured.filter.log.RequestLoggingFilter
 import io.restassured.filter.log.ResponseLoggingFilter
+import io.restassured.http.ContentType
 import io.restassured.specification.RequestSpecification
+import org.springframework.context.ConfigurableApplicationContext
+import pro.qyoga.tests.infra.test_config.spring.baseUrl
 
 
+fun configureRestAssured(context: ConfigurableApplicationContext) {
+    val logConfig = LogConfig.logConfig()
+    val config = RestAssuredConfig.config().logConfig(logConfig)
+
+    RestAssured.requestSpecification = RequestSpecBuilder()
+        .setBaseUri(context.baseUrl)
+        .setAccept(ContentType.HTML)
+        .setContentType("application/x-www-form-urlencoded; charset=UTF-8")
+        .setRelaxedHTTPSValidation()
+        .setConfig(config)
+        .build()
+}
+
 fun RequestSpecification.addRequestLogging(): RequestSpecification =
     filter(RequestLoggingFilter())
 
diff --git a/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseKoTest.kt b/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseKoTest.kt
index ed5ca2741..faa3540aa 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseKoTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseKoTest.kt
@@ -1,33 +1,15 @@
 package pro.qyoga.tests.infra.web
 
-import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity
-import org.springframework.security.web.FilterChainProxy
-import org.springframework.security.web.SecurityFilterChain
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.test.web.servlet.client.MockMvcWebTestClient
-import org.springframework.web.context.WebApplicationContext
+import pro.qyoga.tests.infra.rest_assured.configureRestAssured
 import pro.qyoga.tests.infra.test_config.spring.context
 
 
 abstract class QYogaAppIntegrationBaseKoTest(body: QYogaAppIntegrationBaseKoTest.() -> Unit = {}) :
     QYogaAppBaseKoTest() {
 
-    private val baseUri = "http://localhost:$port"
-
-    lateinit var client: WebTestClient
-
-    private var securityFilterChain: SecurityFilterChain = getBean("mainSecurityFilterChain")
-
     init {
         beforeSpec {
-            client = MockMvcWebTestClient
-                .bindToApplicationContext(context as WebApplicationContext)
-                .apply(springSecurity(FilterChainProxy(securityFilterChain)))
-                .configureClient()
-                // без этого фильтра Spring Rest Docs пересоздаёт урл и попутно ломает киррелические символы в нём
-                .baseUrl(baseUri)
-                .defaultHeader("Content-Type", "application/json;charset=UTF-8")
-                .build()
+            configureRestAssured(context)
         }
         body()
     }
diff --git a/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseTest.kt b/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseTest.kt
index 41e9e7d55..fcf2ddf9a 100644
--- a/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseTest.kt
+++ b/app/src/test/kotlin/pro/qyoga/tests/infra/web/QYogaAppIntegrationBaseTest.kt
@@ -1,32 +1,18 @@
 package pro.qyoga.tests.infra.web
 
-import io.restassured.RestAssured
-import io.restassured.builder.RequestSpecBuilder
-import io.restassured.config.LogConfig
-import io.restassured.config.RestAssuredConfig
-import io.restassured.http.ContentType
 import org.junit.jupiter.api.BeforeEach
 import pro.qyoga.tests.clients.TherapistClient
+import pro.qyoga.tests.infra.rest_assured.configureRestAssured
+import pro.qyoga.tests.infra.test_config.spring.context
 
 
 open class QYogaAppIntegrationBaseTest : QYogaAppBaseTest() {
 
-    protected val baseUri = "http://localhost:$port"
-
     protected val theTherapist by lazy { TherapistClient.loginAsTheTherapist() }
 
     @BeforeEach
     fun setupRestAssured() {
-        val logConfig = LogConfig.logConfig()
-        val config = RestAssuredConfig.config().logConfig(logConfig)
-
-        RestAssured.requestSpecification = RequestSpecBuilder()
-            .setBaseUri(baseUri)
-            .setAccept(ContentType.HTML)
-            .setContentType("application/x-www-form-urlencoded; charset=UTF-8")
-            .setRelaxedHTTPSValidation()
-            .setConfig(config)
-            .build()
+        configureRestAssured(context)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/ElementMatchers.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/ElementMatchers.kt
index 272fa14d1..7afff2e9e 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/ElementMatchers.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/ElementMatchers.kt
@@ -6,6 +6,7 @@ import io.kotest.matchers.compose.all
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldNot
 import org.jsoup.nodes.Element
+import org.springframework.web.util.UriTemplate
 import pro.qyoga.tests.platform.html.Component
 import pro.qyoga.tests.platform.html.HtmlPage
 import pro.qyoga.tests.platform.html.Input
@@ -104,6 +105,14 @@ fun haveAttributeValueMatching(attr: String, valueRegex: Regex) = Matcher { elem
     )
 }
 
+fun haveAttributeValueMatching(attr: String, uriTemplate: UriTemplate) = Matcher { element: Element ->
+    MatcherResult.invoke(
+        uriTemplate.matches(element.attr(attr)),
+        { "Element ${element.descr} has $attr=\"${element.attr(attr)}\" but `$attr` value matching \"${uriTemplate}}\" is expected" },
+        { "Element ${element.descr} should not have attribute `$attr` value matching \"${uriTemplate}}\"" },
+    )
+}
+
 fun haveAttributeValue(attr: String, value: String, ignoreCase: Boolean = false) = Matcher { element: Element ->
     MatcherResult.invoke(
         element.attr(attr).equals(value, ignoreCase = ignoreCase),
@@ -166,6 +175,22 @@ fun haveInputWithValue(input: Input, value: String) = Matcher { element: Element
     )
 }
 
+fun haveCheckboxChecked(
+    selector: String = "input.form-check-input[type=checkbox][name=shouldBeShown]",
+    expected: Boolean
+): Matcher<Element> = Matcher { el ->
+    val checkbox = el.select(selector).first()
+    val actual = checkbox?.hasAttr("checked") == true
+    MatcherResult(
+        checkbox != null && actual == expected,
+        {
+            val found = if (checkbox == null) "not found" else if (actual) "checked" else "unchecked"
+            "Expected checkbox '$selector' to be ${if (expected) "checked" else "unchecked"}, but $found"
+        },
+        { "Checkbox '$selector' unexpectedly matches expected=${expected}" }
+    )
+}
+
 val Element.descr
     get() = "<${this.tag().name} id=\"${this.id()}\">" +
             this.text().take(32) +
@@ -209,7 +234,7 @@ infix fun Element.shouldBePage(page: HtmlPage): Element {
     return this
 }
 
-fun alwaysSuccess(): Matcher<Element> = Matcher { element ->
+fun alwaysSuccess(): Matcher<Element> = Matcher { _ ->
     MatcherResult(true, { "" }, { "" })
 }
 
@@ -277,4 +302,4 @@ data class SelectorOnlyComponent(val selector: String) : Component {
 
     override fun matcher(): Matcher<Element> = alwaysSuccess()
 
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/GoogleOAuthMatchers.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/GoogleOAuthMatchers.kt
new file mode 100644
index 000000000..006f321fb
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/GoogleOAuthMatchers.kt
@@ -0,0 +1,27 @@
+package pro.qyoga.tests.assertions
+
+import io.kotest.matchers.maps.shouldContainKey
+import io.kotest.matchers.string.shouldEndWith
+import io.kotest.matchers.uri.shouldHaveHost
+import io.kotest.matchers.uri.shouldHavePath
+import io.kotest.matchers.uri.shouldHaveScheme
+import org.springframework.web.util.UriComponentsBuilder
+import pro.qyoga.app.therapist.oauth2.GoogleOAuthController
+import pro.qyoga.tests.fixture.oauth.OAuthObjectMother
+import java.net.URI
+
+// https://accounts.google.com/o/oauth2/v2/auth?access_type=offline&prompt=consent&response_type=code&client_id=000000000000-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.apps.googleusercontent.com&scope=https://www.googleapis.com/auth/calendar.readonly&state=hpPCah40YNgllwaMf4MPQdiGGedlmOJHq33zGtuvlAU%3D&redirect_uri=http://localhost:8080/therapist/oauth2/google/callback
+fun URI.shouldBeRedirectToGoogleOAuth(clientId: String) {
+    this shouldHaveScheme OAuthObjectMother.googleAuthUri.scheme
+    this shouldHaveHost OAuthObjectMother.googleAuthUri.host
+    this shouldHavePath OAuthObjectMother.googleAuthUri.path
+
+    val queryParams = UriComponentsBuilder.fromUri(this).build().queryParams
+    queryParams.shouldContainValue("access_type", "offline")
+    queryParams.shouldContainValue("prompt", "consent")
+    queryParams.shouldContainValue("response_type", "code")
+    queryParams.shouldContainValue("client_id", clientId)
+    queryParams.shouldContainValue("scope", "openid%20email%20https://www.googleapis.com/auth/calendar.readonly")
+    queryParams.shouldContainKey("state")
+    queryParams["redirect_uri"]!!.single() shouldEndWith GoogleOAuthController.PATH
+}
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/MultiValueMapAssertions.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/MultiValueMapAssertions.kt
new file mode 100644
index 000000000..44c952c74
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/MultiValueMapAssertions.kt
@@ -0,0 +1,11 @@
+package pro.qyoga.tests.assertions
+
+import io.kotest.matchers.collections.shouldContain
+import io.kotest.matchers.maps.shouldContainKey
+import org.springframework.util.MultiValueMap
+
+
+fun <K, V> MultiValueMap<K, V>.shouldContainValue(key: K, value: V) {
+    this shouldContainKey key
+    this[key]!! shouldContain value
+}
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/AppointmentsBackgrounds.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/AppointmentsBackgrounds.kt
index 78bd6bdc8..d18c63fea 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/AppointmentsBackgrounds.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/AppointmentsBackgrounds.kt
@@ -14,11 +14,7 @@ import pro.qyoga.core.therapy.therapeutic_tasks.model.TherapeuticTaskRef
 import pro.qyoga.core.users.auth.dtos.QyogaUserDetails
 import pro.qyoga.core.users.therapists.TherapistRef
 import pro.qyoga.core.users.therapists.ref
-import pro.qyoga.tests.fixture.data.faker
-import pro.qyoga.tests.fixture.data.randomCyrillicWord
-import pro.qyoga.tests.fixture.data.randomElement
-import pro.qyoga.tests.fixture.data.randomSentence
-import pro.qyoga.tests.fixture.data.randomTimeZone
+import pro.qyoga.tests.fixture.data.*
 import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMother
 import pro.qyoga.tests.fixture.object_mothers.appointments.randomAppointmentCost
 import pro.qyoga.tests.fixture.object_mothers.appointments.randomAppointmentDate
@@ -50,7 +46,7 @@ class AppointmentsBackgrounds(
         date: LocalDate,
         therapistUserDetails: QyogaUserDetails = theTherapistUserDetails
     ): Iterable<CalendarItem<*, LocalDateTime>> {
-        return getCalendarAppointments(therapistUserDetails.ref, date)
+        return getCalendarAppointments(therapistUserDetails.ref, date).appointments
     }
 
     fun createFull(
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ClientsBackgrounds.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ClientsBackgrounds.kt
index 1e7214020..c8446e10d 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ClientsBackgrounds.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ClientsBackgrounds.kt
@@ -29,7 +29,11 @@ class ClientsBackgrounds(
         return createClients(1, THE_THERAPIST_ID).single()
     }
 
-    fun createClients(clients: List<ClientCardDto>, therapistId: UUID = THE_THERAPIST_ID): Iterable<Client> {
+    fun createClients(clients: Collection<Client>): Iterable<Client> {
+        return clientsRepo.saveAll(clients)
+    }
+
+    fun createClients(clients: Collection<ClientCardDto>, therapistId: UUID = THE_THERAPIST_ID): Iterable<Client> {
         return clientsRepo.saveAll(clients.map { ClientsObjectMother.createClient(therapistId, it) })
     }
 
@@ -66,4 +70,4 @@ class ClientsBackgrounds(
         editClientPageController.editClientCard(editClientCardDto, clientId)
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ICalCalendarsBackgrounds.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ICalCalendarsBackgrounds.kt
index 7d3b532ab..13a5e464e 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ICalCalendarsBackgrounds.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/backgrounds/ICalCalendarsBackgrounds.kt
@@ -1,13 +1,11 @@
 package pro.qyoga.tests.fixture.backgrounds
 
-import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
-import com.marcinziolo.kotlin.wiremock.get
-import com.marcinziolo.kotlin.wiremock.returns
+import com.github.tomakehurst.wiremock.client.WireMock.*
 import org.springframework.stereotype.Component
 import pro.azhidkov.platform.uuid.UUIDv7
-import pro.qyoga.core.calendar.ical.ICalCalendarsRepo
-import pro.qyoga.core.calendar.ical.commands.CreateICalRq
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
+import pro.qyoga.i9ns.calendars.ical.ICalCalendarsRepo
+import pro.qyoga.i9ns.calendars.ical.commands.CreateICalRq
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
 import pro.qyoga.tests.infra.wiremock.WireMock
 import java.net.URI
 import java.net.URL
@@ -21,20 +19,22 @@ class ICalCalendarsBackgrounds(
         URI.create(WireMock.wiremock.baseUrl()).resolve("/ics/${UUIDv7.randomUUID()}.ics").toURL()
 
     fun createICalCalendar(ical: ICalCalendar): ICalCalendar {
-        WireMock.wiremock.get {
-            urlEqualTo(ical.icsUrl.toString())
-        } returns {
-            body = ical.icsFile
-        }
+        WireMock.wiremock.stubFor(
+            get(urlEqualTo(ical.icsUrl.path))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "text/calendar")
+                        .withBody(ical.icsFile)
+                )
+        )
         return icalCalendarsRepo.addICal(CreateICalRq(ical.ownerRef, ical.icsUrl, ical.name))
     }
 
     fun updateICalSource(icsUrl: URL, icsFile: String) {
-        WireMock.wiremock.get {
-            urlEqualTo(icsUrl.toString())
-        } returns {
-            body = icsFile
-        }
+        WireMock.wiremock.stubFor(
+            get(urlEqualTo(icsUrl.path.toString()))
+                .willReturn(aResponse().withBody(icsFile))
+        )
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Id.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Id.kt
new file mode 100644
index 000000000..968b635ef
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Id.kt
@@ -0,0 +1,8 @@
+package pro.qyoga.tests.fixture.data
+
+import net.datafaker.Faker
+import java.util.*
+
+
+fun Faker.randomUUID(): UUID =
+    UUID.fromString(faker.internet().uuid())
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Text.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Text.kt
index fc6e9f977..9a5846030 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Text.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/data/Text.kt
@@ -1,5 +1,8 @@
 package pro.qyoga.tests.fixture.data
 
+import net.datafaker.Faker
+import java.util.*
+
 val lowerCaseCyrillicLetters = ('а'..'я').toList()
 val upperCaseCyrillicLetters = ('А'..'Я').toList()
 val cyrillicLetters = lowerCaseCyrillicLetters + upperCaseCyrillicLetters
@@ -39,4 +42,15 @@ fun randomEmail(): String =
         append(randomWord(lowerCaseLatinLetters, 2, 3))
     }
 
-fun randomPassword() = randomLatinWord(minLength = 8)
\ No newline at end of file
+fun randomPassword() = randomLatinWord(minLength = 8)
+
+fun Faker.randomBase64String(
+    bytes: Int = 32,
+    urlSafe: Boolean = false,
+    withPadding: Boolean = false
+): String {
+    val data = this.random().nextRandomBytes(bytes)
+    val encoder = if (urlSafe) Base64.getUrlEncoder() else Base64.getEncoder()
+    val finalEncoder = if (withPadding) encoder else encoder.withoutPadding()
+    return finalEncoder.encodeToString(data)
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/oauth/OAuthObjectMother.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/oauth/OAuthObjectMother.kt
new file mode 100644
index 000000000..1bf21d16b
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/oauth/OAuthObjectMother.kt
@@ -0,0 +1,32 @@
+package pro.qyoga.tests.fixture.oauth
+
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse
+import org.springframework.web.util.UriComponentsBuilder
+import pro.qyoga.tests.fixture.data.faker
+import pro.qyoga.tests.fixture.data.randomBase64String
+import java.net.URI
+import java.net.URLDecoder
+
+object OAuthObjectMother {
+
+    val googleAuthUri: URI = URI.create("https://accounts.google.com/o/oauth2/v2/auth")
+
+    fun oAuth2AuthorizationRequest(redirectUri: URI): OAuth2AuthorizationRequest {
+        val queryParams = UriComponentsBuilder.fromUri(redirectUri).build().queryParams
+
+        return OAuth2AuthorizationRequest.authorizationCode()
+            .authorizationUri(googleAuthUri.toString())
+            .clientId(queryParams["client_id"]?.single()?.let { URLDecoder.decode(it, Charsets.UTF_8) })
+            .scopes(queryParams["scope"]?.map { URLDecoder.decode(it, Charsets.UTF_8) }?.toSet()?.toSet())
+            .state(queryParams["state"]?.single()?.let { URLDecoder.decode(it, Charsets.UTF_8) })
+            .build()
+    }
+
+    fun aOAuth2AuthorizationResponse(state: String): OAuth2AuthorizationResponse =
+        OAuth2AuthorizationResponse.success(faker.randomBase64String())
+            .state(state)
+            .redirectUri("/")
+            .build()
+
+}
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/CalendarsObjectMother.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/CalendarsObjectMother.kt
index 3d75aabe1..18130d0c3 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/CalendarsObjectMother.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/CalendarsObjectMother.kt
@@ -2,8 +2,10 @@ package pro.qyoga.tests.fixture.object_mothers.calendars
 
 import org.instancio.Instancio
 import org.instancio.InstancioApi
-import pro.qyoga.core.calendar.ical.model.ICalCalendarItem
-import pro.qyoga.core.calendar.ical.model.ICalEventId
+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
@@ -11,23 +13,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<ICalZonedCalendarItem> = 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(ICalZonedCalendarItem::id)) { aICalEventId() }
+            generateBy(field(ICalZonedCalendarItem::title)) { aAppointmentEventTitle() }
+            generateBy(field(ICalZonedCalendarItem::dateTime)) {
+                randomAppointmentDate().atZone(
+                    asiaNovosibirskTimeZone
+                )
+            }
+            generateBy(field(ICalZonedCalendarItem::duration)) { AppointmentsObjectMother.fullCardDuration }
         }
         .withSeed(faker.random().nextLong())
-        .toModel()
+        .toModel() as Model<ICalZonedCalendarItem>
 
     fun aICalEventId() = ICalEventId(faker.internet().uuid().toString())
 
-    fun aCalendarItem(configureInstance: InstancioApi<ICalCalendarItem>.() -> InstancioApi<ICalCalendarItem> = { this }): ICalCalendarItem {
+    fun aCalendarItem(configureInstance: InstancioApi<ICalZonedCalendarItem>.() -> InstancioApi<ICalZonedCalendarItem> = { this }): ICalZonedCalendarItem {
         return Instancio.of(aCalendarItemModel).run {
             this.configureInstance()
         }
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
new file mode 100644
index 000000000..0e7fb50e5
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/google/GoogleCalendarObjectMother.kt
@@ -0,0 +1,95 @@
+package pro.qyoga.tests.fixture.object_mothers.calendars.google
+
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.model.*
+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 pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
+import java.time.Duration
+import java.time.temporal.Temporal
+import java.util.*
+
+
+object GoogleCalendarObjectMother {
+
+    fun aGoogleAccount(
+        therapist: TherapistRef,
+        email: String = faker.internet().emailAddress()
+    ): GoogleAccount =
+        GoogleAccount(
+            therapist,
+            email,
+            aGoogleToken()
+        )
+
+    fun aGoogleToken(): String {
+        val bytes = faker.random().nextRandomBytes(64)
+        val core = Base64.getUrlEncoder().withoutPadding().encodeToString(bytes)
+        return "1//$core"
+    }
+
+    fun aGoogleCalendar(
+        ownerRef: TherapistRef,
+        externalId: String,
+        name: String = aCalendarName(),
+    ) = GoogleCalendar(
+        ownerRef,
+        externalId,
+        name,
+    )
+
+    fun <DATE : Temporal> aGoogleCalendarItem(
+        calendarId: String = faker.random().randomElementOf(googleCalendarIds),
+        date: () -> DATE,
+        duration: Duration = randomAppointmentDuration()
+    ) =
+        GoogleCalendarItem(
+            GoogleCalendarItemId(calendarId, faker.internet().uuid()),
+            aAppointmentEventTitle(),
+            "",
+            date(),
+            duration,
+            null
+        )
+
+    fun aCalendarName(): String = faker.random().randomElementOf(
+        (1..10).map { faker.internet().emailAddress() } +
+                listOf(
+                    "Рабочий календарь",
+                    "Личные занятия",
+                    "Групповые тренировки",
+                    "Онлайн сессии",
+                    "Терапевтические занятия",
+                    "Йога практики",
+                    "Индивидуальные консультации",
+                    "Семинары и мастер-классы"
+                )
+    )
+
+    fun aGoogleCalendarSettings(
+        googleAccountRef: GoogleAccountRef,
+        therapistRef: TherapistRef = THE_THERAPIST_REF,
+        externalId: String = faker.internet().uuid(),
+        shouldBeShown: Boolean = false
+    ): GoogleCalendarSettings =
+        GoogleCalendarSettings(
+            therapistRef,
+            googleAccountRef,
+            externalId,
+            shouldBeShown
+        )
+
+}
+
+val googleCalendarIds = listOf(
+    "primary",
+    "calendar1@gmail.com",
+    "calendar2@gmail.com",
+    "work.calendar@company.com",
+    "personal.events@gmail.com",
+    "yoga.sessions@studio.com",
+    "therapy.appointments@clinic.com",
+    "group.classes@fitness.com"
+)
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/ical/ICalCalendarsObjectMother.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/ical/ICalCalendarsObjectMother.kt
index c3d8e82dd..3d4b6e5f0 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/ical/ICalCalendarsObjectMother.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/calendars/ical/ICalCalendarsObjectMother.kt
@@ -9,8 +9,8 @@ import net.fortuna.ical4j.model.property.Location
 import net.fortuna.ical4j.model.property.RecurrenceId
 import net.fortuna.ical4j.model.property.Uid
 import pro.azhidkov.platform.kotlin.ifNotNull
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
-import pro.qyoga.core.calendar.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
+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
@@ -30,14 +30,14 @@ object ICalCalendarsObjectMother {
         )
     }
 
-    fun aIcsFile(event: ICalCalendarItem): String {
+    fun aIcsFile(event: ICalZonedCalendarItem): String {
         val calendar = aICalCalendar(event)
         val icsFile = StringWriter()
         CalendarOutputter().output(calendar, icsFile)
         return icsFile.toString()
     }
 
-    fun aICalCalendar(event: ICalCalendarItem): Calendar {
+    fun aICalCalendar(event: ICalZonedCalendarItem): Calendar {
         val calendar = Calendar()
             .withProdId("-//azhidkov.pro//Trainer Advisor Tests//RU")
             .withDefaults()
@@ -55,4 +55,4 @@ object ICalCalendarsObjectMother {
         return calendar
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/clients/ClientsObjectMother.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/clients/ClientsObjectMother.kt
index 8a5d65003..a344cd530 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/clients/ClientsObjectMother.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/clients/ClientsObjectMother.kt
@@ -2,7 +2,6 @@ package pro.qyoga.tests.fixture.object_mothers.clients
 
 import org.springframework.data.jdbc.core.mapping.AggregateReference
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.AggregateReferenceTarget
-import pro.azhidkov.platform.uuid.UUIDv7
 import pro.qyoga.app.therapist.clients.list.ClientListItemView
 import pro.qyoga.core.clients.cards.Client
 import pro.qyoga.core.clients.cards.dtos.ClientCardDto
@@ -74,7 +73,10 @@ object ClientsObjectMother {
         version
     )
 
-    fun createClient(therapistId: UUID, clientCardDto: ClientCardDto): Client =
+    fun createClient(
+        therapistId: UUID = THE_THERAPIST_ID,
+        clientCardDto: ClientCardDto = createClientCardDtoMinimal()
+    ): Client =
         Client(therapistId, clientCardDto)
 
     fun aClientMinimal(
@@ -107,7 +109,7 @@ object ClientsObjectMother {
     )
 
     fun randomId() =
-        UUIDv7.randomUUID()
+        faker.randomUUID()
 
     val fakeClientRef: ClientRef = AggregateReferenceTarget(
         createClient(THE_THERAPIST_ID, createClientCardDtoMinimal())
@@ -154,4 +156,4 @@ fun randomDistributionSource(): DistributionSource {
     val hasComment = faker.random().nextBoolean()
     val comment = if (hasComment) randomSentence(1, 5) else null
     return DistributionSource(type, comment)
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/AppointmentsFixturePresets.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/AppointmentsFixturePresets.kt
index 53bb8a966..757accb57 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/AppointmentsFixturePresets.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/AppointmentsFixturePresets.kt
@@ -14,13 +14,13 @@ import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
 class AppointmentsFixturePresets(
     private val appointmentsBackgrounds: AppointmentsBackgrounds,
     private val clientBackgrounds: ClientsBackgrounds,
-    private val calendarsFixturePresets: CalendarsFixturePresets
+    private val iCalsCalendarsFixturePresets: ICalsCalendarsFixturePresets
 ) {
 
     fun createAppointmentFromIcsEvent(): Appointment {
         val client = clientBackgrounds.aClient()
         val icsEvent = aCalendarItem()
-        calendarsFixturePresets.createICalCalendarWithSingleEvent(icsEvent)
+        iCalsCalendarsFixturePresets.createICalCalendarWithSingleEvent(icsEvent)
         val app = appointmentsBackgrounds.create(
             randomEditAppointmentRequest(
                 client = client.ref(),
@@ -33,4 +33,4 @@ class AppointmentsFixturePresets(
         return app
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/GoogleCalendarsFixturePresets.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/GoogleCalendarsFixturePresets.kt
new file mode 100644
index 000000000..667734ac6
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/GoogleCalendarsFixturePresets.kt
@@ -0,0 +1,158 @@
+package pro.qyoga.tests.fixture.presets
+
+import org.springframework.stereotype.Component
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccount
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendarItem
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendarSettings
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aCalendarName
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleAccount
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleCalendar
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleCalendarSettings
+import pro.qyoga.tests.fixture.object_mothers.calendars.google.GoogleCalendarObjectMother.aGoogleToken
+import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
+import pro.qyoga.tests.fixture.test_apis.GoogleCalendarTestApi
+import pro.qyoga.tests.fixture.wiremocks.GoogleAccessToken
+import pro.qyoga.tests.fixture.wiremocks.MockGoogleCalendar
+import pro.qyoga.tests.fixture.wiremocks.MockGoogleOAuthServer
+
+
+data class TherapistGoogleCalendarsFixture(
+    val accounts: List<Pair<GoogleAccount, GoogleAccessToken>>,
+    val calendarsSettings: List<GoogleCalendarSettings>,
+    val events: List<GoogleCalendarItem<*>>,
+    val therapist: TherapistRef = THE_THERAPIST_REF
+) {
+
+    init {
+        require(accounts.map { it.first.ownerRef }
+            .all { it == therapist }) { "all google accounts should be assigned to the therapist" }
+        require(
+            calendarsSettings.map(GoogleCalendarSettings::ownerRef)
+                .all { it == therapist }) { "all google calendars should be assigned to the therapist" }
+    }
+
+    val calendars = calendarsSettings.map {
+        aGoogleCalendar(it.ownerRef, it.calendarId, aCalendarName())
+    }
+
+    val calendarsAndSettings = calendars.zip(calendarsSettings)
+
+    val theGoogleAccount: GoogleAccount = accounts.single().first
+
+    val theCalendar by lazy { calendarsSettings.single() }
+
+}
+
+@Component
+class GoogleCalendarsFixturePresets(
+    val mockGoogleOAuthServer: MockGoogleOAuthServer,
+    val mockGoogleCalendar: MockGoogleCalendar,
+    val googleCalendarsTestApi: GoogleCalendarTestApi
+) {
+
+    fun insertFixture(googleCalendarsFixture: TherapistGoogleCalendarsFixture) {
+        googleCalendarsFixture.accounts.forEach { (acc, accessToken) ->
+            googleCalendarsTestApi.addAccount(acc)
+            mockGoogleOAuthServer.OnRefreshToken(acc.refreshToken.show()).returnsToken(accessToken)
+            val accCalendars = googleCalendarsFixture.calendars.filter { it.ownerRef == acc.ownerRef }
+            mockGoogleCalendar.OnGetCalendars(accessToken)
+                .returnsCalendars(accCalendars)
+
+            accCalendars.forEach { calendar ->
+                val events = googleCalendarsFixture.events.filter { it.id.calendarId == calendar.externalId }
+
+                mockGoogleCalendar.OnGetEvents(accessToken, calendar.externalId)
+                    .returnsEvents(*events.toTypedArray())
+
+                events.forEach { event ->
+                    mockGoogleCalendar.OnGetEventById(accessToken, event.id)
+                        .returnsEvent(event)
+                }
+            }
+        }
+        googleCalendarsFixture.calendarsSettings
+            .filter { it.shouldBeShown }
+            .forEach {
+                googleCalendarsTestApi.setShouldBeShown(
+                    googleCalendarsFixture.therapist,
+                    it.googleAccountRef,
+                    it.calendarId,
+                    true
+                )
+            }
+    }
+
+    fun setFailureOnRequestForEvents(googleCalendarsFixture: TherapistGoogleCalendarsFixture) =
+        googleCalendarsFixture.accounts.forEach { (acc, accessToken) ->
+            mockGoogleCalendar.OnGetEvents(accessToken, googleCalendarsFixture.theCalendar.calendarId)
+                .returnsForbidden()
+        }
+
+    fun setFailureOnRequestForCalendars(googleCalendarsFixture: TherapistGoogleCalendarsFixture) =
+        googleCalendarsFixture.accounts.forEach { (acc, accessToken) ->
+            mockGoogleCalendar.OnGetCalendars(accessToken)
+                .returnsForbidden()
+        }
+
+    companion object {
+
+        fun withSingleCalendar(
+            shouldBeShown: Boolean = false
+        ): TherapistGoogleCalendarsFixture {
+            val googleAccount = aGoogleAccount(therapist = THE_THERAPIST_REF)
+            val googleCalendar = aGoogleCalendarSettings(
+                googleAccountRef = googleAccount.ref(),
+                shouldBeShown = shouldBeShown
+            )
+
+            return TherapistGoogleCalendarsFixture(
+                accounts = listOf(googleAccount to aGoogleToken()),
+                calendarsSettings = listOf(googleCalendar),
+                events = emptyList(),
+                therapist = THE_THERAPIST_REF
+            )
+        }
+
+        fun withTwoCalendars(
+            shouldBeShown: List<Boolean>
+        ): TherapistGoogleCalendarsFixture {
+            val googleAccount = aGoogleAccount(therapist = THE_THERAPIST_REF)
+            val googleCalendars = shouldBeShown.map {
+                aGoogleCalendarSettings(
+                    googleAccountRef = googleAccount.ref(),
+                    shouldBeShown = it
+                )
+            }
+
+            return TherapistGoogleCalendarsFixture(
+                accounts = listOf(googleAccount to aGoogleToken()),
+                calendarsSettings = googleCalendars,
+                events = emptyList(),
+                therapist = THE_THERAPIST_REF
+            )
+        }
+
+        fun withSingleCalendarAndEvent(
+            event: GoogleCalendarItem<*>,
+            shouldBeShown: Boolean = true
+        ): TherapistGoogleCalendarsFixture {
+            val googleAccount = aGoogleAccount(therapist = THE_THERAPIST_REF)
+            val googleCalendar = aGoogleCalendarSettings(
+                externalId = event.id.calendarId,
+                googleAccountRef = googleAccount.ref(),
+                shouldBeShown = shouldBeShown
+            )
+
+            return TherapistGoogleCalendarsFixture(
+                accounts = listOf(googleAccount to aGoogleToken()),
+                calendarsSettings = listOf(googleCalendar),
+                events = listOf(event),
+                therapist = THE_THERAPIST_REF
+            )
+        }
+
+    }
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/CalendarsFixturePresets.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ICalsCalendarsFixturePresets.kt
similarity index 80%
rename from app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/CalendarsFixturePresets.kt
rename to app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ICalsCalendarsFixturePresets.kt
index dba5063e4..63f65cbcb 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/CalendarsFixturePresets.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ICalsCalendarsFixturePresets.kt
@@ -1,20 +1,20 @@
 package pro.qyoga.tests.fixture.presets
 
 import org.springframework.stereotype.Component
-import pro.qyoga.core.calendar.ical.model.ICalCalendar
-import pro.qyoga.core.calendar.ical.model.ICalCalendarItem
+import pro.qyoga.i9ns.calendars.ical.model.ICalCalendar
+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
 
 
 @Component
-class CalendarsFixturePresets(
+class ICalsCalendarsFixturePresets(
     private val iCalCalendarsBackgrounds: ICalCalendarsBackgrounds
 ) {
 
     fun createICalCalendarWithSingleEvent(
-        event: ICalCalendarItem,
+        event: ICalZonedCalendarItem,
     ): ICalCalendar {
         val icsFile = aIcsFile(event)
 
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/Presets.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/PresetsConf.kt
similarity index 95%
rename from app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/Presets.kt
rename to app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/PresetsConf.kt
index 972e8e991..f4a92cc78 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/Presets.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/PresetsConf.kt
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration
 @TestConfiguration
 @ComponentScan
 @Configuration
-class Presets(
+class PresetsConf(
     val surveysFixturePresets: SurveysFixturePresets,
     val therapistsFixturePreset: TherapistsFixturePreset,
     val clientsFixturePresets: ClientsFixturePresets,
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ScheduleFixturePreset.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ScheduleFixturePreset.kt
new file mode 100644
index 000000000..ae565ae6a
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/presets/ScheduleFixturePreset.kt
@@ -0,0 +1,67 @@
+package pro.qyoga.tests.fixture.presets
+
+import org.springframework.stereotype.Component
+import pro.azhidkov.platform.spring.sdj.ergo.hydration.ref
+import pro.qyoga.core.appointments.core.commands.EditAppointmentRequest
+import pro.qyoga.core.clients.cards.model.Client
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.tests.fixture.backgrounds.AppointmentsBackgrounds
+import pro.qyoga.tests.fixture.backgrounds.ClientsBackgrounds
+import pro.qyoga.tests.fixture.object_mothers.appointments.AppointmentsObjectMother
+import pro.qyoga.tests.fixture.object_mothers.clients.ClientsObjectMother
+import pro.qyoga.tests.fixture.object_mothers.therapists.THE_THERAPIST_REF
+
+
+data class ScheduleFixture(
+    val clients: List<Client>,
+    val appointments: List<EditAppointmentRequest>,
+    val googleCalendarsFixture: TherapistGoogleCalendarsFixture,
+    val therapist: TherapistRef = THE_THERAPIST_REF
+) {
+
+    init {
+        require(clients.map { it.therapistRef }
+            .all { it == therapist }) { "all clients should be assigned to the therapist" }
+        require(googleCalendarsFixture.therapist == therapist) { "therapist should be the same as in the fixture" }
+    }
+
+    fun theAppointment() =
+        appointments.single()
+
+}
+
+@Component
+class ScheduleFixturePreset(
+    private val clientsBackgrounds: ClientsBackgrounds,
+    private val appointmentsBackgrounds: AppointmentsBackgrounds,
+    private val googleCalendarFixturePreset: GoogleCalendarsFixturePresets
+) {
+
+    fun insertFixture(scheduleFixture: ScheduleFixture) {
+        clientsBackgrounds.createClients(scheduleFixture.clients)
+
+        scheduleFixture.appointments.forEach {
+            appointmentsBackgrounds.create(it, scheduleFixture.therapist)
+        }
+
+        googleCalendarFixturePreset.insertFixture(scheduleFixture.googleCalendarsFixture)
+    }
+
+    companion object {
+
+        fun withSingleAppointmentAndEnabledGoogleCalendar(): ScheduleFixture {
+            val client = ClientsObjectMother.createClient()
+
+            val appointment = AppointmentsObjectMother.randomEditAppointmentRequest(client.ref())
+            val googleCalendarFixture = GoogleCalendarsFixturePresets.withSingleCalendar(shouldBeShown = true)
+
+            return ScheduleFixture(
+                listOf(client),
+                listOf(appointment),
+                googleCalendarFixture
+            )
+        }
+
+    }
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/GoogleCalendarTestApi.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/GoogleCalendarTestApi.kt
new file mode 100644
index 000000000..ec10202c3
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/GoogleCalendarTestApi.kt
@@ -0,0 +1,44 @@
+package pro.qyoga.tests.fixture.test_apis
+
+import org.springframework.stereotype.Component
+import pro.qyoga.app.therapist.appointments.core.schedule.GoogleCalendarSettingsController
+import pro.qyoga.core.users.therapists.TherapistRef
+import pro.qyoga.i9ns.calendars.google.GoogleCalendarsService
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccount
+import pro.qyoga.i9ns.calendars.google.model.GoogleAccountRef
+import pro.qyoga.i9ns.calendars.google.views.GoogleAccountCalendarsSettingsView
+import pro.qyoga.tests.fixture.object_mothers.therapists.idOnlyUserDetails
+
+
+@Component
+class GoogleCalendarTestApi(
+    private val googleCalendarSettingsController: GoogleCalendarSettingsController,
+    private val googleCalendarsService: GoogleCalendarsService
+) {
+
+    fun getGoogleCalendarsSettings(therapistRef: TherapistRef): List<GoogleAccountCalendarsSettingsView> {
+        return googleCalendarSettingsController.getGoogleCalendarSettingsComponent(
+            idOnlyUserDetails(therapistRef.id!!)
+        ).accounts
+    }
+
+    fun addAccount(googleAccount: GoogleAccount): GoogleAccount {
+        googleCalendarsService.addGoogleAccount(googleAccount)
+        return googleAccount
+    }
+
+    fun setShouldBeShown(
+        therapistRef: TherapistRef,
+        accountRef: GoogleAccountRef,
+        calendarId: String,
+        shouldBeShown: Boolean
+    ) {
+        googleCalendarsService.updateCalendarSettings(
+            therapistRef,
+            accountRef,
+            calendarId,
+            mapOf("shouldBeShown" to shouldBeShown)
+        )
+    }
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/TestApisConf.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/TestApisConf.kt
new file mode 100644
index 000000000..780c840e9
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/test_apis/TestApisConf.kt
@@ -0,0 +1,9 @@
+package pro.qyoga.tests.fixture.test_apis
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.context.annotation.ComponentScan
+
+
+@TestConfiguration
+@ComponentScan
+class TestApisConf
\ No newline at end of file
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
new file mode 100644
index 000000000..3b7beedbf
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockGoogleCalendar.kt
@@ -0,0 +1,193 @@
+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.stereotype.Component
+import org.springframework.web.util.UriUtils
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendar
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendarItem
+import pro.qyoga.i9ns.calendars.google.model.GoogleCalendarItemId
+import pro.qyoga.tests.fixture.data.asiaNovosibirskTimeZone
+import java.time.LocalDateTime
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import kotlin.text.Charsets.UTF_8
+
+
+@Component
+class MockGoogleCalendar(
+    private val wiremockServer: WireMockServer
+) {
+
+    inner class OnGetCalendars(
+        private val accessToken: String
+    ) {
+
+        fun returnsCalendars(
+            calendars: List<GoogleCalendar>
+        ) {
+            wiremockServer.stubFor(
+                getCalendarsRequest()
+                    .willReturn(
+                        aResponse()
+                            .withStatus(HttpStatus.OK.value())
+                            .withHeader("Content-Type", "application/json")
+                            .withBody(
+                                """
+                              {
+                                 "items": [${calendars.joinToString(",") { it.toJson() }}]
+                              }
+                          """
+                            )
+                    )
+            )
+        }
+
+        fun returnsForbidden() {
+            wiremockServer.stubFor(
+                getCalendarsRequest()
+                    .willReturn(
+                        aResponse()
+                            .withStatus(HttpStatus.FORBIDDEN.value())
+                            .withHeader("Content-Type", "application/json")
+                            .withBody(FORBIDDEN)
+                    )
+            )
+        }
+
+        private fun getCalendarsRequest(): MappingBuilder = get(
+            urlEqualTo(
+                "/google/calendar/v3/users/me/calendarList"
+            )
+        )
+            .withHeader("Authorization", equalTo("Bearer $accessToken"))
+
+    }
+
+    inner class OnGetEvents(
+        private val accessToken: String,
+        private val calendarId: String
+    ) {
+
+        fun returnsEvents(vararg events: GoogleCalendarItem<*>) {
+            wiremockServer.stubFor(
+                getEventsRequest()
+                    .willReturn(
+                        aResponse()
+                            .withStatus(HttpStatus.OK.value())
+                            .withHeader("Content-Type", "application/json")
+                            .withBody(
+                                """
+                              {
+                                  "items": [${events.joinToString(",") { it.toJson() }}]
+                              }
+                          """
+                            )
+                    )
+            )
+        }
+
+        fun returnsForbidden() {
+            wiremockServer.stubFor(
+                getEventsRequest()
+                    .willReturn(
+                        aResponse()
+                            .withStatus(HttpStatus.FORBIDDEN.value())
+                            .withHeader("Content-Type", "application/json")
+                            .withBody(FORBIDDEN)
+                    )
+            )
+        }
+
+        private fun getEventsRequest(): MappingBuilder = get(
+            urlPathEqualTo(
+                "/google/calendar/v3/calendars/${
+                    UriUtils.encodePathSegment(
+                        calendarId,
+                        UTF_8
+                    )
+                }/events"
+            )
+        )
+            .withHeader("Authorization", equalTo("Bearer $accessToken"))
+
+    }
+
+    inner class OnGetEventById(
+        private val accessToken: String,
+        private val id: GoogleCalendarItemId
+    ) {
+
+        fun returnsEvent(event: GoogleCalendarItem<*>) {
+            val encodedCalendarId = UriUtils.encodePathSegment(id.calendarId, UTF_8)
+            val encodedEventId = UriUtils.encodePathSegment(id.itemId, UTF_8)
+            wiremockServer.stubFor(
+                get(
+                    urlPathEqualTo("/google/calendar/v3/calendars/$encodedCalendarId/events/$encodedEventId")
+                )
+                    .withHeader("Authorization", equalTo("Bearer $accessToken"))
+                    .willReturn(
+                        aResponse()
+                            .withStatus(HttpStatus.OK.value())
+                            .withHeader("Content-Type", "application/json")
+                            .withBody(event.toJson())
+                    )
+            )
+        }
+
+    }
+
+}
+
+private fun GoogleCalendar.toJson(): String =
+    """
+        {
+            "id": "${this.externalId}",
+            "summary": "${this.name}"
+        }
+    """
+
+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.itemId}",
+            "summary": "$title",
+            "description": "$description",
+            "start": {
+                "dateTime": "$start",
+                "timeZone": "${asiaNovosibirskTimeZone.id}"
+            },
+            "end": {
+                "dateTime": "$end",
+                "timeZone": "${asiaNovosibirskTimeZone.id}"
+            }
+        }
+    """.trimIndent()
+}
+
+private const val FORBIDDEN = """
+                                    {
+                                        "code": 403,
+                                        "details": [
+                                        {
+                                            "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+                                            "reason": "ACCESS_TOKEN_SCOPE_INSUFFICIENT"
+                                        }
+                                        ],
+                                        "errors": [
+                                        {
+                                            "domain": "global",
+                                            "message": "Insufficient Permission",
+                                            "reason": "insufficientPermissions"
+                                        }
+                                        ],
+                                        "message": "Request had insufficient authentication scopes.",
+                                        "status": "PERMISSION_DENIED"
+                                    }
+                          """
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockGoogleOAuthServer.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockGoogleOAuthServer.kt
new file mode 100644
index 000000000..99387ad2d
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockGoogleOAuthServer.kt
@@ -0,0 +1,110 @@
+package pro.qyoga.tests.fixture.wiremocks
+
+import com.github.tomakehurst.wiremock.WireMockServer
+import com.github.tomakehurst.wiremock.client.WireMock.*
+import org.springframework.http.HttpStatus
+import org.springframework.stereotype.Component
+import pro.qyoga.app.therapist.oauth2.GoogleOAuthController
+
+
+typealias GoogleAccessToken = String
+
+@Component
+class MockGoogleOAuthServer(
+    private val wiremockServer: WireMockServer
+) {
+
+    inner class OnGetToken(
+        private val clientId: String,
+        private val clientSecret: String,
+        private val code: String,
+    ) {
+
+        fun returnsToken(
+            authToken: String = "authToken",
+            refreshToken: String = "refreshToken"
+        ) {
+
+            wiremockServer
+                .stubFor(
+                    post(urlEqualTo("/google/oauth/token"))
+                        .withFormParam("grant_type", equalTo("authorization_code"))
+                        .withFormParam("code", equalTo(code.replace("+", " ")))
+                        .withFormParam("redirect_uri", matching(".*${GoogleOAuthController.PATH}"))
+                        .withFormParam("client_id", equalTo(clientId))
+                        .withFormParam("client_secret", equalTo(clientSecret))
+                        .willReturn(
+                            aResponse()
+                                .withStatus(HttpStatus.OK.value())
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(
+                                    """
+                                          {
+                                              "access_token": "$authToken",
+                                              "token_type": "Bearer",
+                                              "expires_in": 3599,
+                                              "refresh_token": "$refreshToken",
+                                              "scope": "https://www.googleapis.com/auth/calendar"
+                                          }
+                                      """
+                                )
+                        )
+                )
+        }
+
+    }
+
+    inner class OnGetUserInfo(private val accessToken: GoogleAccessToken) {
+
+        fun returnsUserInfo(googleEmail: String) {
+            wiremockServer.stubFor(
+                get(urlEqualTo("/google/oauth/userinfo"))
+                    .withHeader("Authorization", equalTo("Bearer $accessToken"))
+                    .willReturn(
+                        aResponse()
+                            .withStatus(HttpStatus.OK.value())
+                            .withHeader("Content-Type", "application/json")
+                            .withBody(
+                                """
+                                    {
+                                        "email": "$googleEmail"
+                                    }
+                                """
+                            )
+                    )
+            )
+        }
+
+    }
+
+    inner class OnRefreshToken(private val refreshToken: String) {
+
+        fun returnsToken(
+            accessToken: GoogleAccessToken = "authToken"
+        ) {
+            wiremockServer
+                .stubFor(
+                    post(urlEqualTo("/google/oauth/token"))
+                        .withFormParam("grant_type", equalTo("refresh_token"))
+                        .withFormParam("refresh_token", equalTo(refreshToken))
+                        .willReturn(
+                            aResponse()
+                                .withStatus(HttpStatus.OK.value())
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(
+                                    """
+                                          {
+                                              "access_token": "$accessToken",
+                                              "token_type": "Bearer",
+                                              "expires_in": 3599,
+                                              "refresh_token": "$refreshToken",
+                                              "scope": "https://www.googleapis.com/auth/calendar"
+                                          }
+                                      """
+                                )
+                        )
+                )
+        }
+    }
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockServersConf.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockServersConf.kt
new file mode 100644
index 000000000..9c4fca90b
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/wiremocks/MockServersConf.kt
@@ -0,0 +1,9 @@
+package pro.qyoga.tests.fixture.wiremocks
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.context.annotation.ComponentScan
+
+
+@TestConfiguration
+@ComponentScan
+class MockServersConf
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/db/TestDb.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/db/TestDb.kt
index e84d44bfa..a59c4f192 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/db/TestDb.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/db/TestDb.kt
@@ -15,7 +15,7 @@ private val log = LoggerFactory.getLogger(TestDb::class.java)
 private const val DB_USER = "postgres"
 private const val DB_PASSWORD = "password"
 
-val jdbcUrl: String by lazy {
+private val testDbJdbcUrl: String by lazy {
     try {
         log.info("Checking for provided db")
         val con = DriverManager.getConnection(
@@ -41,9 +41,10 @@ val jdbcUrl: String by lazy {
 
 val testDataSource by lazy {
     val config = HikariConfig().apply {
-        this.jdbcUrl = pro.qyoga.tests.infra.db.jdbcUrl
+        this.jdbcUrl = testDbJdbcUrl
         this.username = DB_USER
         this.password = DB_PASSWORD
+        this.minimumIdle = 0
     }
     HikariDataSource(config)
 }
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/TestsConfig.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/TestsConfig.kt
index e02ae6ce3..4a25b877e 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/TestsConfig.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/TestsConfig.kt
@@ -1,6 +1,8 @@
 package pro.qyoga.tests.infra.test_config.spring
 
+import org.springframework.boot.autoconfigure.web.ServerProperties
 import org.springframework.boot.builder.SpringApplicationBuilder
+import org.springframework.context.ApplicationContext
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Configuration
@@ -9,7 +11,9 @@ import pro.qyoga.app.QYogaApp
 import pro.qyoga.infra.db.SdjConfig
 import pro.qyoga.tests.fixture.FailingController
 import pro.qyoga.tests.fixture.backgrounds.BackgroundsConfig
-import pro.qyoga.tests.fixture.presets.Presets
+import pro.qyoga.tests.fixture.presets.PresetsConf
+import pro.qyoga.tests.fixture.test_apis.TestApisConf
+import pro.qyoga.tests.fixture.wiremocks.MockServersConf
 import pro.qyoga.tests.infra.test_config.spring.auth.TestPasswordEncoderConfig
 import pro.qyoga.tests.infra.test_config.spring.db.TestDataSourceConfig
 import pro.qyoga.tests.infra.test_config.spring.minio.TestMinioConfig
@@ -22,6 +26,12 @@ val context: ConfigurableApplicationContext by lazy {
         .run()
 }
 
+val ApplicationContext.baseUrl: String
+    get() {
+        val port = this.getBean(ServerProperties::class.java).port
+        return "http://localhost:$port"
+    }
+
 @Suppress("unused") // можно использовать для быстрых тестов кода, работающего только с БД
 val sdjContext by lazy {
     AnnotationConfigApplicationContext(SdjTestsConfig::class.java)
@@ -30,11 +40,14 @@ val sdjContext by lazy {
 @Import(
     QYogaApp::class,
     BackgroundsConfig::class,
-    Presets::class,
+    TestApisConf::class,
+    PresetsConf::class,
     TestPasswordEncoderConfig::class,
     TestDataSourceConfig::class,
     TestMinioConfig::class,
-    FailingController::class
+    FailingController::class,
+    WireMockConf::class,
+    MockServersConf::class,
 )
 @Configuration
 class TestsConfig
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/WireMockConf.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/WireMockConf.kt
new file mode 100644
index 000000000..eccb8e54c
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/test_config/spring/WireMockConf.kt
@@ -0,0 +1,18 @@
+package pro.qyoga.tests.infra.test_config.spring
+
+import com.github.tomakehurst.wiremock.WireMockServer
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import pro.qyoga.tests.infra.wiremock.WireMock
+
+
+@TestConfiguration
+@Configuration
+class WireMockConf {
+
+    @Bean
+    fun wireMockServer(): WireMockServer =
+        WireMock.wiremock
+
+}
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseKoTest.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseKoTest.kt
index 6b61db801..c7c59570b 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseKoTest.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseKoTest.kt
@@ -1,10 +1,9 @@
 package pro.qyoga.tests.infra.web
 
 import io.kotest.core.spec.style.FreeSpec
-import org.springframework.boot.autoconfigure.web.ServerProperties
 import pro.qyoga.tests.fixture.backgrounds.Backgrounds
 import pro.qyoga.tests.fixture.data.resetFaker
-import pro.qyoga.tests.fixture.presets.Presets
+import pro.qyoga.tests.fixture.presets.PresetsConf
 import pro.qyoga.tests.infra.db.setupDb
 import pro.qyoga.tests.infra.test_config.spring.context
 import pro.qyoga.tests.infra.wiremock.WireMock
@@ -15,11 +14,9 @@ abstract class QYogaAppBaseKoTest(body: QYogaAppBaseKoTest.() -> Unit = {}) : Fr
 
     private val dataSource: DataSource = context.getBean(DataSource::class.java)
 
-    protected val port: Int = context.getBean(ServerProperties::class.java).port
-
     val backgrounds: Backgrounds = context.getBean(Backgrounds::class.java)
 
-    val presets: Presets = context.getBean(Presets::class.java)
+    val presets: PresetsConf = context.getBean(PresetsConf::class.java)
 
     inline fun <reified T> getBean(): T =
         context.getBean(T::class.java)
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseTest.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseTest.kt
index 49b6c7551..2fa36d038 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseTest.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/QYogaAppBaseTest.kt
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.springframework.boot.autoconfigure.web.ServerProperties
 import pro.qyoga.tests.fixture.backgrounds.Backgrounds
 import pro.qyoga.tests.fixture.data.resetFaker
-import pro.qyoga.tests.fixture.presets.Presets
+import pro.qyoga.tests.fixture.presets.PresetsConf
 import pro.qyoga.tests.infra.db.setupDb
 import pro.qyoga.tests.infra.test_config.spring.context
 import pro.qyoga.tests.infra.wiremock.WireMock
@@ -19,7 +19,7 @@ open class QYogaAppBaseTest {
 
     protected val backgrounds: Backgrounds = context.getBean(Backgrounds::class.java)
 
-    protected val presets: Presets = context.getBean(Presets::class.java)
+    protected val presets: PresetsConf = context.getBean(PresetsConf::class.java)
 
     inline fun <reified T> getBean(): T =
         context.getBean(T::class.java)
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/WebTestClient.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/WebTestClient.kt
new file mode 100644
index 000000000..1a185a427
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/web/WebTestClient.kt
@@ -0,0 +1,14 @@
+package pro.qyoga.tests.infra.web
+
+import org.springframework.context.ConfigurableApplicationContext
+import org.springframework.test.web.reactive.server.WebTestClient
+import pro.qyoga.tests.infra.test_config.spring.baseUrl
+
+
+val mainWebTestClient: WebTestClient by lazy { createWebTestClient() }
+
+fun createWebTestClient(context: ConfigurableApplicationContext = pro.qyoga.tests.infra.test_config.spring.context): WebTestClient =
+    WebTestClient.bindToServer()
+        .baseUrl(context.baseUrl)
+        .defaultHeader("Content-Type", "application/json;charset=UTF-8")
+        .build()
\ No newline at end of file
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/wiremock/WireMock.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/wiremock/WireMock.kt
index d917fe948..9e77c7a95 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/wiremock/WireMock.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/infra/wiremock/WireMock.kt
@@ -2,11 +2,15 @@ package pro.qyoga.tests.infra.wiremock
 
 import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration.options
+import org.slf4j.LoggerFactory
 
 
+private val log = LoggerFactory.getLogger(WireMock::class.java)
+
 object WireMock {
 
     private val wiremockDelegate = lazy {
+        log.warn("Starting WireMock server on port 8089")
         val wireMockServer = WireMockServer(options().port(8089))
         wireMockServer.start()
         wireMockServer
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt
index 7031170e3..a0c47b997 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/SchedulePage.kt
@@ -9,16 +9,17 @@ import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.resolveOrThrow
 import pro.qyoga.app.therapist.appointments.core.edit.CreateAppointmentPageController
-import pro.qyoga.app.therapist.appointments.core.edit.view_model.SourceItem
 import pro.qyoga.app.therapist.appointments.core.schedule.AppointmentCard
-import pro.qyoga.app.therapist.appointments.core.schedule.CalendarPageModel
 import pro.qyoga.app.therapist.appointments.core.schedule.SchedulePageController
+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.core.calendar.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
 
@@ -29,8 +30,10 @@ object CalendarPage : HtmlPage {
 
     private val goToDayLink = Link("goToDayLink-", SchedulePageController.DATE_PATH, "")
 
+    const val SYNC_ERROR_ICON_SELECTOR = ".sync-error-icon"
+
     object RevealAppointmentScript : Script("revealAppointment") {
-        val appToFocus = Variable(CalendarPageModel.FOCUSED_APPOINTMENT)
+        val appToFocus = Variable(SchedulePageModel.FOCUSED_APPOINTMENT)
         override val vars: List<Variable> = listOf(appToFocus)
     }
 
@@ -40,11 +43,12 @@ object CalendarPage : HtmlPage {
 
     override val matcher = Matcher.all(
         haveComponent(datePickerButton),
+        haveComponent(GoogleCalendarsSettingsLoaderComponent),
         haveElement("small:contains(07:00)"),
-        haveComponents(goToDayLink, CalendarPageModel.DAYS_IN_WEEK),
+        haveComponents(goToDayLink, SchedulePageModel.DAYS_IN_WEEK),
         haveAtLeastElements(
             addAppointmentLink,
-            CalendarPageModel.DAYS_IN_CALENDAR * TimeMark.marksPerHour * (CalendarPageModel.DEFAULT_END_HOUR - CalendarPageModel.DEFAULT_START_HOUR)
+            SchedulePageModel.DAYS_IN_CALENDAR * TimeMark.marksPerHour * (SchedulePageModel.DEFAULT_END_HOUR - SchedulePageModel.DEFAULT_START_HOUR)
         )
     )
 
@@ -60,7 +64,7 @@ infix fun Elements.shouldMatch(appointments: Iterable<Appointment>) {
     this shouldBeSameSizeAs appointments
 
     val timeAndDateComparator = Comparator.comparing<Appointment, LocalTime> { it.wallClockDateTime.toLocalTime() }
-        .thenComparing { it -> it.wallClockDateTime.toLocalDate() }
+        .thenComparing { it.wallClockDateTime.toLocalDate() }
     val appointmentsInHtmlOrder = appointments.sortedWith(timeAndDateComparator)
 
     this.zip(appointmentsInHtmlOrder).forAll { (el, app) ->
@@ -75,12 +79,23 @@ infix fun Elements.shouldMatch(appointments: Iterable<Appointment>) {
     }
 }
 
-infix fun Element.shouldMatch(localizedICalCalendarItem: ICalCalendarItem) {
+infix fun Element.shouldMatch(app: EditAppointmentRequest) {
+    this shouldHaveComponent Link(
+        "editAppointmentLink",
+        EditAppointmentPage,
+        app.client.resolveOrThrow().fullName() + " " +
+                russianTimeFormat.format(app.dateTime) + " - " + russianTimeFormat.format(app.dateTime + app.duration) + " " + app.appointmentTypeTitle
+    )
+    select("div.appointment-card")
+        .single() shouldHaveClass AppointmentCard.appointmentStatusClasses[app.appointmentStatus]!!
+}
+
+infix fun Element.shouldMatch(localizedICalCalendarItem: ICalZonedCalendarItem) {
     this shouldHaveComponent Link(
         "editAppointmentLink",
         CreateAppointmentPageController.addFromSourceItemUri(
             localizedICalCalendarItem.dateTime.toLocalDateTime(),
-            SourceItem.icsEvent(localizedICalCalendarItem.id)
+            localizedICalCalendarItem.id.toUri()
         ),
         localizedICalCalendarItem.title + " " +
                 russianTimeFormat.format(localizedICalCalendarItem.dateTime) + " - " + russianTimeFormat.format(
@@ -89,4 +104,4 @@ infix fun Element.shouldMatch(localizedICalCalendarItem: ICalCalendarItem) {
     )
     this.select("div.appointment-card")
         .single() shouldHaveClass AppointmentCard.CssClasses.DRAFT_CARD
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleAccountComponent.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleAccountComponent.kt
new file mode 100644
index 000000000..a5b9f0d59
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleAccountComponent.kt
@@ -0,0 +1,29 @@
+package pro.qyoga.tests.pages.therapist.appointments.google_calendars
+
+import io.kotest.matchers.Matcher
+import org.jsoup.nodes.Element
+import pro.qyoga.i9ns.calendars.google.views.GoogleCalendarsSettingsView
+import pro.qyoga.tests.assertions.haveComponent
+import pro.qyoga.tests.platform.html.Component
+import pro.qyoga.tests.platform.kotest.all
+
+class GoogleAccountComponent(
+    private val googleCalendarsSettingsView: GoogleCalendarsSettingsView
+) : Component {
+
+    override fun selector(): String =
+        ".google-account-item"
+
+    override fun matcher(): Matcher<Element> {
+        return if (googleCalendarsSettingsView.isError) {
+            haveComponent(".google-account-error-content")
+        } else {
+            Matcher.all(
+                *googleCalendarsSettingsView.calendars
+                    .map { haveComponent(GoogleCalendarSettingsComponent(it)) }
+                    .toTypedArray()
+            )
+        }
+    }
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarSettingsComponent.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarSettingsComponent.kt
new file mode 100644
index 000000000..3ce14517b
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarSettingsComponent.kt
@@ -0,0 +1,24 @@
+package pro.qyoga.tests.pages.therapist.appointments.google_calendars
+
+import io.kotest.matchers.Matcher
+import io.kotest.matchers.compose.all
+import org.jsoup.nodes.Element
+import pro.qyoga.i9ns.calendars.google.views.GoogleCalendarSettingsView
+import pro.qyoga.tests.assertions.haveCheckboxChecked
+import pro.qyoga.tests.assertions.haveComponent
+import pro.qyoga.tests.platform.html.Component
+
+
+class GoogleCalendarSettingsComponent(
+    private val googleCalendarsSettingsView: GoogleCalendarSettingsView
+) : Component {
+
+    override fun selector(): String = "#${googleCalendarsSettingsView.id}"
+
+    override fun matcher(): Matcher<Element> =
+        Matcher.all(
+            haveComponent(".calendar-name:containsOwn(${googleCalendarsSettingsView.title})"),
+            haveCheckboxChecked(".should-be-shown-toggle", googleCalendarsSettingsView.shouldBeShown)
+        )
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarsSettingsComponent.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarsSettingsComponent.kt
new file mode 100644
index 000000000..a0a425521
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarsSettingsComponent.kt
@@ -0,0 +1,29 @@
+package pro.qyoga.tests.pages.therapist.appointments.google_calendars
+
+import io.kotest.matchers.Matcher
+import org.jsoup.nodes.Element
+import pro.qyoga.i9ns.calendars.google.views.GoogleAccountCalendarsSettingsView
+import pro.qyoga.tests.assertions.haveComponent
+import pro.qyoga.tests.platform.html.Component
+import pro.qyoga.tests.platform.html.Link
+import pro.qyoga.tests.platform.kotest.all
+
+
+class GoogleCalendarsSettingsComponent(
+    private val accounts: List<GoogleAccountCalendarsSettingsView>
+) : Component {
+
+    private val connectButton =
+        Link("connect-google-calendar", "/oauth2/authorization/google", "Добавить аккаунт")
+
+    override fun selector(): String =
+        "#google-calendar-settings"
+
+    override fun matcher(): Matcher<Element> {
+        return Matcher.all(
+            haveComponent(connectButton),
+            *(accounts.map { haveComponent(GoogleAccountComponent(it.content)) }.toTypedArray())
+        )
+    }
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarsSettingsLoaderComponent.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarsSettingsLoaderComponent.kt
new file mode 100644
index 000000000..578a3b382
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/appointments/google_calendars/GoogleCalendarsSettingsLoaderComponent.kt
@@ -0,0 +1,20 @@
+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.tests.assertions.haveAttributeValue
+import pro.qyoga.tests.platform.html.Component
+import pro.qyoga.tests.platform.kotest.all
+
+
+object GoogleCalendarsSettingsLoaderComponent : Component {
+
+    override fun selector(): String = "#google-calendar-settings-container"
+
+    override fun matcher(): Matcher<Element> =
+        Matcher.all(
+            haveAttributeValue("hx-get", GoogleCalendarSettingsController.PATH)
+        )
+
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/StringExt.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/StringExt.kt
index e113734f8..77b0517ea 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/StringExt.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/StringExt.kt
@@ -9,4 +9,4 @@ fun String.pathToRegex(): String {
     val queryRegEx = pathRegEx +
             (pathAndQuery.getOrNull(1)?.replace("\\{.*?}".toRegex(), "(.*)")?.let { "\\?$it" } ?: "")
     return queryRegEx
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Link.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Link.kt
index cc4f315d4..ac226bb4e 100644
--- a/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Link.kt
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Link.kt
@@ -2,12 +2,12 @@ package pro.qyoga.tests.platform.html
 
 import io.kotest.matchers.Matcher
 import org.jsoup.nodes.Element
+import org.springframework.web.util.UriTemplate
 import pro.qyoga.tests.assertions.haveAttribute
 import pro.qyoga.tests.assertions.haveAttributeValueMatching
 import pro.qyoga.tests.assertions.haveText
 import pro.qyoga.tests.assertions.isTag
 import pro.qyoga.tests.platform.kotest.all
-import pro.qyoga.tests.platform.pathToRegex
 
 class Link(
     val id: String,
@@ -16,7 +16,7 @@ class Link(
     val targetAttr: String = "href"
 ) : Component {
 
-    val urlRegex = urlPattern.pathToRegex().toRegex()
+    private val urlTemplate = UriTemplate(urlPattern)
 
     constructor(id: String, page: HtmlPageCompat, text: String) : this(id, page.path, text)
 
@@ -29,19 +29,15 @@ class Link(
         return Matcher.all(
             isTag("a"),
             haveAttribute(targetAttr),
-            haveAttributeValueMatching(targetAttr, urlRegex),
+            haveAttributeValueMatching(targetAttr, urlTemplate),
             if (text.isNotEmpty()) haveText(text) else null
         )
     }
 
     fun pathParam(element: Element, paramName: String): String? {
         val actualUrl = element.select(selector()).attr(targetAttr)
-        val paramIdx = "\\{.*?}".toRegex().findAll(urlPattern)
-            .indexOfFirst { it.value == "{$paramName}" }
-            .takeIf { it >= 0 }
-            ?: return null
-
-        return urlRegex.matchEntire(actualUrl)!!.groupValues[paramIdx + 1]
+        val vars = urlTemplate.match(actualUrl)
+        return vars[paramName]
     }
 
     companion object {
@@ -52,4 +48,4 @@ class Link(
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/spring/web_test_client/ResponseSpecExt.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/spring/web_test_client/ResponseSpecExt.kt
new file mode 100644
index 000000000..0aa228511
--- /dev/null
+++ b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/spring/web_test_client/ResponseSpecExt.kt
@@ -0,0 +1,19 @@
+package pro.qyoga.tests.platform.spring.web_test_client
+
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.returnResult
+import java.net.URI
+
+
+fun WebTestClient.ResponseSpec.getBodyAsString(): String =
+    this.returnResult(String::class.java)
+        .responseBody
+        .collectList()
+        .block()!!
+        .joinToString("\n")
+
+fun WebTestClient.ResponseSpec.redirectLocation(): URI =
+    this
+        .expectStatus().isFound.returnResult<Unit>()
+        .responseHeaders
+        .location!!
\ No newline at end of file
diff --git a/app/src/testFixtures/resources/application-test.yaml b/app/src/testFixtures/resources/application-test.yaml
index bacf92c0a..ff8909a23 100644
--- a/app/src/testFixtures/resources/application-test.yaml
+++ b/app/src/testFixtures/resources/application-test.yaml
@@ -2,6 +2,9 @@ server:
   port: 10803
 
 spring:
+  main:
+    lazy-initialization: true
+
   mail:
     username: qyogapro@yandex.ru
     password: password
@@ -13,4 +16,21 @@ spring:
         smtp:
           auth: true
           starttls:
-            enable: true
\ No newline at end of file
+            enable: true
+
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            redirect-uri: "http://localhost:${server.port:8080}/therapist/oauth2/google/callback"
+        provider:
+          google:
+            token-uri: http://localhost:8089/google/oauth/token
+            user-info-uri: http://localhost:8089/google/oauth/userinfo
+
+trainer-advisor:
+
+  integrations:
+    google-calendar:
+      root-url: http://localhost:8089/google/
\ No newline at end of file
diff --git a/app/src/testFixtures/resources/db/shared-fixture.sql b/app/src/testFixtures/resources/db/shared-fixture.sql
index ff7d8d1c0..7afa30e62 100644
--- a/app/src/testFixtures/resources/db/shared-fixture.sql
+++ b/app/src/testFixtures/resources/db/shared-fixture.sql
@@ -6,7 +6,9 @@ TRUNCATE
     programs, program_exercises,
     appointments, appointment_types,
     survey_forms_settings,
-    ical_calendars
+    ical_calendars,
+    therapist_google_accounts,
+    therapist_google_calendar_settings
     RESTART IDENTITY;
 
 INSERT INTO users (id, email, password_hash, roles, created_at, version)
diff --git a/app/src/testFixtures/resources/logback-test.xml b/app/src/testFixtures/resources/logback-test.xml
index e650bf9fe..5ef97f5fc 100644
--- a/app/src/testFixtures/resources/logback-test.xml
+++ b/app/src/testFixtures/resources/logback-test.xml
@@ -6,11 +6,11 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="warn">
         <appender-ref ref="CONSOLE"/>
     </root>
 
-    <logger name="pro.qyoga" level="info" additivity="false">
+    <logger name="pro.qyoga" level="warn" additivity="false">
         <appender-ref ref="CONSOLE"/>
     </logger>
 
diff --git a/deploy/qyoga/docker-compose.yml b/deploy/qyoga/docker-compose.yml
index d66fd250b..5b2194b0c 100644
--- a/deploy/qyoga/docker-compose.yml
+++ b/deploy/qyoga/docker-compose.yml
@@ -31,6 +31,8 @@ services:
       - SPRING_PROFILES_ACTIVE=prod
       - SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD}
       - MINIO_ENDPOINT=http://minio:9000
+      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
+      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
 
     restart: always
 
diff --git a/docs/guideline.adoc b/docs/guideline.adoc
new file mode 100644
index 000000000..7f0033580
--- /dev/null
+++ b/docs/guideline.adoc
@@ -0,0 +1,21 @@
+= Гайдлайн разработки
+
+В целом проект разрабатывается согласно https://ergowiki.azhidkov.pro[Эргономичному подходу].
+В этом документе собраны локальные для проекта дополнения.
+
+== HTML
+
+=== Порядок указания атрибутов тэгов
+
+* id
+* class
+* name
+* type/value/for/href/src/action/method (основные семантические)
+* data-*
+* hx-* (htmx)
+* aria-* и role
+* autocomplete/tabindex
+* булевы: required, disabled, readonly, checked, multiple
+* валидация/формат: pattern, min, max, step, placeholder
+* style
+* шаблонные/фреймворк-специфичные: th:, v-, ng:* (в конце)
diff --git a/e2e-tests/src/test/kotlin/pro/qyoga/tests/infra/QYogaE2EBaseTest.kt b/e2e-tests/src/test/kotlin/pro/qyoga/tests/infra/QYogaE2EBaseTest.kt
index 1ee0aa0c0..825596777 100644
--- a/e2e-tests/src/test/kotlin/pro/qyoga/tests/infra/QYogaE2EBaseTest.kt
+++ b/e2e-tests/src/test/kotlin/pro/qyoga/tests/infra/QYogaE2EBaseTest.kt
@@ -13,6 +13,8 @@ import org.openqa.selenium.logging.LogType
 import org.openqa.selenium.remote.RemoteWebDriver
 import org.slf4j.LoggerFactory
 import org.testcontainers.Testcontainers
+import pro.qyoga.tests.infra.test_config.spring.baseUrl
+import pro.qyoga.tests.infra.test_config.spring.context
 import pro.qyoga.tests.infra.web.QYogaAppBaseTest
 
 
@@ -24,7 +26,7 @@ open class QYogaE2EBaseTest : QYogaAppBaseTest() {
 
     private val baseUri =
         if (headless) "http://host.testcontainers.internal:$port"
-        else "http://localhost:$port"
+        else context.baseUrl
 
     @BeforeEach
     fun setUp() {
diff --git a/queries/queries.sql b/queries/queries.sql
index 5ccb0ef94..6a0354465 100644
--- a/queries/queries.sql
+++ b/queries/queries.sql
@@ -22,9 +22,11 @@ GROUP BY u.id, t.id;
 -- Месячная статистика по записям журнала
 SELECT dates                           AS date,
        count(je.id)                    AS entries_count,
-       count(distinct c.therapist_ref) AS therapists_count
+       count(distinct c.therapist_ref) AS therapists_count,
+       array_agg(distinct t.last_name)
 FROM generate_series(now() - '1 month'::interval, now(), '1 day'::interval) dates
          LEFT JOIN journal_entries je ON je.date = date_trunc('days', dates.dates)
          LEFT JOIN clients c ON c.id = je.client_ref
+         LEFT JOIN therapists t ON t.id = c.therapist_ref
 GROUP by dates.dates
 ORDER BY dates.dates DESC;
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f8abba5c1..5b948f558 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,6 +15,8 @@ dependencyResolutionManagement {
 
             // lib versions
             val poiVersion = version("poi", "5.4.1")
+            val caffeineVersion = version("caffeine", "3.1.8")
+            val googleAuthBomVersion = version("google-auth-bom", "1.30.1")
 
             // plugins
             plugin("kotlin", "org.jetbrains.kotlin.jvm").versionRef(kotlinVersion)
@@ -39,6 +41,7 @@ dependencyResolutionManagement {
 
             library("postgres", "org.postgresql", "postgresql").version("42.7.6")
             library("minio", "io.minio", "minio").version("8.5.17")
+            library("caffeine", "com.github.ben-manes.caffeine", "caffeine").versionRef(caffeineVersion)
 
             library("poi-ooxml", "org.apache.poi", "poi-ooxml").versionRef(poiVersion)
             library("poi-ooxml-lite", "org.apache.poi", "poi-ooxml-lite").versionRef(poiVersion)
@@ -47,6 +50,19 @@ dependencyResolutionManagement {
 
             library("nanocaptcha", "net.logicsquad", "nanocaptcha").version("2.1")
             library("ical4j", "org.mnode.ical4j", "ical4j").version("4.1.1")
+
+            library("google-api-client", "com.google.api-client", "google-api-client").version("2.0.0")
+            library(
+                "google-oauth-client",
+                "com.google.oauth-client",
+                "google-oauth-client-jetty"
+            ).version("1.34.1")
+            library(
+                "google-calendar-api",
+                "com.google.apis",
+                "google-api-services-calendar"
+            ).version("v3-rev20220715-2.0.0")
+            library("google.auth.bom", "com.google.auth", "google-auth-library-bom").versionRef(googleAuthBomVersion)
         }
 
         create("testLibs") {
@@ -84,7 +100,6 @@ dependencyResolutionManagement {
 
             library("wiremock", "org.wiremock", "wiremock").versionRef(wiremockVersion)
             library("wiremock-jetty12", "org.wiremock", "wiremock-jetty12").versionRef(wiremockVersion)
-            library("wiremock-kotlin", "com.marcinziolo", "kotlin-wiremock").version("2.1.1")
         }
     }
-}
\ No newline at end of file
+}