배치 개선

batch/src/main/kotlin/sugangsnu/common/service/SugangSnuFetchService.kt

@@ -2,12 +2,12 @@ package com.wafflestudio.snutt.sugangsnu.common.service
 
 import com.wafflestudio.snutt.common.enums.Semester
 import com.wafflestudio.snutt.lectures.data.Lecture
-import com.wafflestudio.snutt.pre2025category.service.CategoryPre2025FetchService
 import com.wafflestudio.snutt.sugangsnu.common.SugangSnuRepository
 import com.wafflestudio.snutt.sugangsnu.common.utils.SugangSnuClassTimeUtils
 import org.apache.poi.hssf.usermodel.HSSFWorkbook
 import org.apache.poi.ss.usermodel.Cell
 import org.slf4j.LoggerFactory
+import org.springframework.core.io.ResourceLoader
 import org.springframework.stereotype.Service
 
 interface SugangSnuFetchService {
@@ -20,16 +20,27 @@ interface SugangSnuFetchService {
 @Service
 class SugangSnuFetchServiceImpl(
     private val sugangSnuRepository: SugangSnuRepository,
-    private val categoryPre2025FetchService: CategoryPre2025FetchService,
+    private val resourceLoader: ResourceLoader,
 ) : SugangSnuFetchService {
     private val log = LoggerFactory.getLogger(javaClass)
     private val quotaRegex = """(?<quota>\d+)(\s*\((?<quotaForCurrentStudent>\d+)\))?""".toRegex()
+    private val courseNumberCategoryPre2025Map: Map<String, String> by lazy {
+        resourceLoader
+            .getResource("classpath:categoryPre2025.txt")
+            .inputStream
+            .bufferedReader()
+            .lineSequence()
+            .filter { it.contains(":") }
+            .associate { line ->
+                val (courseNumber, category) = line.split(":", limit = 2)
+                courseNumber to category
+            }
+    }
 
     override suspend fun getSugangSnuLectures(
         year: Int,
         semester: Semester,
     ): List<Lecture> {
-        val courseNumberCategoryPre2025Map = categoryPre2025FetchService.getCategoriesPre2025()
         val koreanLectureXlsx = sugangSnuRepository.getSugangSnuLectures(year, semester, "ko")
         val englishLectureXlsx = sugangSnuRepository.getSugangSnuLectures(year, semester, "en")
         val koreanSheet = HSSFWorkbook(koreanLectureXlsx.asInputStream()).getSheetAt(0)

batch/src/main/kotlin/sugangsnu/job/sync/service/SugangSnuSyncService.kt

@@ -1,6 +1,7 @@
 package com.wafflestudio.snutt.sugangsnu.job.sync.service
 
 import com.wafflestudio.snutt.bookmark.repository.BookmarkRepository
+import com.wafflestudio.snutt.common.exception.CoursebookRecentThanSugangSnuException
 import com.wafflestudio.snutt.coursebook.data.Coursebook
 import com.wafflestudio.snutt.coursebook.repository.CoursebookRepository
 import com.wafflestudio.snutt.lecturebuildings.data.Campus
@@ -106,7 +107,7 @@ class SugangSnuSyncServiceImpl(
                         old,
                         new,
                         Lecture::class.memberProperties.filter {
-                            it != Lecture::id && it.get(old) != it.get(new)
+                            it != Lecture::id && it != Lecture::evInfo && it.get(old) != it.get(new)
                         },
                     )
                 }
@@ -184,7 +185,10 @@ class SugangSnuSyncServiceImpl(
     private suspend fun syncLectures(compareResult: SugangSnuLectureCompareResult) {
         val updatedLectures =
             compareResult.updatedLectureList.map { diff ->
-                diff.newData.apply { id = diff.oldData.id }
+                diff.newData.apply {
+                    id = diff.oldData.id
+                    evInfo = diff.oldData.evInfo
+                }
             }
 
         lectureService.upsertLectures(compareResult.createdLectureList)
@@ -373,8 +377,18 @@ class SugangSnuSyncServiceImpl(
         lectureBuildingService.updateLectureBuildings(updatedPlaceInfos)
     }
 
-    private fun Coursebook.isSyncedToSugangSnu(sugangSnuCoursebookCondition: SugangSnuCoursebookCondition): Boolean =
-        this.year == sugangSnuCoursebookCondition.latestYear && this.semester == sugangSnuCoursebookCondition.latestSemester
+    private fun Coursebook.isSyncedToSugangSnu(sugangSnuCoursebookCondition: SugangSnuCoursebookCondition): Boolean {
+        val sugangSnuCoursebook =
+            Coursebook(
+                year = sugangSnuCoursebookCondition.latestYear,
+                semester = sugangSnuCoursebookCondition.latestSemester,
+            )
+        return when {
+            sugangSnuCoursebook > this -> false
+            sugangSnuCoursebook < this -> throw CoursebookRecentThanSugangSnuException
+            else -> true
+        }
+    }
 }
 
 data class ParsedTags(

batch/src/main/resources/META-INF/native-image/resource-config.json

@@ -2,7 +2,8 @@
   "resources": {
     "includes": [
       { "pattern": "org/apache/xmlbeans/.*\\.properties" },
-      { "pattern": "org/apache/.*\\.xsb" }
+      { "pattern": "org/apache/.*\\.xsb" },
+      { "pattern": "categoryPre2025.txt" }
     ]
   }
 }