Merge pull request #203 from wafflestudio/develop

Release
wafflestudio · Jan 5, 2024 · a617bed · a617bed
2 parents 66277ac + fe6e6c8
commit a617bed
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/batch/src/main/kotlin/sugangsnu/common/data/SugangSnuLectureInfo.kt b/batch/src/main/kotlin/sugangsnu/common/data/SugangSnuLectureInfo.kt
@@ -37,7 +37,11 @@ data class SugangSnuLectureInfo(
 
 data class SugangSnuLectureSubInfo(
     @JsonProperty("sbjtNm")
-    val sbjtNm: String? = null,
+    val courseName: String? = null,
+    @JsonProperty("sbjtSubhNm")
+    val courseSubName: String? = null,
+    @JsonProperty("profNm")
+    val professorName: String? = null,
     @JsonProperty("departmentKorNm")
     val departmentKorNm: String? = null,
     @JsonProperty("deptKorNm")
@@ -110,8 +114,6 @@ data class SugangSnuLectureSubInfo(
 //    val openPnt: Int? = null,
 //    @JsonProperty("mrksRelevalYn")
 //    val mrksRelevalYn: String? = null,
-//    @JsonProperty("sbjtSubhNm")
-//    val sbjtSubhNm: String? = null,
 //    @JsonProperty("theoryLtTmCnt")
 //    val theoryLtTmCnt: Int? = null,
 //    @JsonProperty("cptnCorsFgNm")
@@ -150,8 +152,6 @@ data class SugangSnuLectureSubInfo(
 //    val ltNo: String? = null,
 //    @JsonProperty("lsnProgLangEng")
 //    val lsnProgLangEng: String? = null,
-//    @JsonProperty("profNm")
-//    val profNm: String? = null,
 //    @JsonProperty("sbjtSubhCd")
 //    val sbjtSubhCd: String? = null,
 //    @JsonProperty("sbjtFldEngNm")

diff --git a/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuFetchService.kt b/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuFetchService.kt
@@ -35,15 +35,23 @@ class SugangSnuFetchServiceImpl(
         }.map { lecture ->
             val extraLectureInfo =
                 sugangSnuRepository.getLectureInfo(year, semester, lecture.courseNumber, lecture.lectureNumber)
+            val extraCourseTitle =
+                if (extraLectureInfo.subInfo.courseSubName.isNullOrEmpty()) extraLectureInfo.subInfo.courseName
+                else "${extraLectureInfo.subInfo.courseName} (${extraLectureInfo.subInfo.courseSubName})"
+            val extraDepartment =
+                if (extraLectureInfo.subInfo.departmentKorNm != null && extraLectureInfo.subInfo.majorKorNm != null)
+                    "${extraLectureInfo.subInfo.departmentKorNm}(${extraLectureInfo.subInfo.majorKorNm})"
+                else null
+
             lecture.apply {
                 classPlaceAndTimes = SugangSnuClassTimeUtils.convertTextToClassTimeObject(
                     extraLectureInfo.ltTime,
                     extraLectureInfo.ltRoom
                 )
+                courseTitle = extraCourseTitle ?: courseTitle
+                instructor = extraLectureInfo.subInfo.professorName ?: instructor
                 category = extraLectureInfo.subInfo.sbjtFldNm ?: category
-                if (extraLectureInfo.subInfo.departmentKorNm != null && extraLectureInfo.subInfo.majorKorNm != null) {
-                    department = "${extraLectureInfo.subInfo.departmentKorNm}(${extraLectureInfo.subInfo.majorKorNm})"
-                }
+                department = extraDepartment ?: department
             }
         }
     }

diff --git a/core/src/main/kotlin/lectures/repository/LectureCustomRepository.kt b/core/src/main/kotlin/lectures/repository/LectureCustomRepository.kt
@@ -43,8 +43,7 @@ class LectureCustomRepositoryImpl(
                     searchCondition.courseNumber?.takeIf { it.isNotEmpty() }?.let { Lecture::courseNumber inValues it },
                     searchCondition.classification?.takeIf { it.isNotEmpty() }?.let { Lecture::classification inValues it },
                     searchCondition.category?.takeIf { it.isNotEmpty() }?.let { Lecture::category inValues it },
-                    searchCondition.department?.takeIf { it.isNotEmpty() }
-                        ?.let { departments -> Lecture::department regex departments.joinToString("|") { Regex.escape(it) } },
+                    searchCondition.department?.takeIf { it.isNotEmpty() }?.let { Lecture::department inValues it },
                     searchCondition.times?.takeIf { it.isNotEmpty() }?.let { searchTimes ->
                         Criteria().andOperator(
                             Lecture::classPlaceAndTimes ne listOf(),