Merge pull request #642 from DSM-PICK/develop

ByunDohwi · web-flow · commit 72a560a38705 · 2026-01-27T10:54:05.000+09:00
develop merge into main
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/exception/InvalidApplicationKindException.kt b/src/main/kotlin/dsm/pick2024/domain/application/exception/InvalidApplicationKindException.kt
@@ -0,0 +1,8 @@
+package dsm.pick2024.domain.application.exception
+
+import dsm.pick2024.global.error.exception.ErrorCode
+import dsm.pick2024.global.error.exception.PickException
+
+object InvalidApplicationKindException : PickException(
+    ErrorCode.INVALID_APPLICATION_KIND
+)
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/ApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/ApplicationService.kt
@@ -9,6 +9,7 @@ import dsm.pick2024.domain.application.port.`in`.ApplicationUseCase
 import dsm.pick2024.domain.application.port.out.ExistsApplicationPort
 import dsm.pick2024.domain.application.port.out.SaveApplicationPort
 import dsm.pick2024.domain.application.presentation.dto.request.ApplicationRequest
+import dsm.pick2024.domain.attendance.domain.service.AttendanceService
 import dsm.pick2024.domain.fcm.dto.request.FcmRequest
 import dsm.pick2024.domain.main.port.`in`.MainUseCase
 import dsm.pick2024.domain.outbox.domain.Outbox
@@ -27,7 +28,8 @@ class ApplicationService(
     private val userFacadeUseCase: UserFacadeUseCase,
     private val adminFinderUseCase: AdminFinderUseCase,
     private val saveOutboxPort: SaveOutboxPort,
-    private val mainUseCase: MainUseCase
+    private val mainUseCase: MainUseCase,
+    private val attendanceService: AttendanceService
 ) : ApplicationUseCase {
 
     @Transactional
@@ -37,6 +39,12 @@ class ApplicationService(
             throw AlreadyApplyingForPicnicException
         }
 
+        attendanceService.checkApplicationTime(
+            applicationType = request.applicationType,
+            start = request.start,
+            end = request.end
+        )
+
         saveApplicationPort.save(
             Application(
                 userName = user.name,
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/ChangeApplicationStatusService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/ChangeApplicationStatusService.kt
@@ -1,7 +1,9 @@
 package dsm.pick2024.domain.application.service
 
 import dsm.pick2024.domain.admin.port.`in`.AdminFacadeUseCase
+import dsm.pick2024.domain.application.enums.ApplicationKind
 import dsm.pick2024.domain.application.enums.Status
+import dsm.pick2024.domain.application.exception.InvalidApplicationKindException
 import dsm.pick2024.domain.application.exception.AlreadyApplyingForPicnicException
 import dsm.pick2024.domain.application.port.`in`.ApplicationFinderUseCase
 import dsm.pick2024.domain.application.port.`in`.ChangeApplicationStatusUseCase
@@ -26,7 +28,12 @@ class ChangeApplicationStatusService(
         val admin = adminFacadeUseCase.currentAdmin()
         val applications = request.idList.map { applicationFinderUseCase.findByIdOrThrow(it) }
         applications.forEach {
-            if (it.status != Status.QUIET) throw AlreadyApplyingForPicnicException
+            if (it.applicationKind != ApplicationKind.APPLICATION) {
+                throw InvalidApplicationKindException
+            }
+            if (it.status != Status.QUIET) {
+                throw AlreadyApplyingForPicnicException
+            }
         }
         val deviceTokens = applications.mapNotNull {
             userFacadeUseCase.getUserById(
diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/domain/service/AttendanceService.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/domain/service/AttendanceService.kt
@@ -3,6 +3,7 @@ package dsm.pick2024.domain.attendance.domain.service
 import dsm.pick2024.domain.application.enums.ApplicationType
 import dsm.pick2024.domain.attendance.domain.Attendance
 import dsm.pick2024.domain.attendance.enums.AttendanceStatus
+import dsm.pick2024.domain.attendance.exception.InvalidPeriodException
 import org.springframework.stereotype.Component
 import java.time.LocalTime
 
@@ -14,7 +15,7 @@ class AttendanceService {
             LocalTime.of(8, 40) to LocalTime.of(9, 40), // 1교시
             LocalTime.of(9, 40) to LocalTime.of(10, 40), // 2교시
             LocalTime.of(10, 40) to LocalTime.of(11, 40), // 3교시
-            LocalTime.of(12, 40) to LocalTime.of(13, 30), // 4교시
+            LocalTime.of(11, 40) to LocalTime.of(13, 30), // 4교시
             LocalTime.of(13, 30) to LocalTime.of(14, 40), // 5교시
             LocalTime.of(14, 30) to LocalTime.of(15, 30), // 6교시
             LocalTime.of(15, 30) to LocalTime.of(16, 30), // 7교시
@@ -29,17 +30,70 @@ class AttendanceService {
     }
 
     // 교시 혹은 시간을 기반으로 교시 목록을 반환하는 함수
-    fun translateApplication(start: String, end: String?, applicationType: ApplicationType): List<String> {
+    fun translateApplication(start: String, end: String, applicationType: ApplicationType): Pair<String, String> {
         return when (applicationType) {
-            ApplicationType.PERIOD -> listOf(start, end!!)
+            ApplicationType.PERIOD -> Pair(start, end)
             ApplicationType.TIME -> {
                 val startTime = LocalTime.parse(start)
-                val endTime = end?.let { LocalTime.parse(it) }
+                val endTime = LocalTime.parse(end)
                 getMatchPeriods(startTime, endTime)
             }
         }
     }
 
+    fun checkApplicationTime(applicationType: ApplicationType, start: String, end: String) {
+        when (applicationType) {
+            ApplicationType.TIME -> {
+                val startTime = LocalTime.parse(start)
+                val endTime = LocalTime.parse(end)
+                if (startTime > endTime ||
+                    endTime > LocalTime.of(20, 30) ||
+                    startTime < LocalTime.of(8, 30)
+                ) {
+                    throw InvalidPeriodException
+                }
+            }
+            ApplicationType.PERIOD -> {
+                val startPeriod = start.replace("교시", "").toIntOrNull() ?: throw InvalidPeriodException
+                val endPeriod = end.replace("교시", "").toIntOrNull() ?: throw InvalidPeriodException
+                if (startPeriod > endPeriod || startPeriod < 1 || endPeriod > 10) {
+                    throw InvalidPeriodException
+                }
+            }
+        }
+    }
+
+    fun checkEarlyReturnTime(applicationType: ApplicationType, start: String) {
+        when (applicationType) {
+            ApplicationType.TIME -> {
+                val startTime = LocalTime.parse(start)
+                if (startTime < LocalTime.of(8, 30)) {
+                    throw InvalidPeriodException
+                }
+            }
+            ApplicationType.PERIOD -> {
+                val startPeriod = start.replace("교시", "").toInt()
+                if (startPeriod < 1 || startPeriod > 10) {
+                    throw InvalidPeriodException
+                }
+            }
+        }
+    }
+
+    fun translateEarlyReturn(start: String, applicationType: ApplicationType): String {
+        return when (applicationType) {
+            ApplicationType.PERIOD -> start
+            ApplicationType.TIME -> {
+                val startTime = LocalTime.parse(start)
+                val startIndex = periods.indexOfFirst { (start, endAt) ->
+                    startTime >= start && startTime < endAt
+                }
+                if (startIndex == -1) throw InvalidPeriodException
+                periodNames[startIndex]
+            }
+        }
+    }
+
     // 주어진 교시 혹은 시간에 해당하는 출석 상태를 업데이트하는 함수
     fun updateAttendanceToApplication(
         start: String,
@@ -86,10 +140,19 @@ class AttendanceService {
 
     fun updateAttendanceToEarlyReturn(
         start: String,
+        applicationType: ApplicationType,
         attendance: Attendance
     ): Attendance {
-        val startTime = LocalTime.parse(start)
-        val list = periods.filter { it.first.isAfter(startTime) || it.first == startTime }
+        val list = when (applicationType) {
+            ApplicationType.PERIOD -> {
+                val startIndex = periodNames.indexOf(start).coerceAtLeast(0)
+                periods.subList(startIndex, periods.size)
+            }
+            ApplicationType.TIME -> {
+                val startTime = LocalTime.parse(start)
+                periods.filter { startTime < it.second }
+            }
+        }
         var updateAttendance = attendance
         list.forEach { period ->
             updateAttendance = when (period) {
@@ -104,14 +167,16 @@ class AttendanceService {
         return updateAttendance
     }
 
-    private fun getMatchPeriods(startTime: LocalTime, endTime: LocalTime?): List<String> {
-        return periods
-            .mapIndexed { index, period ->
-                if ((startTime < period.second) && (endTime == null || endTime > period.first)) {
-                    periodNames[index]
-                } else {
-                    null
-                }
-            }.filterNotNull()
+    private fun getMatchPeriods(startTime: LocalTime, endTime: LocalTime): Pair<String, String> {
+        val startIndex = periods.indexOfFirst { (start, endAt) ->
+            startTime in start..endAt
+        }
+        val endIndex = periods.indexOfFirst { (start, endAt) ->
+            endTime in start..endAt
+        }
+
+        if (startIndex == -1 || endIndex == -1) throw InvalidPeriodException
+
+        return periodNames[startIndex] to periodNames[endIndex]
     }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/earlyreturn/presentation/dto/request/CreateEarlyReturnRequest.kt b/src/main/kotlin/dsm/pick2024/domain/earlyreturn/presentation/dto/request/CreateEarlyReturnRequest.kt
@@ -1,9 +1,11 @@
 package dsm.pick2024.domain.earlyreturn.presentation.dto.request
 
+import dsm.pick2024.domain.application.enums.ApplicationType
 import dsm.pick2024.global.annotation.ValidFormat
 
 @ValidFormat
 data class CreateEarlyReturnRequest(
     val reason: String,
-    val start: String
+    val start: String,
+    val applicationType: ApplicationType
 )
diff --git a/src/main/kotlin/dsm/pick2024/domain/earlyreturn/service/CreateEarlyReturnService.kt b/src/main/kotlin/dsm/pick2024/domain/earlyreturn/service/CreateEarlyReturnService.kt
@@ -3,10 +3,10 @@ package dsm.pick2024.domain.earlyreturn.service
 import dsm.pick2024.domain.admin.port.`in`.AdminFinderUseCase
 import dsm.pick2024.domain.application.domain.Application
 import dsm.pick2024.domain.application.enums.ApplicationKind
-import dsm.pick2024.domain.application.enums.ApplicationType
 import dsm.pick2024.domain.application.enums.Status
 import dsm.pick2024.domain.application.port.out.ExistsApplicationPort
 import dsm.pick2024.domain.application.port.out.SaveApplicationPort
+import dsm.pick2024.domain.attendance.domain.service.AttendanceService
 import dsm.pick2024.domain.earlyreturn.exception.AlreadyApplyingForEarlyReturnException
 import dsm.pick2024.domain.earlyreturn.port.`in`.CreateEarlyReturnUseCase
 import dsm.pick2024.domain.earlyreturn.presentation.dto.request.CreateEarlyReturnRequest
@@ -25,7 +25,8 @@ class CreateEarlyReturnService(
     private val userFacadeUseCase: UserFacadeUseCase,
     private val adminFinderUseCase: AdminFinderUseCase,
     private val outboxFacadeUseCase: OutboxFacadeUseCase,
-    private val mainUseCase: MainUseCase
+    private val mainUseCase: MainUseCase,
+    private val attendanceService: AttendanceService
 ) : CreateEarlyReturnUseCase {
     @Transactional
     override fun createEarlyReturn(request: CreateEarlyReturnRequest) {
@@ -35,6 +36,8 @@ class CreateEarlyReturnService(
             throw AlreadyApplyingForEarlyReturnException
         }
 
+        attendanceService.checkEarlyReturnTime(request.applicationType, request.start)
+
         saveApplicationPort.save(
             Application(
                 userName = user.name,
@@ -46,7 +49,7 @@ class CreateEarlyReturnService(
                 classNum = user.classNum,
                 num = user.num,
                 userId = user.id,
-                applicationType = ApplicationType.TIME,
+                applicationType = request.applicationType,
                 applicationKind = ApplicationKind.EARLY_RETURN
             )
         )
diff --git a/src/main/kotlin/dsm/pick2024/domain/earlyreturn/service/processor/EarlyReturnApprovalProcessor.kt b/src/main/kotlin/dsm/pick2024/domain/earlyreturn/service/processor/EarlyReturnApprovalProcessor.kt
@@ -1,7 +1,6 @@
 package dsm.pick2024.domain.earlyreturn.service.processor
 
 import dsm.pick2024.domain.application.domain.Application
-import dsm.pick2024.domain.application.enums.ApplicationType
 import dsm.pick2024.domain.application.enums.Status
 import dsm.pick2024.domain.application.port.out.SaveApplicationPort
 import dsm.pick2024.domain.applicationstory.domain.ApplicationStory
@@ -37,7 +36,7 @@ class EarlyReturnApprovalProcessor(
 
         val attendances = updateEarlyReturnList.map {
             val attendanceId = attendanceFinderUseCase.findByUserIdOrThrow(it.userId)
-            attendanceService.updateAttendanceToEarlyReturn(it.start, attendanceId)
+            attendanceService.updateAttendanceToEarlyReturn(it.start, it.applicationType, attendanceId)
         }.toMutableList()
 
         saveApplicationPort.saveAll(updateEarlyReturnList)
@@ -50,11 +49,11 @@ class EarlyReturnApprovalProcessor(
     }
 
     private fun createApplicationStory(application: Application): ApplicationStory {
-        val start = attendanceService.translateApplication(application.start, null, ApplicationType.TIME)
+        val start = attendanceService.translateEarlyReturn(application.start, application.applicationType)
         return ApplicationStory(
             reason = application.reason,
             userName = application.userName,
-            start = start.first(),
+            start = start,
             date = application.date,
             type = Type.EARLY_RETURN,
             userId = application.userId
diff --git a/src/main/kotlin/dsm/pick2024/global/annotation/common/FormatValidator.kt b/src/main/kotlin/dsm/pick2024/global/annotation/common/FormatValidator.kt
@@ -28,7 +28,11 @@ class FormatValidator : ConstraintValidator<ValidFormat, Any> {
     }
 
     private fun validateCreateEarlyReturnRequest(request: CreateEarlyReturnRequest): Boolean {
-        return isValidTimeFormat(request.start)
+        return if (request.applicationType == ApplicationType.PERIOD) {
+            isValidPeriodFormat(request.start)
+        } else {
+            isValidTimeFormat(request.start)
+        }
     }
 
     private fun isValidPeriodFormat(period: String): Boolean {
diff --git a/src/main/kotlin/dsm/pick2024/global/config/async/AsyncConfig.kt b/src/main/kotlin/dsm/pick2024/global/config/async/AsyncConfig.kt
@@ -24,7 +24,6 @@ import java.util.concurrent.RejectedExecutionException
  * - 최대 5회 재시도
  * - 지수 백오프 (2초 → 4초 → 8초 → 16초 → 30초)
  */
-
 @Configuration
 @EnableAsync
 @EnableRetry
diff --git a/src/main/kotlin/dsm/pick2024/global/config/debezium/DebeziumProperties.kt b/src/main/kotlin/dsm/pick2024/global/config/debezium/DebeziumProperties.kt
@@ -15,7 +15,8 @@ data class DebeziumProperties(
     data class ConnectorConfig(
         val name: String,
         val connectorClass: String = "io.debezium.connector.mysql.MySqlConnector",
-        val tasksMax: Int = 1
+        val tasksMax: Int = 1,
+        val timePrecisionMode: String = "connect"
     )
 
     data class DatabaseConfig(
@@ -25,7 +26,8 @@ data class DebeziumProperties(
         val password: String,
         val serverId: String,
         val serverName: String,
-        val includeList: String
+        val includeList: String,
+        val serverTimeZone: String = "Asia/Seoul"
     )
 
     data class SchemaConfig(
@@ -52,6 +54,9 @@ data class DebeziumProperties(
             "connector.class" to connector.connectorClass,
             "tasks.max" to connector.tasksMax.toString(),
 
+            "time.precision.mode" to connector.timePrecisionMode,
+
+            "database.server.timezone" to database.serverTimeZone,
             "database.hostname" to database.hostname,
             "database.port" to database.port.toString(),
             "database.user" to database.user,
diff --git a/src/main/kotlin/dsm/pick2024/global/error/exception/ErrorCode.kt b/src/main/kotlin/dsm/pick2024/global/error/exception/ErrorCode.kt
@@ -31,6 +31,7 @@ enum class ErrorCode(
     SELF_STUDY_NOT_FOUND(404, "자습 정보를 찾을 수 없습니다"),
     EARLY_RETURN_NOT_FOUND(404, "조기 귀가 신청을 찾을 수 없습니다"),
     APPLICATION_NOT_FOUND(404, "신청서를 찾을 수 없습니다"),
+    INVALID_APPLICATION_KIND(404, "유효하지 않은 신청 종류입니다"),
     STATUS_NOT_FOUND(404, "상태를 찾을 수 없습니다"),
     CLASSROOM_NOT_FOUND(404, "교실을 찾을 수 없습니다"),
     WEEKEND_MEAL_NOT_FOUND(404, "존재하지 않는 주말 급식입니다."),
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -22,6 +22,7 @@ spring:
 
     jackson:
         property-naming-strategy : SNAKE_CASE
+        time-zone: Asia/Seoul
 
     cache:
         type: simple
@@ -123,8 +124,10 @@ debezium:
 
     connector:
         name: ${DEBEZIUM_CONNECTOR_NAME}
+        time-precision-mode: "connect"
 
     database:
+        server-timezone: "Asia/Seoul"
         hostname: ${DEBEZIUM_DATABASE_HOSTNAME}
         port: ${DEBEZIUM_DATABASE_PORT}
         user: ${DEBEZIUM_DATABASE_USER}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,11 @@ class FormatValidator : ConstraintValidator<ValidFormat, Any> {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private fun validateCreateEarlyReturnRequest(request: CreateEarlyReturnRequest): Boolean {`
`31`		`- return isValidTimeFormat(request.start)`
	`31`	`+ return if (request.applicationType == ApplicationType.PERIOD) {`
	`32`	`+ isValidPeriodFormat(request.start)`
	`33`	`+ } else {`
	`34`	`+ isValidTimeFormat(request.start)`
	`35`	`+ }`
`32`	`36`	`}`
`33`	`37`
`34`	`38`	`private fun isValidPeriodFormat(period: String): Boolean {`