feat/qg-253: реализована интеграция с Google Calendar

.gitignore

@@ -16,3 +16,4 @@ out/
 /build/
 
 /deploy/host/secrets.sh
+/app/src/main/resources/application-local-dev-secrets.yaml

.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"/>

.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>

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"))
+}

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)
+    }

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>"
+    }
+
+}

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) }
-}
+}
+
+inline fun <reified T> taDataClassRowMapper() = DataClassRowMapper.newInstance(T::class.java).apply {
+    conversionService = DefaultConversionService().apply {
+        addConverter(PGIntervalToDurationConverter())
+        addConverter(UuidToAggregateReferenceConverter)
+        addConverter(StringToSecretChars())
+    }
+}

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())
+}

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)
+    }
+}

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,
-}
+}

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

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
     }
 
-}
+}