diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92d7dd3..36a6149 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ keycloak = "26.0.4" kotlin-logging = "3.0.5" kotlin-reflect = "2.2.20" kotlin-lombok = "1.9.0" +postgres = "42.6.0" plugin-nebula-release = "17.2.2" plugin-lombok = "8.0.1" plugin-gradle-versions = "0.46.0" @@ -83,6 +84,7 @@ mockito-inline = "org.mockito:mockito-inline:5.2.0" mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } kotlin-logging = { module = "io.github.microutils:kotlin-logging-jvm", version.ref = "kotlin-logging" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" } +postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" } plugin-nebula-release = { module = "com.netflix.nebula:nebula-release-plugin", version.ref = "plugin-nebula-release" } plugin-springboot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "spring-boot" } plugin-lombok = { module = "io.freefair.gradle:lombok-plugin", version.ref = "plugin-lombok" } diff --git a/module-server/server.gradle.kts b/module-server/server.gradle.kts index 20a4bf3..a8b030f 100644 --- a/module-server/server.gradle.kts +++ b/module-server/server.gradle.kts @@ -19,4 +19,6 @@ dependencies { implementation(libs.spring.boot.batch) implementation(libs.bundles.spring.boot.security) + + runtimeOnly(libs.postgres) } diff --git a/module-server/src/main/kotlin/de/twomartens/timetable/service/BatchProcessTimetableConfiguration.kt b/module-server/src/main/kotlin/de/twomartens/timetable/service/BatchProcessTimetableConfiguration.kt index 0489019..e4ea2ee 100644 --- a/module-server/src/main/kotlin/de/twomartens/timetable/service/BatchProcessTimetableConfiguration.kt +++ b/module-server/src/main/kotlin/de/twomartens/timetable/service/BatchProcessTimetableConfiguration.kt @@ -32,7 +32,7 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor import org.springframework.data.domain.Sort import org.springframework.transaction.PlatformTransactionManager -@EnableBatchProcessing +@EnableBatchProcessing(databaseType = "POSTGRES") @Configuration class BatchProcessTimetableConfiguration { diff --git a/module-server/src/main/kotlin/de/twomartens/timetable/service/StopStorageRequestRepository.kt b/module-server/src/main/kotlin/de/twomartens/timetable/service/StopStorageRequestRepository.kt index c75abef..9bf0005 100644 --- a/module-server/src/main/kotlin/de/twomartens/timetable/service/StopStorageRequestRepository.kt +++ b/module-server/src/main/kotlin/de/twomartens/timetable/service/StopStorageRequestRepository.kt @@ -8,6 +8,4 @@ import org.springframework.data.mongodb.repository.MongoRepository interface StopStorageRequestRepository : MongoRepository { // is used fun getStopStorageRequestsByUserIdAndTimetableId(userId: String, timetableId: String, pageable: Pageable): Page - - fun saveAll(stopStorageRequests: List): List } \ No newline at end of file diff --git a/module-server/src/main/kotlin/de/twomartens/timetable/timetable/TimetableRepository.kt b/module-server/src/main/kotlin/de/twomartens/timetable/timetable/TimetableRepository.kt index 4a8fae8..437c3f0 100644 --- a/module-server/src/main/kotlin/de/twomartens/timetable/timetable/TimetableRepository.kt +++ b/module-server/src/main/kotlin/de/twomartens/timetable/timetable/TimetableRepository.kt @@ -5,8 +5,8 @@ import de.twomartens.timetable.model.common.UserId import de.twomartens.timetable.model.db.Timetable import org.bson.types.ObjectId import org.springframework.data.domain.Page +import org.springframework.data.domain.Pageable import org.springframework.data.mongodb.repository.MongoRepository -import java.awt.print.Pageable interface TimetableRepository : MongoRepository { fun findByUserIdAndTimetableId(userId: UserId, timetableId: TimetableId): Timetable?