Merge pull request #445 from DSM-PICK/develop

merge into develop

Author: ByunDohwi

build.gradle.kts

@@ -83,6 +83,8 @@ dependencies {
     implementation(Dependencies.FCM)
 
     implementation(Dependencies.WEB_SOCKET)
+
+    implementation(Dependencies.GOOGLE_OAUTH)
 }
 
 tasks.withType<KotlinCompile> {

buildSrc/src/main/kotlin/Dependencies.kt

@@ -57,4 +57,7 @@ object Dependencies {
 
     const val WEB_SOCKET = "org.springframework.boot:spring-boot-starter-websocket"
 
+    const val GOOGLE_OAUTH = "com.google.auth:google-auth-library-oauth2-http:${DependencyVersions.GOOGLE_OAUTH2}"
+
+
 }

buildSrc/src/main/kotlin/DependencyVersions.kt

@@ -12,4 +12,5 @@ object DependencyVersions {
     const val GSON = "2.8.7"
     const val AWS = "1.12.281"
     const val FCM = "8.1.0"
+    const val GOOGLE_OAUTH2 = "1.17.0"
 }

src/main/kotlin/dsm/pick2024/domain/admin/service/AdminLoginService.kt

@@ -12,8 +12,8 @@ import dsm.pick2024.domain.user.entity.enums.Role
 import dsm.pick2024.domain.user.exception.PasswordMissMatchException
 import dsm.pick2024.global.security.jwt.JwtTokenProvider
 import dsm.pick2024.global.security.jwt.dto.TokenResponse
-import dsm.pick2024.infrastructure.feign.client.XquareFeignClient
-import dsm.pick2024.infrastructure.feign.client.dto.request.XquareRequest
+import dsm.pick2024.infrastructure.feign.xquare.client.XquareFeignClient
+import dsm.pick2024.infrastructure.feign.xquare.dto.request.XquareRequest
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Service

src/main/kotlin/dsm/pick2024/domain/application/persistence/ApplicationPersistenceAdapter.kt

@@ -38,8 +38,9 @@ class ApplicationPersistenceAdapter(
     ) =
         applicationRepository.existsByStatusAndUserIdAndApplicationKind(status, userId, applicationKind)
 
-    override fun findByIdAndApplicationKind(id: UUID, applicationKind: ApplicationKind) =
-        applicationRepository.findById(id).let { applicationMapper.toDomain(it) }
+    override fun findById(id: UUID): Application? {
+        return applicationRepository.findById(id)?.let { applicationMapper.toDomain(it) }
+    }
 
     override fun deleteByIdAndApplicationKind(applicationId: UUID, applicationKind: ApplicationKind) {
         applicationRepository.deleteByIdAndApplicationKind(applicationId, applicationKind)
@@ -52,7 +53,11 @@ class ApplicationPersistenceAdapter(
         applicationRepository.deleteAllByApplicationKind(applicationKind)
     }
 
-    override fun findByUserId(id: UUID) = applicationRepository.findById(id).let { applicationMapper.toDomain(it) }
+    override fun findByUserId(userId: UUID) = applicationRepository.findById(userId)?.let {
+        applicationMapper.toDomain(
+            it
+        )
+    }
 
     override fun findAllByApplicationKind(applicationKind: ApplicationKind) =
         applicationRepository.findAllByApplicationKind(applicationKind).map { applicationMapper.toDomain(it) }

src/main/kotlin/dsm/pick2024/domain/application/persistence/finder/ApplicationFinder.kt

@@ -0,0 +1,18 @@
+package dsm.pick2024.domain.application.persistence.finder
+
+import dsm.pick2024.domain.application.domain.Application
+import dsm.pick2024.domain.application.exception.ApplicationNotFoundException
+import dsm.pick2024.domain.application.port.`in`.ApplicationFinderUseCase
+import dsm.pick2024.domain.application.port.out.QueryApplicationPort
+import org.springframework.stereotype.Component
+import java.util.*
+
+@Component
+class ApplicationFinder(
+    private val queryApplicationPort: QueryApplicationPort
+) : ApplicationFinderUseCase {
+    override fun findByIdOrThrow(id: UUID) = queryApplicationPort.findById(id) ?: throw ApplicationNotFoundException
+    override fun findByUserIdOrThrow(id: UUID): Application {
+        return queryApplicationPort.findByUserId(id) ?: throw ApplicationNotFoundException
+    }
+}

src/main/kotlin/dsm/pick2024/domain/application/persistence/repository/ApplicationRepository.kt

@@ -22,7 +22,7 @@ interface ApplicationRepository : Repository<ApplicationJapEntity, UUID> {
 
     fun saveAll(entity: Iterable<ApplicationJapEntity>)
 
-    fun findById(id: UUID): ApplicationJapEntity
+    fun findById(id: UUID): ApplicationJapEntity?
 
     fun findByUserId(userId: UUID): ApplicationJapEntity
 

src/main/kotlin/dsm/pick2024/domain/application/port/in/ApplicationFinderUseCase.kt

@@ -0,0 +1,9 @@
+package dsm.pick2024.domain.application.port.`in`
+
+import dsm.pick2024.domain.application.domain.Application
+import java.util.*
+
+interface ApplicationFinderUseCase {
+    fun findByIdOrThrow(id: UUID): Application
+    fun findByUserIdOrThrow(id: UUID): Application
+}

src/main/kotlin/dsm/pick2024/domain/application/port/out/QueryApplicationPort.kt

@@ -8,7 +8,7 @@ import java.util.*
 interface QueryApplicationPort {
     fun findByUserId(userId: UUID): Application?
 
-    fun findByIdAndApplicationKind(id: UUID, applicationKind: ApplicationKind): Application?
+    fun findById(id: UUID): Application?
 
     fun findByGradeAndClassNumAndApplicationKind(
         grade: Int,

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

@@ -5,7 +5,7 @@ import dsm.pick2024.domain.application.domain.Application
 import dsm.pick2024.domain.application.enums.ApplicationKind
 import dsm.pick2024.domain.application.enums.Status
 import dsm.pick2024.domain.event.dto.ChangeStatusRequest
-import dsm.pick2024.domain.application.exception.ApplicationNotFoundException
+import dsm.pick2024.domain.application.port.`in`.ApplicationFinderUseCase
 import dsm.pick2024.domain.application.port.`in`.ChangeApplicationStatusUseCase
 import dsm.pick2024.domain.application.port.out.DeleteApplicationPort
 import dsm.pick2024.domain.application.port.out.QueryApplicationPort
@@ -18,6 +18,8 @@ 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 dsm.pick2024.domain.fcm.port.`in`.FcmSendMessageUseCase
+import dsm.pick2024.domain.user.port.`in`.UserFacadeUseCase
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -33,18 +35,38 @@ class ChangeApplicationStatusService(
     private val saveAttendancePort: SaveAttendancePort,
     private val queryAttendancePort: QueryAttendancePort,
     private val attendanceService: AttendanceService,
-    private val eventPublisher: ApplicationEventPublisher
+    private val eventPublisher: ApplicationEventPublisher,
+    private val sendMessageUseCase: FcmSendMessageUseCase,
+    private val userFacadeUseCase: UserFacadeUseCase,
+    private val applicationFinderUseCase: ApplicationFinderUseCase
 ) : ChangeApplicationStatusUseCase {
 
     @Transactional
     override fun changeStatusApplication(request: ApplicationStatusRequest) {
         val admin = adminFacadeUseCase.currentAdmin()
+        val applications = request.idList.map { findApplicationById(it) }
+        val deviceTokens = applications.mapNotNull {
+            userFacadeUseCase.getUserByXquareId(
+                it.userId
+            ).deviceToken
+        }.filter { it.isNotBlank() }
+
+        when (request.status) {
+            Status.NO -> {
+                sendMessageUseCase.execute(deviceTokens, "외출 신청 반려 안내", "${admin.name} 선생님이 외출 신청을 반려하셨습니다.")
+            }
+            Status.OK -> {
+                sendMessageUseCase.execute(deviceTokens, "외출 신청 승인 안내", "${admin.name} 선생님이 외출 신청을 승인하셨습니다.")
+            }
+            else -> {
+            }
+        }
+
         if (request.status == Status.NO) {
             handleStatusNo(request.idList)
         } else {
-            val updateApplicationList = request.idList.map { id ->
-                val application = findApplicationById(id)
-                updateApplication(application, admin.name)
+            val updateApplicationList = applications.map {
+                updateApplication(it, admin.name)
             }
 
             val applicationStory = updateApplicationList.map { it ->
@@ -75,8 +97,7 @@ class ChangeApplicationStatusService(
     }
 
     private fun findApplicationById(id: UUID): Application {
-        return queryApplicationPort.findByIdAndApplicationKind(id, ApplicationKind.APPLICATION)
-            ?: throw ApplicationNotFoundException
+        return applicationFinderUseCase.findByIdOrThrow(id)
     }
 
     private fun updateApplication(application: Application, adminName: String): Application {