feat: delete moit (#118)

* feat: moit delete * chore: add Authorization header in http file * chore: set moitId path parameter in http file
mash-up-kr · Aug 4, 2023 · 17d367d · 17d367d
1 parent 729d7c7
commit 17d367d
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 2 deletions.
diff --git a/http/fine.http b/http/fine.http
@@ -1,5 +1,6 @@
 ### Fine 리스트 조회 
-GET {{moit-api}}/api/v1/moit/{{moitId}}/fine
+GET {{moit-api}}/api/v1/moit/1/fine
+Authorization: {{authorizationHeader}}
 
 ### Fine 평가
 POST {{moit-api}}/api/v1/moit/{{moitId}}/fine/{{fineId}}/evaluate

diff --git a/http/moit.http b/http/moit.http
@@ -1,5 +1,6 @@
 ### Moit Create
 POST {{moit-api}}/api/v1/moit
+Authorization: {{authorizationHeader}}
 Content-Type: application/json
 
 {
@@ -24,6 +25,7 @@ Content-Type: application/json
 
 ### Moit Join
 POST {{moit-api}}/api/v1/moit/join
+Authorization: {{authorizationHeader}}
 Content-Type: application/json
 
 {
@@ -33,12 +35,20 @@ Content-Type: application/json
 
 ### My Moits
 GET {{moit-api}}/api/v1/moit
+Authorization: {{authorizationHeader}}
 
 ### Moit Join Users
 GET {{moit-api}}/api/v1/moit/{{moitId}}/users
+Authorization: {{authorizationHeader}}
 
 ### Moit Details 
 GET {{moit-api}}/api/v1/moit/{{moitId}}
+Authorization: {{authorizationHeader}}
 
 ### Moit Attendance 
 GET {{moit-api}}/api/v1/moit/{{moitId}}/attendance
+Authorization: {{authorizationHeader}}
+
+### Moit Delete 
+DELETE {{moit-api}}/api/v1/moit/{{moitId}}
+Authorization: {{authorizationHeader}}
diff --git a/http/study.http b/http/study.http
@@ -1,11 +1,14 @@
 ### 스터디 출석 키워드 조회
 GET {{moit-api}}/api/v1/study/{{studyId}}/attendance/keyword
+Authorization: {{authorizationHeader}}
 
 ### 스터디 출석 상태 조회
 GET {{moit-api}}/api/v1/study/{{studyId}}/attendance/status
+Authorization: {{authorizationHeader}}
 
 ### 스터디 출석 키워드 등록
 POST {{moit-api}}/api/v1/study/{{studyId}}/attendance/keyword/register
+Authorization: {{authorizationHeader}}
 Content-Type: application/json
 
 {
@@ -14,6 +17,7 @@ Content-Type: application/json
 
 ### 스터디 출석 키워드 인증
 POST {{moit-api}}/api/v1/study/{{studyId}}/attendance/keyword/verify
+Authorization: {{authorizationHeader}}
 Content-Type: application/json
 
 {
@@ -22,6 +26,8 @@ Content-Type: application/json
 
 ### 스터디 출석 초기화
 POST {{moit-api}}/api/v1/study/{{studyId}}/attendance/initialize
+Authorization: {{authorizationHeader}}
 
 ### 스터디 첫 출석자 존재 여부 조회 
 GET {{moit-api}}/api/v1/study/{{studyId}}/attendance/is-first
+Authorization: {{authorizationHeader}}
diff --git a/moit-api/src/main/kotlin/com/mashup/moit/controller/moit/MoitController.kt b/moit-api/src/main/kotlin/com/mashup/moit/controller/moit/MoitController.kt
@@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import jakarta.validation.Valid
 import org.springframework.http.MediaType
+import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
@@ -91,4 +92,13 @@ class MoitController(
         return MoitApiResponse.success()
     }
 
+    @Operation(summary = "Moit 삭제", description = "Moit 삭제 API")
+    @DeleteMapping("/{moitId}")
+    fun deleteMoit(
+        @GetAuth userInfo: UserInfo,
+        @PathVariable("moitId") moitId: Long,
+    ): MoitApiResponse<Unit> {
+        return MoitApiResponse.success(moitFacade.deleteMoit(userId = userInfo.id, moitId = moitId))
+    }
+
 }
diff --git a/moit-api/src/main/kotlin/com/mashup/moit/facade/MoitFacade.kt b/moit-api/src/main/kotlin/com/mashup/moit/facade/MoitFacade.kt
@@ -134,6 +134,10 @@ class MoitFacade(
         moitService.addMoitImage(moit.id, moitImageUrl)
     }
 
+    fun deleteMoit(userId: Long, moitId: Long) {
+        moitService.deleteMoit(userId = userId, moitId = moitId)
+    }
+
     private fun getMoitByInvitationCode(invitationCode: String): Moit {
         return moitService.getMoitByInvitationCode(invitationCode)
     }

diff --git a/moit-domain/src/main/kotlin/com/mashup/moit/domain/common/BaseEntity.kt b/moit-domain/src/main/kotlin/com/mashup/moit/domain/common/BaseEntity.kt
@@ -28,5 +28,5 @@ abstract class BaseEntity {
     lateinit var updatedAt: LocalDateTime
 
     @Column(name = "is_deleted", nullable = false)
-    val isDeleted: Boolean = false
+    var isDeleted: Boolean = false
 }
diff --git a/moit-domain/src/main/kotlin/com/mashup/moit/domain/moit/MoitEntity.kt b/moit-domain/src/main/kotlin/com/mashup/moit/domain/moit/MoitEntity.kt
@@ -7,10 +7,12 @@ import jakarta.persistence.Column
 import jakarta.persistence.Embedded
 import jakarta.persistence.Entity
 import jakarta.persistence.Table
+import org.hibernate.annotations.Where
 import java.time.LocalDate
 
 @Table(name = "moit")
 @Entity
+@Where(clause = "is_deleted = false")
 class MoitEntity(
     @Column(name = "name", nullable = false)
     val name: String,

diff --git a/moit-domain/src/main/kotlin/com/mashup/moit/domain/moit/MoitService.kt b/moit-domain/src/main/kotlin/com/mashup/moit/domain/moit/MoitService.kt
@@ -3,6 +3,7 @@ package com.mashup.moit.domain.moit
 import com.mashup.moit.common.exception.MoitException
 import com.mashup.moit.common.exception.MoitExceptionType
 import com.mashup.moit.domain.usermoit.UserMoitRepository
+import com.mashup.moit.domain.usermoit.UserMoitRole
 import org.apache.commons.lang3.RandomStringUtils
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -95,4 +96,17 @@ class MoitService(
             .apply { this.profileUrl = moitImageUrl }
     }
 
+    @Transactional
+    fun deleteMoit(userId: Long, moitId: Long) {
+        userMoitRepository.findByMoitIdAndRole(moitId = moitId, role = UserMoitRole.MASTER)
+            ?.takeIf { it.userId == userId }
+            ?.run {
+                moitRepository.findById(moitId)
+                    .orElseThrow { MoitException.of(MoitExceptionType.NOT_EXIST) }
+                    .apply { this.isDeleted = true }
+                // TODO 삭제 고도화 시, 트랜잭션 밖으로 빼는 것을 고려
+                userMoitRepository.findAllByMoitId(moitId)
+                    .forEach { it.isDeleted = true }
+            } ?: throw MoitException.of(MoitExceptionType.ONLY_MOIT_MASTER)
+    }
 }
diff --git a/moit-domain/src/main/kotlin/com/mashup/moit/domain/usermoit/UserMoitEntity.kt b/moit-domain/src/main/kotlin/com/mashup/moit/domain/usermoit/UserMoitEntity.kt
@@ -6,9 +6,11 @@ import jakarta.persistence.Entity
 import jakarta.persistence.EnumType
 import jakarta.persistence.Enumerated
 import jakarta.persistence.Table
+import org.hibernate.annotations.Where
 
 @Table(name = "user_moit")
 @Entity
+@Where(clause = "is_deleted = false")
 class UserMoitEntity(
     @Column(name = "moit_id", nullable = false)
     val moitId: Long,