1.2.2

devmizz · web-flow · commit 6141af32b82a · 2025-11-16T12:50:02.000+09:00
diff --git a/src/main/kotlin/co/yappuworld/schedule/client/application/AdminAttendanceService.kt b/src/main/kotlin/co/yappuworld/schedule/client/application/AdminAttendanceService.kt
@@ -8,10 +8,11 @@ import co.yappuworld.schedule.client.dto.request.AdminSessionAttendanceUpdateReq
 import co.yappuworld.schedule.client.dto.response.AdminAttendanceCodeResponse
 import co.yappuworld.schedule.client.dto.response.AdminAttendancesResponse
 import co.yappuworld.schedule.domain.AttendanceBook
-import co.yappuworld.schedule.infrastructure.AttendanceCommandService
 import co.yappuworld.schedule.infrastructure.AttendanceFindService
+import co.yappuworld.schedule.infrastructure.LatePassCommandService
 import co.yappuworld.schedule.infrastructure.LatePassFindService
 import co.yappuworld.schedule.infrastructure.SessionFindService
+import co.yappuworld.schedule.infrastructure.entity.LatePassEntity
 import co.yappuworld.user.infrastructure.UserFindService
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -20,11 +21,11 @@ import java.time.LocalDateTime
 @Service
 class AdminAttendanceService(
     private val attendanceFindService: AttendanceFindService,
-    private val attendanceCommandService: AttendanceCommandService,
     private val userFindService: UserFindService,
     private val sessionFindService: SessionFindService,
     private val generationFindService: GenerationFindService,
     private val latePassFindService: LatePassFindService,
+    private val latePassCommandService: LatePassCommandService,
     private val configFindService: ConfigFindService
 ) {
 
@@ -45,14 +46,8 @@ class AdminAttendanceService(
 
     @Transactional
     fun updateAttendance(request: AdminAttendanceUpdateRequest) {
-        val attendanceBySessionAndUserId = attendanceFindService
-            .findAttendances(request.getSessionAndUserIdPairs())
-            .associateBy { it.session.id to it.userId }
-
-        request.targets.forEach { target ->
-            attendanceBySessionAndUserId[target.sessionId to target.userId]
-                ?.apply { updateStatus(target.attendanceStatus) }
-        }
+        updateAttendanceStatus(request)
+        updateLatePasses(request)
     }
 
     @Transactional
@@ -79,4 +74,30 @@ class AdminAttendanceService(
     fun deleteAttendanceCode() {
         configFindService.findAttendanceCode().reset()
     }
+
+    private fun updateAttendanceStatus(request: AdminAttendanceUpdateRequest) {
+        val attendanceBySessionAndUserId = attendanceFindService
+            .findAttendances(request.getSessionAndUserIdPairs())
+            .associateBy { it.session.id to it.userId }
+
+        request.attendances.forEach { request ->
+            attendanceBySessionAndUserId[request.sessionId to request.userId]
+                ?.apply { updateStatus(request.attendanceStatus) }
+        }
+    }
+
+    private fun updateLatePasses(request: AdminAttendanceUpdateRequest) {
+        val existingLatePasses = latePassFindService
+            .findLatePasses(request.generation, request.latePasses.map { it.userId })
+            .associateBy { it.userId }
+
+        val latePasses = request.latePasses.map { updateRequest ->
+            val latePass = existingLatePasses[updateRequest.userId]
+                ?: LatePassEntity(userId = updateRequest.userId, generation = request.generation)
+
+            latePass.apply { updateCount(updateRequest.latePassCount) }
+        }
+
+        latePassCommandService.saveAll(latePasses)
+    }
 }
diff --git a/src/main/kotlin/co/yappuworld/schedule/client/dto/request/AdminAttendanceUpdateRequest.kt b/src/main/kotlin/co/yappuworld/schedule/client/dto/request/AdminAttendanceUpdateRequest.kt
@@ -6,22 +6,30 @@ import io.swagger.v3.oas.annotations.media.Schema
 import java.util.UUID
 
 data class AdminAttendanceUpdateRequest(
-    @Schema(description = "업데이트 목록")
-    val targets: List<AdminAttendanceUpdateTargetRequest>
+    @param:Schema(description = "기수")
+    val generation: Int,
+    @param:Schema(description = "업데이트 목록")
+    val attendances: List<AdminAttendanceUpdateTargetRequest>,
+    @param:Schema(description = "지각 면제권 업데이트 목록")
+    val latePasses: List<AdminLatePassUpdateTargetRequest>
 ) {
 
     @JsonIgnore
-    val size = targets.size
-
-    @JsonIgnore
-    fun getSessionAndUserIdPairs(): List<Pair<UUID, UUID>> = targets.map { it.sessionId to it.userId }
+    fun getSessionAndUserIdPairs(): List<Pair<UUID, UUID>> = attendances.map { it.sessionId to it.userId }
 }
 
 data class AdminAttendanceUpdateTargetRequest(
-    @Schema(description = "유저 ID")
+    @param:Schema(description = "유저 ID")
     val userId: UUID,
-    @Schema(description = "세션 ID")
+    @param:Schema(description = "세션 ID")
     val sessionId: UUID,
-    @Schema(description = "업데이트 상태")
+    @param:Schema(description = "업데이트 상태")
     val attendanceStatus: AttendanceStatus
 )
+
+data class AdminLatePassUpdateTargetRequest(
+    @param:Schema(description = "유저 ID")
+    val userId: UUID,
+    @param:Schema(description = "지각 면제권 개수")
+    val latePassCount: Int
+)
diff --git a/src/main/kotlin/co/yappuworld/schedule/domain/AttendanceBook.kt b/src/main/kotlin/co/yappuworld/schedule/domain/AttendanceBook.kt
@@ -67,9 +67,7 @@ class AttendanceBook(
         attendees = attendees,
         sessions = sessions,
         attendances = attendances,
-        latePassCountByUserId = latePasses
-            .groupBy { it.userId }
-            .mapValues { (_, latePasses) -> latePasses.size },
+        latePassCountByUserId = latePasses.associate { it.userId to it.count },
         now = now
     )
 
diff --git a/src/main/kotlin/co/yappuworld/schedule/infrastructure/LatePassCommandService.kt b/src/main/kotlin/co/yappuworld/schedule/infrastructure/LatePassCommandService.kt
@@ -0,0 +1,16 @@
+package co.yappuworld.schedule.infrastructure
+
+import co.yappuworld.schedule.infrastructure.entity.LatePassEntity
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+@Transactional
+class LatePassCommandService(
+    private val latePassRepository: LatePassRepository
+) {
+
+    fun saveAll(latePassEntities: List<LatePassEntity>) {
+        latePassRepository.saveAll(latePassEntities)
+    }
+}
diff --git a/src/main/kotlin/co/yappuworld/schedule/infrastructure/LatePassFindService.kt b/src/main/kotlin/co/yappuworld/schedule/infrastructure/LatePassFindService.kt
@@ -14,7 +14,12 @@ class LatePassFindService(
     fun countLatePasses(
         generation: Int,
         userId: UUID
-    ): Int = latePassRepository.countAllByGenerationAndUserId(generation, userId)
+    ): Int = latePassRepository.findByGenerationAndUserId(generation, userId)?.count ?: 0
 
     fun findLatePasses(generation: Int): List<LatePassEntity> = latePassRepository.findAllByGeneration(generation)
+
+    fun findLatePasses(
+        generation: Int,
+        userIds: List<UUID>
+    ): List<LatePassEntity> = latePassRepository.findAllByGenerationAndUserIdIn(generation, userIds)
 }
diff --git a/src/main/kotlin/co/yappuworld/schedule/infrastructure/LatePassRepository.kt b/src/main/kotlin/co/yappuworld/schedule/infrastructure/LatePassRepository.kt
@@ -6,10 +6,15 @@ import java.util.UUID
 
 interface LatePassRepository : JpaRepository<LatePassEntity, Long> {
 
-    fun countAllByGenerationAndUserId(
+    fun findByGenerationAndUserId(
         generation: Int,
         userId: UUID
-    ): Int
+    ): LatePassEntity?
 
     fun findAllByGeneration(generation: Int): List<LatePassEntity>
+
+    fun findAllByGenerationAndUserIdIn(
+        generation: Int,
+        userIds: Collection<UUID>
+    ): List<LatePassEntity>
 }
diff --git a/src/main/kotlin/co/yappuworld/schedule/infrastructure/entity/LatePassEntity.kt b/src/main/kotlin/co/yappuworld/schedule/infrastructure/entity/LatePassEntity.kt
@@ -10,10 +10,14 @@ import java.util.UUID
 @Table(name = "late_passes")
 class LatePassEntity(
     val userId: UUID,
-    val generation: Int,
-    reason: String? = null
+    val generation: Int
 ) : BaseEntity() {
 
-    @Column(name = "reason")
-    val reason: String? = reason
+    @Column(name = "count", nullable = false)
+    var count: Int = 0
+        private set
+
+    fun updateCount(latePassCount: Int) {
+        this.count = latePassCount
+    }
 }
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -137,5 +137,5 @@ create table late_passes
     updated_at datetime(6),
     user_id    binary(16) NOT NULL,
     generation int NOT NULL,
-    reason     varchar(128)
+    count      int NOT NULL DEFAULT 0
 );
diff --git a/src/test/kotlin/co/yappuworld/schedule/domain/AttendanceBookTest.kt b/src/test/kotlin/co/yappuworld/schedule/domain/AttendanceBookTest.kt
@@ -77,12 +77,10 @@ class AttendanceBookTest :
                     status = AttendanceStatus.PENDING
                 )
             )
-            val latePassEntities = listOf(
-                LatePassEntity(
-                    userId = users[0].userId,
-                    generation = generation
-                )
-            )
+            val latePassEntity = LatePassEntity(
+                userId = users[0].userId,
+                generation = generation
+            ).apply { updateCount(1) }
 
             scenario("AttendanceBook을 생성한다.") {
                 shouldNotThrowAny {
@@ -91,7 +89,7 @@ class AttendanceBookTest :
                         attendees = users.map { getAttendeeFixture(it, generation) },
                         sessions = sessions,
                         attendances = attendances,
-                        latePasses = latePassEntities,
+                        latePasses = listOf(latePassEntity),
                         now = now
                     )
                 }
@@ -103,7 +101,7 @@ class AttendanceBookTest :
                     attendees = users.map { getAttendeeFixture(it, generation) },
                     sessions = sessions,
                     attendances = attendances,
-                    latePasses = latePassEntities,
+                    latePasses = listOf(latePassEntity),
                     now = now
                 )
 
@@ -153,7 +151,7 @@ class AttendanceBookTest :
                     attendees = users.map { getAttendeeFixture(it, generation) },
                     sessions = sessions,
                     attendances = attendances,
-                    latePasses = latePassEntities,
+                    latePasses = listOf(latePassEntity),
                     now = now
                 )
 
@@ -195,11 +193,7 @@ class AttendanceBookTest :
                         LatePassEntity(
                             userId = users[0].userId,
                             generation = generation
-                        ),
-                        LatePassEntity(
-                            userId = users[0].userId,
-                            generation = generation
-                        )
+                        ).apply { updateCount(2) }
                     ),
                     now = now
                 )
@@ -213,7 +207,7 @@ class AttendanceBookTest :
                     attendees = users.map { getAttendeeFixture(it, generation) },
                     sessions = sessions,
                     attendances = attendances,
-                    latePasses = latePassEntities,
+                    latePasses = listOf(latePassEntity),
                     now = now
                 )
 
