Merge pull request #48 from YAPP-Github/feat/T3-145

[T3-145] @SQLDelete, @where를 이용한 soft delete 추가

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/EmotionMarble.java

@@ -10,14 +10,17 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.UUID;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE emotion_marble SET deleted_at = NOW() WHERE emotion_marble_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class EmotionMarble extends BaseTimeEntity {
 
     @EmbeddedId

src/main/java/bitnagil/bitnagil_backend/onboarding/domain/Case.java

@@ -6,19 +6,23 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Table(name = "routine_case") // 이렇게 예약어 회피
+@SQLDelete(sql = "UPDATE routine_case SET deleted_at = NOW() WHERE case_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class Case extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long caseId;
 
     @Builder
-    public Case(Long caseId, String caseName) {
+    public Case(Long caseId) {
         this.caseId = caseId;
     }
 }

src/main/java/bitnagil/bitnagil_backend/onboarding/domain/Onboarding.java

@@ -7,12 +7,16 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalTime;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE onboarding SET deleted_at = NOW() WHERE onboarding_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class Onboarding extends BaseTimeEntity {
 
     @Id

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/domain/RecommendedRoutine.java

@@ -9,12 +9,16 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalTime;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE recommended_routine SET deleted_at = NOW() WHERE recommended_routine_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class RecommendedRoutine extends BaseTimeEntity {
 
     @Id

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/domain/RecommendedSubRoutine.java

@@ -5,10 +5,14 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE recommended_sub_routine SET deleted_at = NOW() WHERE recommended_sub_routine_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class RecommendedSubRoutine extends BaseTimeEntity {
 
     @Id

src/main/java/bitnagil/bitnagil_backend/routineInfoV2/domain/RoutineInfoV2.java

@@ -20,13 +20,17 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 /**
  * 추후 v2를 대비한 루틴에 대한 정보를 관리하는 엔티티 클래스입니다.
  */
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE routine_info_v2 SET deleted_at = NOW() WHERE routine_info_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class RoutineInfoV2 {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/bitnagil/bitnagil_backend/routineV2/domain/RoutineV2.java

@@ -19,13 +19,17 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 /**
  * 추후 v2를 대비한 일자별 루틴을 관리하는 엔티티 클래스입니다.
  */
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE routine_v2 SET deleted_at = NOW() WHERE routine_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class RoutineV2 {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/bitnagil/bitnagil_backend/user/domain/User.java

@@ -1,18 +1,16 @@
 package bitnagil.bitnagil_backend.user.domain;
 
-import java.time.LocalDateTime;
-
 import bitnagil.bitnagil_backend.enums.Role;
 import bitnagil.bitnagil_backend.enums.SocialType;
 import bitnagil.bitnagil_backend.global.entity.BaseTimeEntity;
-import bitnagil.bitnagil_backend.global.entity.HistoryPk;
 import bitnagil.bitnagil_backend.onboarding.domain.Onboarding;
 import jakarta.persistence.*;
-import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 /**
  * 소셜 인증을 통해 가입한 사용자의 정보를 저장하는 JPA 엔티티 클래스입니다.
@@ -21,6 +19,8 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE user SET role = 'WITHDRAWN', deleted_at = NOW() WHERE user_id = ?")
+@Where(clause = "deleted_at IS NULL")
 public class User extends BaseTimeEntity {
 
     @Id
@@ -75,6 +75,7 @@ public void updateOnboarding(Onboarding onboarding) {
         this.onboarding = onboarding;
     }
 
+    // todo: 운영 반영 후 이슈가 없으면 제거
     public void changeRoleToWithdrawn() {
         this.role = Role.WITHDRAWN;
     }

src/main/java/bitnagil/bitnagil_backend/user/service/UserAuthService.java

@@ -88,14 +88,13 @@ public void logout(User user) {
     // 회원탈퇴 - 회원 관련 정보 삭제 및 소셜과 연결 끊기
     @Transactional
     public void withdrawal(User user) {
-        LocalDateTime now = LocalDateTime.now();
-
         // 변경 감지를 위해 영속 상태로 설정
         User persistedUser = userManager.getPersistedUser(user);
 
         invalidateToken(persistedUser);
 
-        persistedUser.changeRoleToWithdrawn();
+        // 회원 삭제 (delete() 호출 시 @SQLDelete 어노테이션에 의해 role은 WITHDRAWN로 deleted_at은 NOW()로 변경됨)
+        userRepository.delete(user);
 
         unlinkFromSocial(persistedUser);
     }