Merge pull request #345 from wafflestudio/develop

Release
wafflestudio · Feb 15, 2025 · b03191c · b03191c
2 parents ee887c6 + ee3dbb0
commit b03191c
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 351 deletions.
diff --git a/api/src/main/kotlin/filter/ErrorWebFilter.kt b/api/src/main/kotlin/filter/ErrorWebFilter.kt
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.wafflestudio.snutt.common.exception.ErrorType
 import com.wafflestudio.snutt.common.exception.EvServiceProxyException
 import com.wafflestudio.snutt.common.exception.SnuttException
+import kotlinx.coroutines.CancellationException
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.HttpStatusCode
@@ -46,9 +47,9 @@ class ErrorWebFilter(
                                 SnuttException(errorMessage = throwable.body.title ?: ErrorType.DEFAULT_ERROR.errorMessage),
                             )
                     }
-                    is AbortedException -> {
-                        httpStatusCode = HttpStatus.GATEWAY_TIMEOUT
-                        errorBody = makeErrorBody(SnuttException())
+                    is AbortedException, is CancellationException -> {
+                        httpStatusCode = HttpStatus.NO_CONTENT
+                        errorBody = emptyMap<String, Any>()
                     }
                     else -> {
                         log.error(throwable.message, throwable)

diff --git a/api/src/main/kotlin/handler/DeviceHandler.kt b/api/src/main/kotlin/handler/DeviceHandler.kt
@@ -3,7 +3,6 @@ package com.wafflestudio.snutt.handler
 import com.wafflestudio.snutt.common.dto.OkResponse
 import com.wafflestudio.snutt.middleware.SnuttRestApiDefaultMiddleware
 import com.wafflestudio.snutt.notification.service.DeviceService
-import com.wafflestudio.snutt.users.data.User
 import com.wafflestudio.snutt.users.service.UserNicknameService
 import com.wafflestudio.snutt.users.service.UserService
 import org.springframework.stereotype.Component
@@ -24,19 +23,9 @@ class DeviceHandler(
             val registrationId = req.pathVariable("id")
             deviceService.addRegistrationId(userId, registrationId, clientInfo)
 
-            updateIfUserNicknameNull(req.getContext().user!!)
             OkResponse()
         }
 
-    // TODO 회원가입 API (SNUTT -> SNU4T) 마이그레이션 완료 이후 삭제
-    //   context: https://wafflestudio.slack.com/archives/C0PAVPS5T/p1690711859658779
-    private suspend fun updateIfUserNicknameNull(user: User) {
-        if (user.nickname.isNullOrEmpty()) {
-            val nickname = userNicknameService.generateUniqueRandomNickname()
-            userService.update(user.copy(nickname = nickname))
-        }
-    }
-
     suspend fun removeRegistrationId(req: ServerRequest) =
         handle(req) {
             val userId = req.userId

diff --git a/api/src/main/kotlin/handler/FriendHandler.kt b/api/src/main/kotlin/handler/FriendHandler.kt
@@ -32,7 +32,7 @@ class FriendHandler(
                         id = friend.id!!,
                         userId = partner.id!!,
                         displayName = partnerDisplayName,
-                        nickname = userNicknameService.getNicknameDto(partner.nickname!!),
+                        nickname = userNicknameService.getNicknameDto(partner.nickname),
                         createdAt = friend.createdAt,
                     )
                 }
@@ -104,7 +104,7 @@ class FriendHandler(
                         id = friend.id!!,
                         userId = partner.id!!,
                         displayName = friend.getPartnerDisplayName(userId),
-                        nickname = userNicknameService.getNicknameDto(partner.nickname!!),
+                        nickname = userNicknameService.getNicknameDto(partner.nickname),
                         createdAt = friend.createdAt,
                     )
                 }

diff --git a/api/src/main/kotlin/handler/LectureSearchHandler.kt b/api/src/main/kotlin/handler/LectureSearchHandler.kt
@@ -1,7 +1,6 @@
 package com.wafflestudio.snutt.handler
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.wafflestudio.snutt.common.enum.DayOfWeek
 import com.wafflestudio.snutt.common.enum.Semester
 import com.wafflestudio.snutt.lectures.dto.SearchDto
 import com.wafflestudio.snutt.lectures.dto.SearchTimeDto
@@ -39,8 +38,6 @@ data class SearchQueryLegacy(
     val academicYear: List<String>? = null,
     val department: List<String>? = null,
     val category: List<String>? = null,
-    @JsonProperty("time_mask")
-    val timeMask: List<Int>? = null,
     val times: List<SearchTimeDto>? = null,
     val timesToExclude: List<SearchTimeDto>? = null,
     val etc: List<String>? = null,
@@ -62,7 +59,7 @@ data class SearchQueryLegacy(
             department = department,
             category = category,
             etcTags = etc,
-            times = times?.takeIf { it.isNotEmpty() } ?: bitmaskToClassTime(timeMask),
+            times = times,
             timesToExclude = timesToExclude,
             page = page,
             offset = offset,
@@ -71,35 +68,4 @@ data class SearchQueryLegacy(
             categoryPre2025 = categoryPre2025,
         )
     }
-
-    /*
-    기존 timeMask 스펙을 대응하기 위한 코드
-    8시부터 23시까지 30분 단위로 강의가 존재하는 경우 1, 존재하지 않는 경우 0인 2진수가 전달된다.
-    이를 searchTimeDto로 변환
-    ex) 111000... -> 8:00~9:30 수업 -> startMinute = 480, endMinute: 570
-     */
-    private fun bitmaskToClassTime(timeMask: List<Int>?): List<SearchTimeDto>? =
-        timeMask?.flatMapIndexed { dayValue, mask ->
-            mask.toTimeMask().zip((mask shr 1).toTimeMask())
-                .foldIndexed(emptyList()) { index, acc, (bit, bitBefore) ->
-                    if (bit && !bitBefore) {
-                        acc +
-                            SearchTimeDto(
-                                day = DayOfWeek.getOfValue(dayValue)!!,
-                                startMinute = index * 30 + 8 * 60,
-                                endMinute = index * 30 + 8 * 60 + 30,
-                            )
-                    } else if (bit && bitBefore) {
-                        val updated = acc.last().copy(endMinute = index * 30 + 8 * 60 + 30)
-                        acc.dropLast(1) + updated
-                    } else {
-                        acc
-                    }
-                }
-        }
-
-    /*
-    ex) 258048 -> 2진수 00000000000000111111000000000000 -> [..., true, true, true, true, true, true, false, false, ...]
-     */
-    private fun Int.toTimeMask(): List<Boolean> = this.toString(2).padStart(30, '0').map { it == '1' }
 }
diff --git a/api/src/main/kotlin/handler/UserHandler.kt b/api/src/main/kotlin/handler/UserHandler.kt
@@ -183,6 +183,6 @@ class UserHandler(
             email = user.email,
             localId = user.credential.localId,
             fbName = user.credential.fbName,
-            nickname = userNicknameService.getNicknameDto(user.nickname!!),
+            nickname = userNicknameService.getNicknameDto(user.nickname),
         )
 }
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)
 

diff --git a/batch/src/main/kotlin/users/job/UserNicknameCreateJobConfig.kt b/batch/src/main/kotlin/users/job/UserNicknameCreateJobConfig.kt
diff --git a/core/src/main/kotlin/evaluation/service/EvService.kt b/core/src/main/kotlin/evaluation/service/EvService.kt
@@ -41,7 +41,6 @@ class EvService(
         val result: MutableMap<String, Any?>? =
             snuttEvWebClient.method(method)
                 .uri { builder -> builder.path(requestPath).queryParams(requestQueryParams).build() }
-                .contentType(MediaType.APPLICATION_JSON)
                 .header("Snutt-User-Id", userId)
                 .header(HttpHeaders.CONTENT_ENCODING, "UTF-8")
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)

diff --git a/core/src/main/kotlin/friend/service/FriendService.kt b/core/src/main/kotlin/friend/service/FriendService.kt
@@ -133,7 +133,7 @@ class FriendServiceImpl(
         fromUser: User,
         toUserId: String,
     ) {
-        val fromUserNickname = userNicknameService.getNicknameDto(fromUser.nickname!!).nickname
+        val fromUserNickname = userNicknameService.getNicknameDto(fromUser.nickname).nickname
         val pushMessage =
             PushMessage(
                 title = "친구 요청",
@@ -164,7 +164,7 @@ class FriendServiceImpl(
         fromUserId: String,
         toUser: User,
     ) {
-        val toUserNickname = userNicknameService.getNicknameDto(toUser.nickname!!).nickname
+        val toUserNickname = userNicknameService.getNicknameDto(toUser.nickname).nickname
         val pushMessage =
             PushMessage(
                 title = "친구 요청 수락",