Merge branch 'develop'

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

@@ -46,8 +46,8 @@ jobs:
                       JWT_REFRESH_EXP=36000000
                       JWT_HEADER=Authorization
                       JWT_PREFIX=Bearer
-                      DB_URL=${{ secrets.DB_URL }}
-                      DB_USERNAME=${{ secrets.STAG_DB_USERNAME }}
+                      DB_URL=${{ secrets.STAG_DB_URL }}
+                      DB_USERNAME=${{ secrets.DB_USERNAME }}
                       DB_PASSWORD=${{ secrets.DB_PASSWORD }}
                       REDIS_HOST=${{ secrets.REDIS_HOST }}
                       REDIS_PORT=${{ secrets.REDIS_PORT }}

src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt

@@ -23,6 +23,8 @@ class AttendancePersistenceAdapter(
     override fun findByUserId(userId: UUID) =
         attendanceJpaRepository.findByUserId(userId).let { attendanceMapper.toDomain(it) }
 
+    override fun findAll() = attendanceJpaRepository.findAll().map { attendanceMapper.toDomain(it) }
+
     override fun findByGradeAndClassNum(
         grade: Int,
         classNum: Int

src/main/kotlin/dsm/pick2024/domain/attendance/persistence/repository/AttendanceRepository.kt

@@ -8,4 +8,6 @@ interface AttendanceRepository : Repository<AttendanceJpaEntity, UUID> {
     fun saveAll(entity: Iterable<AttendanceJpaEntity>)
 
     fun findByUserId(userId: UUID): AttendanceJpaEntity
+
+    fun findAll(): List<AttendanceJpaEntity>
 }

src/main/kotlin/dsm/pick2024/domain/attendance/port/in/ResetAttendanceUseCase.kt

@@ -0,0 +1,5 @@
+package dsm.pick2024.domain.attendance.port.`in`
+
+interface ResetAttendanceUseCase {
+    fun reset()
+}

src/main/kotlin/dsm/pick2024/domain/attendance/port/out/AttendancePort.kt

@@ -4,4 +4,5 @@ interface AttendancePort :
     SaveAll,
     FindByUserIdPort,
     QueryClassAttendancePort,
-    QueryClubAttendancePort
+    QueryClubAttendancePort,
+    FindAllAttendancePort

src/main/kotlin/dsm/pick2024/domain/attendance/port/out/FindAllAttendancePort.kt

@@ -0,0 +1,7 @@
+package dsm.pick2024.domain.attendance.port.out
+
+import dsm.pick2024.domain.attendance.domain.Attendance
+
+interface FindAllAttendancePort {
+    fun findAll(): List<Attendance>
+}

src/main/kotlin/dsm/pick2024/domain/attendance/service/ResetAttendanceService.kt

@@ -0,0 +1,39 @@
+package dsm.pick2024.domain.attendance.service
+
+import dsm.pick2024.domain.afterschool.enums.Status
+import dsm.pick2024.domain.attendance.domain.Attendance
+import dsm.pick2024.domain.attendance.port.`in`.ResetAttendanceUseCase
+import dsm.pick2024.domain.attendance.port.out.FindAllAttendancePort
+import dsm.pick2024.domain.attendance.port.out.SaveAll
+import org.springframework.stereotype.Service
+
+@Service
+class ResetAttendanceService(
+    private val findAllAttendancePort: FindAllAttendancePort,
+    private val saveAll: SaveAll
+) : ResetAttendanceUseCase {
+    override fun reset() {
+        val allStudent = findAllAttendancePort.findAll()
+        val update = mutableListOf<Attendance>()
+
+        allStudent.map { attendance ->
+            val updatedAttendance =
+                attendance.copy(
+                    period6 = getStatus(attendance.period6),
+                    period7 = getStatus(attendance.period7),
+                    period8 = getStatus(attendance.period8),
+                    period9 = getStatus(attendance.period9),
+                    period10 = getStatus(attendance.period10)
+                )
+            update.add(updatedAttendance)
+        }
+
+        saveAll.saveAll(update)
+    }
+
+    private fun getStatus(currentStatus: Status) =
+        when (currentStatus) {
+            Status.PICNIC, Status.EMPLOYMENT -> currentStatus
+            else -> Status.ATTENDANCE
+        }
+}

src/main/kotlin/dsm/pick2024/infrastructure/schedule/ScheduleService.kt

@@ -1,6 +1,7 @@
 package dsm.pick2024.infrastructure.schedule
 
 import dsm.pick2024.domain.application.port.out.DeleteAllApplicationPort
+import dsm.pick2024.domain.attendance.port.`in`.ResetAttendanceUseCase
 import dsm.pick2024.domain.classroom.port.out.DeleteAllClassRoomPort
 import dsm.pick2024.domain.earlyreturn.port.out.DeleteAllEarlyReturnPort
 import dsm.pick2024.domain.meal.port.`in`.MealUseCase
@@ -12,7 +13,8 @@ class ScheduleService(
     private val deleteAllClassRoomPort: DeleteAllClassRoomPort,
     private val deleteAllEarlyReturnPort: DeleteAllEarlyReturnPort,
     private val deleteAllApplicationPort: DeleteAllApplicationPort,
-    private val mealUseCase: MealUseCase
+    private val mealUseCase: MealUseCase,
+    private val resetAttendanceUseCase: ResetAttendanceUseCase
 ) {
     @Scheduled(cron = "0 30 20 * * ?", zone = "Asia/Seoul")
     fun deleteTable() {
@@ -25,4 +27,9 @@ class ScheduleService(
     fun mealSave() {
         mealUseCase.saveNeisInfoToDatabase()
     }
+
+    @Scheduled(cron = "0 00 21 * * ?", zone = "Asia/Seoul")
+    fun resetTable() {
+        resetAttendanceUseCase.reset()
+    }
 }