refactor: (#271) dms-application detekt 적용

.github/workflows/build.yml

@@ -30,4 +30,4 @@ jobs:
             --no-daemon
 
       - name: Run Detekt
-        run: ./gradlew detekt
+        run: ./gradlew :dms-application:detekt

build.gradle.kts

@@ -39,6 +39,8 @@ subprojects {
         // test
         implementation(Dependencies.SPRING_TEST)
         implementation(Dependencies.MOCKK)
+
+        detektPlugins(Dependencies.DETEKT)
     }
 }
 

buildSrc/src/main/kotlin/Dependencies.kt

@@ -52,4 +52,7 @@ object Dependencies {
     // excel
     const val APACHE_POI = "org.apache.poi:poi:${DependencyVersions.APACHE_POI_VERSION}"
     const val APACHE_POI_OOXML = "org.apache.poi:poi-ooxml:${DependencyVersions.APACHE_POI_VERSION}"
+
+    // detekt
+    const val DETEKT = "io.gitlab.arturbosch.detekt:detekt-formatting:${PluginVersions.DETEKT_VERSION}"
 }

dms-application/src/main/kotlin/team/aliens/dms/domain/auth/spi/AuthQueryUserPort.kt

@@ -9,5 +9,5 @@ interface AuthQueryUserPort {
 
     fun queryUserByAccountId(accountId: String): User?
 
-    fun queryUserById(id: UUID): User?
+    fun queryUserById(userId: UUID): User?
 }

dms-application/src/main/kotlin/team/aliens/dms/domain/manager/spi/ManagerCommandRemainStatusPort.kt

@@ -4,4 +4,4 @@ import java.util.UUID
 
 interface ManagerCommandRemainStatusPort {
     fun deleteByStudentId(studentId: UUID)
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/manager/spi/ManagerCommandStudyRoomPort.kt

@@ -8,4 +8,4 @@ interface ManagerCommandStudyRoomPort {
     fun saveSeat(seat: Seat): Seat
 
     fun saveStudyRoom(studyRoom: StudyRoom): StudyRoom
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/manager/spi/ManagerQueryStudyRoomPort.kt

@@ -9,4 +9,4 @@ interface ManagerQueryStudyRoomPort {
     fun querySeatByStudentId(studentId: UUID): Seat?
 
     fun queryStudyRoomById(studyRoomId: UUID): StudyRoom?
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/manager/usecase/RemoveStudentUseCase.kt

@@ -53,17 +53,6 @@ class RemoveStudentUseCase(
         // 잔류 내역 삭제
         commandRemainStatusPort.deleteByStudentId(studentId)
 
-        // 자습실 신청 상태 제거
-        queryStudyRoomPort.querySeatByStudentId(studentId)?.let { seat ->
-            val studyRoom = queryStudyRoomPort.queryStudyRoomById(seat.studyRoomId) ?: throw StudyRoomNotFoundException
-            commandStudyRoomPort.saveSeat(
-                seat.unUse()
-            )
-            commandStudyRoomPort.saveStudyRoom(
-                studyRoom.unApply()
-            )
-        }
-
         commandUserPort.saveUser(
             studentUser.copy(deletedAt = LocalDateTime.now())
         )

dms-application/src/main/kotlin/team/aliens/dms/domain/meal/usecase/QueryMealsUseCase.kt

@@ -37,9 +37,7 @@ class QueryMealsUseCase(
             if (meals == null) {
                 mealDetails.add(MealDetails.emptyOf(date))
             } else {
-                meals[0].apply {
-                    mealDetails.add(MealDetails.of(this))
-                }
+                mealDetails.add(MealDetails.of(meals[0]))
             }
         }
 

dms-application/src/main/kotlin/team/aliens/dms/domain/remain/spi/RemainStatusPort.kt

@@ -7,5 +7,4 @@ interface RemainStatusPort :
     CommandRemainStatusPort,
     QueryRemainStatusPort,
     StudentCommandRemainStatusPort,
-    ManagerCommandRemainStatusPort {
-}
+    ManagerCommandRemainStatusPort

dms-application/src/main/kotlin/team/aliens/dms/domain/student/spi/CommandStudentPort.kt

@@ -10,5 +10,4 @@ interface CommandStudentPort {
     fun saveAllVerifiedStudent(verifiedStudents: List<VerifiedStudent>)
 
     fun deleteVerifiedStudent(verifiedStudent: VerifiedStudent)
-
 }

dms-application/src/main/kotlin/team/aliens/dms/domain/student/spi/StudentCommandRemainStatusPort.kt

@@ -4,4 +4,4 @@ import java.util.UUID
 
 interface StudentCommandRemainStatusPort {
     fun deleteByStudentId(studentId: UUID)
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/student/spi/StudentCommandStudyRoomPort.kt

@@ -8,4 +8,4 @@ interface StudentCommandStudyRoomPort {
     fun saveSeat(seat: Seat): Seat
 
     fun saveStudyRoom(studyRoom: StudyRoom): StudyRoom
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/student/spi/StudentQueryStudyRoomPort.kt

@@ -9,4 +9,4 @@ interface StudentQueryStudyRoomPort {
     fun querySeatByStudentId(studentId: UUID): Seat?
 
     fun queryStudyRoomById(studyRoomId: UUID): StudyRoom?
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/student/usecase/SignUpUseCase.kt

@@ -61,13 +61,11 @@ class SignUpUseCase(
         validateAuthCode(authCode, email)
         validateUserDuplicated(accountId, email)
 
-        val gcn = "${grade}${classRoom}${Student.processNumber(number)}"
-
         /**
          * 검증된 학생 조회
          **/
         val verifiedStudent = queryVerifiedStudentPort.queryVerifiedStudentByGcnAndSchoolName(
-            gcn = gcn,
+            gcn = "${grade}${classRoom}${Student.processNumber(number)}",
             schoolName = school.name
         ) ?: throw VerifiedStudentNotFoundException
 

dms-application/src/main/kotlin/team/aliens/dms/domain/student/usecase/StudentWithdrawalUseCase.kt

@@ -43,4 +43,4 @@ class StudentWithdrawalUseCase(
             studentUser.copy(deletedAt = LocalDateTime.now())
         )
     }
-}
+}

dms-application/src/main/kotlin/team/aliens/dms/domain/studyroom/spi/StudyRoomPort.kt

@@ -5,12 +5,11 @@ import team.aliens.dms.domain.manager.spi.ManagerQueryStudyRoomPort
 import team.aliens.dms.domain.student.spi.StudentCommandStudyRoomPort
 import team.aliens.dms.domain.student.spi.StudentQueryStudyRoomPort
 
-interface StudyRoomPort:
+interface StudyRoomPort :
     QueryStudyRoomPort,
     CommandStudyRoomPort,
     SeatTypeQueryStudyRoomPort,
     StudentQueryStudyRoomPort,
     StudentCommandStudyRoomPort,
     ManagerQueryStudyRoomPort,
-    ManagerCommandStudyRoomPort {
-}
+    ManagerCommandStudyRoomPort

dms-application/src/test/kotlin/team/aliens/dms/domain/manager/usecase/RemoveStudentUseCaseTests.kt

@@ -58,7 +58,8 @@ class RemoveStudentUseCaseTests {
     @BeforeEach
     fun setUp() {
         removeStudentUseCase = RemoveStudentUseCase(
-            securityPort, queryUserPort, queryStudentPort, commandRemainStatusPort, queryStudyRoomPort, commandStudyRoomPort, commandUserPort
+            securityPort, queryUserPort, queryStudentPort, commandRemainStatusPort,
+            queryStudyRoomPort, commandStudyRoomPort, commandUserPort
         )
     }
 

dms-application/src/test/kotlin/team/aliens/dms/domain/student/usecase/SignUpUseCaseTests.kt

@@ -147,26 +147,6 @@ class SignUpUseCaseTests {
         )
     }
 
-    private val tokenResponseStub by lazy {
-        TokenResponse(
-            accessToken = "test access token",
-            accessTokenExpiredAt = LocalDateTime.now(),
-            refreshToken = "test refresh token",
-            refreshTokenExpiredAt = LocalDateTime.now()
-        )
-    }
-
-    private val featureStub by lazy {
-        AvailableFeature(
-            schoolId = userStub.schoolId,
-            mealService = true,
-            noticeService = true,
-            pointService = true,
-            studyRoomService = false,
-            remainService = true
-        )
-    }
-
     private val gcnStub = "${requestStub.grade}${requestStub.classRoom}${Student.processNumber(requestStub.number)}"
 
 //    @Test

dms-application/src/test/kotlin/team/aliens/dms/domain/student/usecase/StudentWithdrawalUseCaseTests.kt

@@ -109,4 +109,4 @@ class StudentWithdrawalUseCaseTests {
             studentWithdrawalUseCase.execute()
         }
     }
-}
+}