Merge pull request #427 from DSM-PICK/426-복귀-교사-관리-기능-개발

ByunDohwi · web-flow · commit 6570bf494ee5 · 2025-04-11T08:34:54.000+09:00
(#426) 복귀 교사 관리 기능 개발
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/port/in/UpdateReturnTeacherUseCase.kt b/src/main/kotlin/dsm/pick2024/domain/application/port/in/UpdateReturnTeacherUseCase.kt
@@ -0,0 +1,7 @@
+package dsm.pick2024.domain.application.port.`in`
+
+import java.util.UUID
+
+interface UpdateReturnTeacherUseCase {
+    fun updateReturnTeacher(userId: UUID)
+}
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.out.ExistsApplicationPort
 import dsm.pick2024.domain.application.port.out.SaveApplicationPort
 import dsm.pick2024.domain.application.presentation.dto.request.ApplicationRequest
 import dsm.pick2024.domain.event.dto.UserInfoRequest
+import dsm.pick2024.domain.event.enums.EventTopic
 import dsm.pick2024.domain.user.port.`in`.UserFacadeUseCase
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
@@ -47,6 +48,6 @@ class ApplicationService(
                 applicationKind = ApplicationKind.APPLICATION
             )
         )
-        eventPublisher.publishEvent(UserInfoRequest(this, user.xquareId))
+        eventPublisher.publishEvent(UserInfoRequest(EventTopic.HANDLE_EVENT, user.xquareId))
     }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/ChangeApplicationStatusService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/ChangeApplicationStatusService.kt
@@ -17,6 +17,7 @@ import dsm.pick2024.domain.applicationstory.port.out.SaveAllApplicationStoryPort
 import dsm.pick2024.domain.attendance.domain.service.AttendanceService
 import dsm.pick2024.domain.attendance.port.out.QueryAttendancePort
 import dsm.pick2024.domain.attendance.port.out.SaveAttendancePort
+import dsm.pick2024.domain.event.enums.EventTopic
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -58,7 +59,9 @@ class ChangeApplicationStatusService(
             saveApplicationPort.saveAll(updateApplicationList)
             applicationStorySaveAllPort.saveAll(applicationStory)
             saveAttendancePort.saveAll(attendance)
-            eventPublisher.publishEvent(ChangeStatusRequest(this, updateApplicationList.map { it.userId }))
+            eventPublisher.publishEvent(
+                ChangeStatusRequest(EventTopic.HANDLE_EVENT, updateApplicationList.map { it.userId })
+            )
         }
     }
 
@@ -95,6 +98,7 @@ class ChangeApplicationStatusService(
             start = startAndEnd.first(),
             end = startAndEnd.last(),
             date = application.date,
+            returnTeacherName = null,
             type = Type.APPLICATION,
             userId = application.userId
         )
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/ReturnApplicationReturnService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/ReturnApplicationReturnService.kt
@@ -6,6 +6,7 @@ import dsm.pick2024.domain.application.port.`in`.ReturnApplicationStatusUseCase
 import dsm.pick2024.domain.application.port.out.DeleteApplicationPort
 import dsm.pick2024.domain.application.port.out.QueryApplicationPort
 import dsm.pick2024.domain.event.dto.UserInfoRequest
+import dsm.pick2024.domain.event.enums.EventTopic
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -23,8 +24,8 @@ class ReturnApplicationReturnService(
             val application = queryApplicationPort.findByIdAndApplicationKind(it, ApplicationKind.APPLICATION)
                 ?: throw ApplicationNotFoundException
 
-            deleteApplicationPort.deleteByIdAndApplicationKind(it, ApplicationKind.APPLICATION)
-            eventPublisher.publishEvent(UserInfoRequest(this, application.userId))
+            deleteApplicationPort.deleteByIdAndApplicationKind(application.id!!, ApplicationKind.APPLICATION)
+            eventPublisher.publishEvent(UserInfoRequest(EventTopic.UPDATE_RETURN_TEACHER, application.userId))
         }
     }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/domain/ApplicationStory.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/domain/ApplicationStory.kt
@@ -13,6 +13,11 @@ data class ApplicationStory(
     val start: String,
     val end: String? = null,
     val userName: String,
+    val returnTeacherName: String? = null,
     val date: LocalDate,
     val type: Type
-)
+) {
+    fun updateReturnTeacher(returnTeacherName: String?): ApplicationStory {
+        return this.copy(returnTeacherName = returnTeacherName)
+    }
+}
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/entity/ApplicationStoryJpaEntity.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/entity/ApplicationStoryJpaEntity.kt
@@ -28,6 +28,9 @@ class ApplicationStoryJpaEntity(
     @Column(name = "user_name", nullable = false, columnDefinition = "VARCHAR(10)")
     val userName: String,
 
+    @Column(name = "return_teacher_name", nullable = true, columnDefinition = "VARCHAR(10)")
+    val teacherName: String? = null,
+
     @Enumerated(value = EnumType.STRING)
     @Column(name = "type", nullable = false, columnDefinition = "VARCHAR(20)")
     val type: Type,
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/mapper/ApplicationStoryMapper.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/mapper/ApplicationStoryMapper.kt
@@ -16,7 +16,8 @@ class ApplicationStoryMapper {
                 userName = userName,
                 date = date,
                 type = type,
-                userId = userId
+                userId = userId,
+                teacherName = returnTeacherName
             )
         }
 
@@ -30,7 +31,8 @@ class ApplicationStoryMapper {
                 userName = userName,
                 date = date,
                 type = type,
-                userId = userId
+                userId = userId,
+                returnTeacherName = teacherName
             )
         }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/persistence/ApplicationStoryPersistenceAdapter.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/persistence/ApplicationStoryPersistenceAdapter.kt
@@ -22,4 +22,8 @@ class ApplicationStoryPersistenceAdapter(
         applicationStoryRepository.findAllByUserId(userId)
             .map { it.let { story -> applicationStoryMapper.toDomain(story) } }
             .sortedByDescending { it.date }
+
+    override fun save(applicationStory: ApplicationStory) {
+        applicationStoryRepository.save(applicationStoryMapper.toEntity(applicationStory))
+    }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/port/out/ApplicationStoryPort.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/port/out/ApplicationStoryPort.kt
@@ -2,4 +2,5 @@ package dsm.pick2024.domain.applicationstory.port.out
 
 interface ApplicationStoryPort :
     SaveAllApplicationStoryPort,
-    QueryAllApplicationStoryPort
+    QueryAllApplicationStoryPort,
+    SaveApplicationStoryPort
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/port/out/SaveApplicationStoryPort.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/port/out/SaveApplicationStoryPort.kt
@@ -0,0 +1,7 @@
+package dsm.pick2024.domain.applicationstory.port.out
+
+import dsm.pick2024.domain.applicationstory.domain.ApplicationStory
+
+interface SaveApplicationStoryPort {
+    fun save(applicationStory: ApplicationStory)
+}
diff --git a/src/main/kotlin/dsm/pick2024/domain/applicationstory/service/UpdateReturnTeacherService.kt b/src/main/kotlin/dsm/pick2024/domain/applicationstory/service/UpdateReturnTeacherService.kt
@@ -0,0 +1,24 @@
+package dsm.pick2024.domain.applicationstory.service
+
+import dsm.pick2024.domain.admin.port.`in`.AdminFacadeUseCase
+import dsm.pick2024.domain.application.port.`in`.UpdateReturnTeacherUseCase
+import dsm.pick2024.domain.applicationstory.port.out.QueryAllApplicationStoryPort
+import dsm.pick2024.domain.applicationstory.port.out.SaveApplicationStoryPort
+import org.springframework.stereotype.Service
+import java.util.*
+
+@Service
+class UpdateReturnTeacherService(
+    private val adminFacadeUseCase: AdminFacadeUseCase,
+    private val saveApplicationStoryPort: SaveApplicationStoryPort,
+    private val queryAllApplicationStoryPort: QueryAllApplicationStoryPort
+) : UpdateReturnTeacherUseCase {
+    override fun updateReturnTeacher(userId: UUID) {
+        val admin = adminFacadeUseCase.currentAdmin()
+        val applicationStoryList = queryAllApplicationStoryPort.findAllByUserId(userId)
+
+        val latestApplicationStory = applicationStoryList?.let { it.maxByOrNull { it.date } }
+
+        latestApplicationStory?.let { saveApplicationStoryPort.save(it.updateReturnTeacher(admin.name)) }
+    }
+}
diff --git a/src/main/kotlin/dsm/pick2024/domain/classroom/service/BackUserClassroomService.kt b/src/main/kotlin/dsm/pick2024/domain/classroom/service/BackUserClassroomService.kt
@@ -3,6 +3,7 @@ package dsm.pick2024.domain.classroom.service
 import dsm.pick2024.domain.classroom.port.`in`.BackUserClassroomUseCase
 import dsm.pick2024.domain.classroom.port.out.DeleteClassRoomPort
 import dsm.pick2024.domain.event.dto.UserInfoRequest
+import dsm.pick2024.domain.event.enums.EventTopic
 import dsm.pick2024.domain.user.port.`in`.UserFacadeUseCase
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
@@ -18,6 +19,6 @@ class BackUserClassroomService(
     override fun backClassroom() {
         val user = userFacadeUseCase.currentUser()
         deleteClassRoomPort.deleteByUserId(user.xquareId)
-        eventPublisher.publishEvent(UserInfoRequest(this, user.xquareId))
+        eventPublisher.publishEvent(UserInfoRequest(EventTopic.HANDLE_EVENT, user.xquareId))
     }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/classroom/service/MoveClassroomApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/classroom/service/MoveClassroomApplicationService.kt
@@ -10,6 +10,7 @@ import dsm.pick2024.domain.classroom.port.out.SaveClassRoomPort
 import dsm.pick2024.domain.classroom.port.out.ExistClassRoomPort
 import dsm.pick2024.domain.classroom.presentation.dto.request.UserMoveClassroomRequest
 import dsm.pick2024.domain.event.dto.UserInfoRequest
+import dsm.pick2024.domain.event.enums.EventTopic
 import dsm.pick2024.domain.user.port.`in`.UserFacadeUseCase
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
@@ -49,6 +50,6 @@ class MoveClassroomApplicationService(
                 status = Status.QUIET
             )
         )
-        eventPublisher.publishEvent(UserInfoRequest(this, user.xquareId))
+        eventPublisher.publishEvent(UserInfoRequest(EventTopic.HANDLE_EVENT, user.xquareId))
     }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/event/enums/EventTopic.kt b/src/main/kotlin/dsm/pick2024/domain/event/enums/EventTopic.kt
@@ -0,0 +1,6 @@
+package dsm.pick2024.domain.event.enums
+
+enum class EventTopic {
+    UPDATE_RETURN_TEACHER,
+    HANDLE_EVENT
+}
diff --git a/src/main/kotlin/dsm/pick2024/domain/event/sub/EventService.kt b/src/main/kotlin/dsm/pick2024/domain/event/sub/EventService.kt
@@ -1,14 +1,17 @@
 package dsm.pick2024.domain.event.sub
 
+import dsm.pick2024.domain.application.port.`in`.UpdateReturnTeacherUseCase
 import dsm.pick2024.domain.event.dto.ChangeStatusRequest
 import dsm.pick2024.domain.event.dto.UserInfoRequest
+import dsm.pick2024.domain.event.enums.EventTopic
 import dsm.pick2024.domain.main.port.`in`.MainUseCase
 import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
 
 @Component
 class EventService(
-    private val mainUseCase: MainUseCase
+    private val mainUseCase: MainUseCase,
+    private val updateReturnTeacherUseCase: UpdateReturnTeacherUseCase
 ) {
 
     @EventListener(ChangeStatusRequest::class)
@@ -20,6 +23,11 @@ class EventService(
 
     @EventListener(UserInfoRequest::class)
     fun onCreateApplicationEvent(event: UserInfoRequest) {
-        mainUseCase.onHandleEvent(event.userId)
+        when (event.source) {
+            EventTopic.UPDATE_RETURN_TEACHER ->
+                updateReturnTeacherUseCase.updateReturnTeacher(event.userId)
+            EventTopic.HANDLE_EVENT ->
+                mainUseCase.onHandleEvent(event.userId)
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import dsm.pick2024.domain.application.port.out.ExistsApplicationPort`
`9`	`9`	`import dsm.pick2024.domain.application.port.out.SaveApplicationPort`
`10`	`10`	`import dsm.pick2024.domain.application.presentation.dto.request.ApplicationRequest`
`11`	`11`	`import dsm.pick2024.domain.event.dto.UserInfoRequest`
	`12`	`+import dsm.pick2024.domain.event.enums.EventTopic`
`12`	`13`	import dsm.pick2024.domain.user.port.`in`.UserFacadeUseCase
`13`	`14`	`import org.springframework.context.ApplicationEventPublisher`
`14`	`15`	`import org.springframework.stereotype.Service`
`@@ -47,6 +48,6 @@ class ApplicationService(`
`47`	`48`	`applicationKind = ApplicationKind.APPLICATION`
`48`	`49`	`)`
`49`	`50`	`)`
`50`		`- eventPublisher.publishEvent(UserInfoRequest(this, user.xquareId))`
	`51`	`+ eventPublisher.publishEvent(UserInfoRequest(EventTopic.HANDLE_EVENT, user.xquareId))`
`51`	`52`	`}`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
@@ -6,6 +6,7 @@ import dsm.pick2024.domain.application.port.`in`.ReturnApplicationStatusUseCase
`6`	`6`	`import dsm.pick2024.domain.application.port.out.DeleteApplicationPort`
`7`	`7`	`import dsm.pick2024.domain.application.port.out.QueryApplicationPort`
`8`	`8`	`import dsm.pick2024.domain.event.dto.UserInfoRequest`
	`9`	`+import dsm.pick2024.domain.event.enums.EventTopic`
`9`	`10`	`import org.springframework.context.ApplicationEventPublisher`
`10`	`11`	`import org.springframework.stereotype.Service`
`11`	`12`	`import org.springframework.transaction.annotation.Transactional`
`@@ -23,8 +24,8 @@ class ReturnApplicationReturnService(`
`23`	`24`	`val application = queryApplicationPort.findByIdAndApplicationKind(it, ApplicationKind.APPLICATION)`
`24`	`25`	`?: throw ApplicationNotFoundException`
`25`	`26`
`26`		`- deleteApplicationPort.deleteByIdAndApplicationKind(it, ApplicationKind.APPLICATION)`
`27`		`- eventPublisher.publishEvent(UserInfoRequest(this, application.userId))`
	`27`	`+ deleteApplicationPort.deleteByIdAndApplicationKind(application.id!!, ApplicationKind.APPLICATION)`
	`28`	`+ eventPublisher.publishEvent(UserInfoRequest(EventTopic.UPDATE_RETURN_TEACHER, application.userId))`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ class ApplicationStoryMapper {`
`16`	`16`	`userName = userName,`
`17`	`17`	`date = date,`
`18`	`18`	`type = type,`
`19`		`- userId = userId`
	`19`	`+ userId = userId,`
	`20`	`+ teacherName = returnTeacherName`
`20`	`21`	`)`
`21`	`22`	`}`
`22`	`23`
`@@ -30,7 +31,8 @@ class ApplicationStoryMapper {`
`30`	`31`	`userName = userName,`
`31`	`32`	`date = date,`
`32`	`33`	`type = type,`
`33`		`- userId = userId`
	`34`	`+ userId = userId,`
	`35`	`+ returnTeacherName = teacherName`
`34`	`36`	`)`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,8 @@ class ApplicationStoryPersistenceAdapter(`
`22`	`22`	`applicationStoryRepository.findAllByUserId(userId)`
`23`	`23`	`.map { it.let { story -> applicationStoryMapper.toDomain(story) } }`
`24`	`24`	`.sortedByDescending { it.date }`
	`25`	`+`
	`26`	`+ override fun save(applicationStory: ApplicationStory) {`
	`27`	`+ applicationStoryRepository.save(applicationStoryMapper.toEntity(applicationStory))`
	`28`	`+ }`
`25`	`29`	`}`