Merge pull request #99 from wafflestudio/develop

Release

api/src/main/resources/application.yml

@@ -18,6 +18,7 @@ server:
       buffered: false
       suffix:
       file-date-format:
+  max-http-request-header-size: 100KB
 
 ---
 

batch/src/main/kotlin/com/wafflestudio/snuttev/sync/SnuttLectureSyncJobConfig.kt

@@ -23,6 +23,7 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
 import org.springframework.data.domain.Sort
 import org.springframework.data.mongodb.core.MongoTemplate
+import org.springframework.data.mongodb.core.findOne
 import org.springframework.data.mongodb.core.query.Criteria
 import org.springframework.data.mongodb.core.query.Query
 import org.springframework.data.mongodb.core.query.isEqualTo
@@ -50,20 +51,16 @@ class SnuttLectureSyncJobConfig(
 
     @Bean
     fun syncJobNextSemester(jobRepository: JobRepository): Job {
-        val (currentYear, currentSemester) = semesterUtils.getCurrentYearAndSemester()
-        val (yearOfNextSemester, nextSemester) = semesterUtils.getYearAndSemesterOfNextSemester()
-        val (targetYear, targetSemester) = when (
-            snuttSemesterLectureRepository.existsByYearAndSemester(
-                yearOfNextSemester,
-                nextSemester.value,
-            )
-        ) {
-            true -> yearOfNextSemester to nextSemester
-            false -> currentYear to currentSemester
+        val coursebook = mongoTemplate.findOne<Map<String, String>>(
+            Query().with(Sort.by(Sort.Direction.DESC, "year").and(Sort.by(Sort.Direction.DESC, "semester"))),
+            "coursebooks",
+        )
+        val (targetYear, targetSemester) = coursebook!!.let {
+            it["year"]!!.toInt() to it["semester"]!!.toInt()
         }
         lecturesMap = lectureRepository.findAll().associateBy { "${it.courseNumber},${it.instructor}" }.toMutableMap()
         semesterLecturesMap =
-            semesterLectureRepository.findAllByYearAndSemesterWithLecture(targetYear, targetSemester.value)
+            semesterLectureRepository.findAllByYearAndSemesterWithLecture(targetYear, targetSemester)
                 .associateBy { "${it.lecture.courseNumber},${it.lecture.instructor},${it.year},${it.semester}" }
                 .toMutableMap()
 
@@ -74,7 +71,7 @@ class SnuttLectureSyncJobConfig(
                     Query.query(
                         Criteria
                             .where("year").isEqualTo(targetYear)
-                            .and("semester").isEqualTo(targetSemester.value),
+                            .and("semester").isEqualTo(targetSemester),
                     ),
                 ),
             )

build.gradle.kts

@@ -4,9 +4,9 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
 import java.io.ByteArrayOutputStream
 
 plugins {
-    id("org.springframework.boot") version "3.0.6"
-    id("io.spring.dependency-management") version "1.1.0"
-    kotlin("jvm") version "1.8.21"
+    id("org.springframework.boot") version "3.1.4" apply false
+    id("io.spring.dependency-management") version "1.1.3"
+    kotlin("jvm") version "1.9.10"
     kotlin("plugin.spring") version "1.8.21"
     kotlin("plugin.allopen") version "1.8.21"
     kotlin("plugin.noarg") version "1.8.21"
@@ -75,15 +75,15 @@ subprojects {
 }
 
 project(":api") {
-    tasks.bootJar {
-        archiveFileName.set("snuttev-api.jar")
-    }
+    val bootJar: BootJar by tasks
+
+    bootJar.archiveFileName.set("snuttev-api.jar")
 }
 
 project(":batch") {
-    tasks.bootJar {
-        archiveFileName.set("snuttev-batch.jar")
-    }
+    val bootJar: BootJar by tasks
+
+    bootJar.archiveFileName.set("snuttev-batch.jar")
 }
 
 project(":core") {
@@ -94,12 +94,6 @@ project(":core") {
     bootJar.enabled = false
 }
 
-val jar: Jar by tasks
-val bootJar: BootJar by tasks
-
-jar.enabled = true
-bootJar.enabled = false
-
 fun RepositoryHandler.mavenCodeArtifact() {
     maven {
         val authToken = properties["codeArtifactAuthToken"] as String? ?: ByteArrayOutputStream().use {