Merge: (#46) 진행상황 제거 API

Survival-From-Epidemic · Dec 1, 2023 · 451d37c · 451d37c
2 parents 03a5408 + ec4d375
commit 451d37c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,11 +4,9 @@ on:
     pull_request:
         branches:
             - main
-            - develop
     push:
         branches:
             - main
-            - develop
 
 jobs:
   ci:

diff --git a/src/main/kotlin/team/sfe/server/domain/progress/domain/repository/GameInfoRepository.kt b/src/main/kotlin/team/sfe/server/domain/progress/domain/repository/GameInfoRepository.kt
@@ -6,4 +6,6 @@ import team.sfe.server.domain.user.domain.UserEntity
 
 interface GameInfoRepository : CrudRepository<GameInfoEntity, Long> {
     fun findByUserEntity(userEntity: UserEntity): GameInfoEntity?
+
+    fun deleteByUserEntity(userEntity: UserEntity)
 }
diff --git a/src/main/kotlin/team/sfe/server/domain/progress/presentation/ProgressController.kt b/src/main/kotlin/team/sfe/server/domain/progress/presentation/ProgressController.kt
@@ -1,6 +1,7 @@
 package team.sfe.server.domain.progress.presentation
 
 import org.springframework.http.HttpStatus
+import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PutMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -26,4 +27,10 @@ class ProgressController(
     fun getProgress(): GetProgressResponse {
         return progressService.getProgress()
     }
+
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @DeleteMapping
+    fun deleteProgress() {
+        progressService.deleteProgress()
+    }
 }
diff --git a/src/main/kotlin/team/sfe/server/domain/progress/service/ProgressService.kt b/src/main/kotlin/team/sfe/server/domain/progress/service/ProgressService.kt
@@ -7,4 +7,6 @@ interface ProgressService {
     fun saveProgress(request: SaveProgressRequest)
 
     fun getProgress(): GetProgressResponse
+
+    fun deleteProgress()
 }
diff --git a/src/main/kotlin/team/sfe/server/domain/progress/service/ProgressServiceImpl.kt b/src/main/kotlin/team/sfe/server/domain/progress/service/ProgressServiceImpl.kt
@@ -46,6 +46,16 @@ class ProgressServiceImpl(
         )
     }
 
+    @Transactional
+    override fun deleteProgress() {
+        val currentUser = userFacade.getCurrentUser()
+
+        val gameInfoEntity = gameInfoRepository.findByUserEntity(currentUser) ?: throw ProgressNotFoundException
+
+        kTimeLeapRepository.deleteAllByGameInfoEntity(gameInfoEntity)
+        gameInfoRepository.deleteByUserEntity(currentUser)
+    }
+
     private fun saveGameInfo(request: SaveProgressRequest, currentUser: UserEntity) {
         val savedGameInfoEntity = gameInfoRepository.save(request.toGameInfoEntity(currentUser))
         kTimeLeapRepository.saveAll(request.toKTimeLeapEntity(savedGameInfoEntity))

diff --git a/src/main/kotlin/team/sfe/server/global/security/SecurityConfig.kt b/src/main/kotlin/team/sfe/server/global/security/SecurityConfig.kt
@@ -38,6 +38,7 @@ class SecurityConfig(
                 it.requestMatchers(HttpMethod.PATCH, "/auth/tokens").hasAuthority(USER.name)
                 it.requestMatchers(HttpMethod.PUT, "/progresses").hasAuthority(USER.name)
                 it.requestMatchers(HttpMethod.GET, "/progresses").hasAuthority(USER.name)
+                it.requestMatchers(HttpMethod.DELETE, "/progresses").hasAuthority(USER.name)
                     .anyRequest().permitAll()
             }
             .addFilterBefore(JwtFilter(jwtParser), UsernamePasswordAuthenticationFilter::class.java)