🔀 :: (#255) 타입 변경 API 오류 수정 (#124)

* ♻️ :: 메소드명 변경 및 타입이 있을 시 타입 수정으로 변경 * ♻️ :: 메소드명 변경 * ♻️ :: 사용하지 않는 메소드 제거 * ♻️ :: let함수로 변경 * ♻️ :: klint 해결 * ♻️ :: ktlint 해결 * ♻️ :: ktlint 해결 * ♻️ :: 줄바꿈 제거 * ♻️ :: ktlint 해결
DSM-PICK · Jan 17, 2024 · 0b43eb5 · 0b43eb5
1 parent f0dc850
commit 0b43eb5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 32 deletions.
diff --git a/pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/admin/api/AdminApi.kt b/pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/admin/api/AdminApi.kt
@@ -18,7 +18,8 @@ interface AdminApi {
 
     fun getStudentStatusListByGradeAndClassNum(grade: Int?, classNum: Int?): QueryStudentListByGradeAndClassNum
 
-    fun saveType(date: LocalDate, type: DirectorType)
-
-    fun updateType(date: LocalDate, type: DirectorType)
+    fun saveOrUpdateType(
+        date: LocalDate,
+        type: DirectorType,
+    )
 }
diff --git a/...ication/src/main/kotlin/com/pickdsm/pickserverspring/domain/admin/usecase/AdminUseCase.kt b/...ication/src/main/kotlin/com/pickdsm/pickserverspring/domain/admin/usecase/AdminUseCase.kt
@@ -272,20 +272,23 @@ class AdminUseCase(
             status.studentId == userId && status.startPeriod <= statusPeriod && status.endPeriod >= statusPeriod
         }?.type ?: StatusType.ATTENDANCE
 
-    override fun saveType(date: LocalDate, type: DirectorType) {
-        commandTypeSpi.saveType(
+    override fun saveOrUpdateType(
+        date: LocalDate,
+        type: DirectorType,
+    ) {
+        val existType = queryTypeSpi.queryTypeByDate(date)
+
+        existType?.let {
+            commandTypeSpi.saveType(
+                it.changeType(
+                    type,
+                ),
+            )
+        } ?: commandTypeSpi.saveType(
             Type(
                 date = date,
                 type = type,
             ),
         )
     }
-
-    override fun updateType(date: LocalDate, type: DirectorType) {
-        val currentType = queryTypeSpi.queryTypeByDate(date)
-            ?: throw TypeNotFoundException
-        commandTypeSpi.saveType(
-            currentType.changeType(date, type),
-        )
-    }
 }
diff --git a/...application/src/main/kotlin/com/pickdsm/pickserverspring/domain/selfstudydirector/Type.kt b/...application/src/main/kotlin/com/pickdsm/pickserverspring/domain/selfstudydirector/Type.kt
@@ -13,9 +13,8 @@ data class Type(
 
     val type: DirectorType,
 ) {
-    fun changeType(date: LocalDate, type: DirectorType): Type {
+    fun changeType(type: DirectorType): Type {
         return copy(
-            date = date,
             type = type,
         )
     }

diff --git a/...infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/ErrorResponse.kt b/...infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/ErrorResponse.kt
@@ -1,6 +1,5 @@
 package com.pickdsm.pickserverspring.common.error
 
-import com.pickdsm.pickserverspring.common.error.ErrorProperty
 import org.springframework.dao.DataIntegrityViolationException
 import org.springframework.validation.BindingResult
 import org.springframework.validation.FieldError

diff --git a/...frastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/GlobalErrorCode.kt b/...frastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/GlobalErrorCode.kt
@@ -1,7 +1,5 @@
 package com.pickdsm.pickserverspring.common.error
 
-import com.pickdsm.pickserverspring.common.error.ErrorProperty
-
 enum class GlobalErrorCode(
     private val status: Int,
     private val message: String

diff --git a/...src/main/kotlin/com/pickdsm/pickserverspring/domain/admin/presentation/AdminWebAdapter.kt b/...src/main/kotlin/com/pickdsm/pickserverspring/domain/admin/presentation/AdminWebAdapter.kt
@@ -256,19 +256,7 @@ class AdminWebAdapter(
         @RequestParam
         type: DirectorType,
     ) {
-        adminApi.saveType(date, type)
-    }
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PatchMapping("/type")
-    fun updateType(
-        @RequestParam
-        @DateTimeFormat(pattern = "yyyy-MM-dd")
-        date: LocalDate,
-        @RequestParam
-        type: DirectorType,
-    ) {
-        adminApi.updateType(date, type)
+        adminApi.saveOrUpdateType(date, type)
     }
 
     @PostMapping("/director")

diff --git a/...n/com/pickdsm/pickserverspring/domain/application/persistence/entity/ApplicationEntity.kt b/...n/com/pickdsm/pickserverspring/domain/application/persistence/entity/ApplicationEntity.kt
@@ -28,4 +28,4 @@ class ApplicationEntity(
     @ColumnDefault("false")
     val isReturn: Boolean,
 
-    ) : BaseUUIDEntity(id)
+) : BaseUUIDEntity(id)