구 교양영역 조회 함수 수정 (#343)

wafflestudio · Feb 15, 2025 · ee3dbb0 · ee3dbb0
1 parent 5376fc1
commit ee3dbb0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 34 deletions.
diff --git a/batch/src/main/kotlin/pre2025category/service/CategoryPre2025FetchService.kt b/batch/src/main/kotlin/pre2025category/service/CategoryPre2025FetchService.kt
@@ -2,33 +2,34 @@ package com.wafflestudio.snutt.pre2025category.service
 
 import com.wafflestudio.snutt.pre2025category.repository.CategoryPre2025Repository
 import org.apache.poi.ss.usermodel.WorkbookFactory
+import org.springframework.core.io.buffer.PooledDataBuffer
 import org.springframework.stereotype.Service
 
 @Service
 class CategoryPre2025FetchService(
     private val categoryPre2025Repository: CategoryPre2025Repository,
 ) {
     suspend fun getCategoriesPre2025(): Map<String, String> {
-        val oldCategoriesXlsx = categoryPre2025Repository.fetchCategoriesPre2025()
-        val workbook = WorkbookFactory.create(oldCategoriesXlsx.asInputStream())
-        return workbook.sheetIterator().asSequence()
-            .flatMap { sheet ->
-                sheet.rowIterator().asSequence()
-                    .drop(4)
-                    .map { row ->
-                        try {
-                            val currentCourseNumber = row.getCell(7).stringCellValue
-                            val oldCategory = row.getCell(1).stringCellValue
-                            if (currentCourseNumber.isBlank() || oldCategory.isBlank()) {
-                                return@map null
-                            }
-                            currentCourseNumber to oldCategory
-                        } catch (e: Exception) {
-                            null
+        val oldCategoriesXlsx: PooledDataBuffer = categoryPre2025Repository.fetchCategoriesPre2025()
+
+        try {
+            val workbook = WorkbookFactory.create(oldCategoriesXlsx.asInputStream())
+            return workbook.sheetIterator().asSequence()
+                .flatMap { sheet ->
+                    sheet.rowIterator().asSequence()
+                        .drop(4)
+                        .mapNotNull { row ->
+                            runCatching {
+                                val currentCourseNumber = row.getCell(7).stringCellValue
+                                val oldCategory = row.getCell(1).stringCellValue
+                                check(currentCourseNumber.isNotBlank() && oldCategory.isNotBlank())
+                                currentCourseNumber to oldCategory
+                            }.getOrNull()
                         }
-                    }
-                    .filterNotNull()
-            }
-            .toMap()
+                }
+                .toMap()
+        } finally {
+            oldCategoriesXlsx.release()
+        }
     }
 }
diff --git a/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuFetchService.kt b/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuFetchService.kt
@@ -2,6 +2,7 @@ package com.wafflestudio.snutt.sugangsnu.common.service
 
 import com.wafflestudio.snutt.common.enum.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
@@ -19,6 +20,7 @@ interface SugangSnuFetchService {
 @Service
 class SugangSnuFetchServiceImpl(
     private val sugangSnuRepository: SugangSnuRepository,
+    private val categoryPre2025FetchService: CategoryPre2025FetchService,
 ) : SugangSnuFetchService {
     private val log = LoggerFactory.getLogger(javaClass)
     private val quotaRegex = """(?<quota>\d+)(\s*\((?<quotaForCurrentStudent>\d+)\))?""".toRegex()
@@ -27,6 +29,7 @@ class SugangSnuFetchServiceImpl(
         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)
@@ -69,6 +72,7 @@ class SugangSnuFetchServiceImpl(
                 department = extraDepartment ?: department
                 quota = extraLectureInfo.subInfo.quota ?: quota
                 remark = extraLectureInfo.subInfo.remark ?: remark
+                categoryPre2025 = courseNumberCategoryPre2025Map[lecture.courseNumber]
             }
         }
     }

diff --git a/batch/src/main/kotlin/sugangsnu/job/sync/service/SugangSnuSyncService.kt b/batch/src/main/kotlin/sugangsnu/job/sync/service/SugangSnuSyncService.kt
@@ -9,7 +9,6 @@ import com.wafflestudio.snutt.lecturebuildings.service.LectureBuildingService
 import com.wafflestudio.snutt.lectures.data.Lecture
 import com.wafflestudio.snutt.lectures.service.LectureService
 import com.wafflestudio.snutt.lectures.utils.ClassTimeUtils
-import com.wafflestudio.snutt.pre2025category.service.CategoryPre2025FetchService
 import com.wafflestudio.snutt.sugangsnu.common.SugangSnuRepository
 import com.wafflestudio.snutt.sugangsnu.common.data.SugangSnuCoursebookCondition
 import com.wafflestudio.snutt.sugangsnu.common.service.SugangSnuFetchService
@@ -47,7 +46,6 @@ interface SugangSnuSyncService {
 @Service
 class SugangSnuSyncServiceImpl(
     private val sugangSnuFetchService: SugangSnuFetchService,
-    private val categoryPre2025FetchService: CategoryPre2025FetchService,
     private val lectureService: LectureService,
     private val timeTableRepository: TimetableRepository,
     private val sugangSnuRepository: SugangSnuRepository,
@@ -59,14 +57,8 @@ class SugangSnuSyncServiceImpl(
     private val log = LoggerFactory.getLogger(javaClass)
 
     override suspend fun updateCoursebook(coursebook: Coursebook): List<UserLectureSyncResult> {
-        val courseNumberCategoryPre2025Map = categoryPre2025FetchService.getCategoriesPre2025()
         val newLectures =
             sugangSnuFetchService.getSugangSnuLectures(coursebook.year, coursebook.semester)
-                .map { lecture ->
-                    lecture.apply {
-                        categoryPre2025 = courseNumberCategoryPre2025Map[lecture.courseNumber]
-                    }
-                }
         val oldLectures =
             lectureService.getLecturesByYearAndSemesterAsFlow(coursebook.year, coursebook.semester).toList()
         val compareResult = compareLectures(newLectures, oldLectures)
@@ -81,14 +73,8 @@ class SugangSnuSyncServiceImpl(
     }
 
     override suspend fun addCoursebook(coursebook: Coursebook) {
-        val courseNumberCategoryPre2025Map = categoryPre2025FetchService.getCategoriesPre2025()
         val newLectures =
             sugangSnuFetchService.getSugangSnuLectures(coursebook.year, coursebook.semester)
-                .map { lecture ->
-                    lecture.apply {
-                        categoryPre2025 = courseNumberCategoryPre2025Map[lecture.courseNumber]
-                    }
-                }
         lectureService.upsertLectures(newLectures)
         syncTagList(coursebook, newLectures)