Merge pull request #415 from DSM-PICK/develop

Merge branch 'develop' to main

Author: meltapplee

.github/workflows/git-action-stag.yml

@@ -42,7 +42,7 @@ jobs:
                   buildargs: |
                       PROFILE=stag
                       JWT_SECRET_KEY=pickpickpickpickpickpickpickpick
-                      JWT_ACCESS_EXP=36000
+                      JWT_ACCESS_EXP=9999999
                       JWT_REFRESH_EXP=36000000
                       JWT_HEADER=Authorization
                       JWT_PREFIX=Bearer

src/main/kotlin/dsm/pick2024/domain/application/service/QueryClassApplicationService.kt

@@ -28,7 +28,7 @@ class QueryClassApplicationService(
                 .map { QueryApplicationResponse(it) }
         }
 
-        return applications.sortedWith(
+        return applications.distinctBy { it.id }.sortedWith(
             compareBy({ it.grade }, { it.classNum }, { it.num })
         )
     }

src/main/kotlin/dsm/pick2024/domain/application/service/QueryFloorApplicationService.kt

@@ -30,7 +30,7 @@ class QueryFloorApplicationService(
             else -> throw FloorNotFoundException
         }
 
-        return applications.map { QueryApplicationResponse(it) }.sortedWith(
+        return applications.map { QueryApplicationResponse(it) }.distinctBy { it.id }.sortedWith(
             compareBy({ it.grade }, { it.classNum }, { it.num })
         )
     }

src/main/kotlin/dsm/pick2024/domain/bug/domain/Model.kt

@@ -1,5 +1,5 @@
 package dsm.pick2024.domain.bug.domain
 
 enum class Model {
-    WEB, ANDROID, IOS
+    WEB, ANDROID, IOS, TEACHER
 }

src/main/kotlin/dsm/pick2024/domain/status/service/ChangeStatusService.kt

@@ -35,7 +35,7 @@ class ChangeStatusService(
             )
             updateStatuses.add(updatedStatus)
 
-            if (requests.statusType in setOf(EMPLOYMENT, PICNIC, ATTENDANCE, DROPOUT)) {
+            if (requests.statusType in setOf(EMPLOYMENT, PICNIC, ATTENDANCE, DROPOUT, GO_HOME)) {
                 val attendance = queryAttendancePort.findByUserId(requests.userId)
                     ?: throw UserNotFoundException
 
@@ -58,6 +58,7 @@ class ChangeStatusService(
             PICNIC -> AttendanceStatus.PICNIC
             DROPOUT -> AttendanceStatus.DROPOUT
             EMPLOYMENT -> AttendanceStatus.EMPLOYMENT
+            GO_HOME -> AttendanceStatus.GO_HOME
             else -> AttendanceStatus.ATTENDANCE
         }
     }

src/main/kotlin/dsm/pick2024/domain/timetable/service/QueryTimetableService.kt

@@ -17,7 +17,6 @@ class QueryTimetableService(
     private val userFacadeUseCase: UserFacadeUseCase,
     private val fileUtil: FileUtil
 ) : QueryDayTimetableUseCase {
-    // @Cacheable(value = ["dayTimetableCache"], key = "#root.methodName")
     @Transactional(readOnly = true)
     override fun queryDayTimetable(): DayTimetableResponse {
         val user = userFacadeUseCase.currentUser()

src/main/kotlin/dsm/pick2024/domain/timetable/service/SaveTimetableService.kt

@@ -38,20 +38,24 @@ class SaveTimetableService(
     }
 
     private fun updatedSubjectName(subjectName: String): String {
-        val cleanName = subjectName.replace(Regex("[\\[\\(].*?[\\]\\)]"), "")
+        val cleanName = subjectName.replace(Regex("[\\[\\(].*?[\\]\\)]|\\d|공통"), "")
 
         return when (cleanName) {
             "* 데이터베이스 구현", "* SQL활용" -> "DB 프로그래밍"
             "* 응용SW 변경관리" -> "응용SW 변경관리"
             "* 응용SW 운영관리" -> "디지털 포렌식"
+            "* 응용SW 기초 기술 활용" -> "응용 소프트웨어 기초"
             "* 정보통신기기 PCB보드 개발" -> "정보통신기기 PCB보드 개발"
             "* 정보통신기기 펌웨어구현" -> "정보통신기기 펌웨어구현"
-            "* 빅데이터 분석 결과 시각화", "빅데이터 분석 결과 시각화" -> "빅데이터 분석"
+            "* 빅데이터 분석 결과 시각화", "빅데이터 분석 결과 시각화", "* 분석 데이터 전처리" -> "빅데이터 분석"
             "* 시스템 유지보수관리" -> "시스템 유지보수관리"
             "* 시스템 점검관리" -> "시스템 점검관리"
-            "자율활동", "동아리활동" -> "창체"
+            "자율활동", "동아리활동", "자율·자치활동" -> "창체"
             "자료구조와 알고리즘" -> "자료구조"
             "미술 창작" -> "미술"
+            "* 화면 구현" -> "화면디자인"
+            "서버 구축 및 운영" -> "서버 프로그래밍 실무"
+            "머신러닝 딥러닝" -> "빅데이터 실무"
             else -> cleanName
         }
     }

src/main/kotlin/dsm/pick2024/global/annotation/Aggregate.kt

@@ -1,7 +1,5 @@
 package dsm.pick2024.global.annotation
 
-// domain의 일관성을 기준이 되는 Aggregate를 명시하는 어노테이션
-
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.CLASS)
 annotation class Aggregate()