refactor: soft-delete 적용

woowacourse-teams · Aug 1, 2024 · 22793bc · 22793bc
1 parent 5273325
commit 22793bc
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 38 deletions.
diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java
@@ -17,11 +17,17 @@ public abstract class BaseEntity {
     @LastModifiedDate
     private LocalDateTime modifiedAt;
 
+    private boolean deleted = false;
+
     public LocalDateTime getCreatedAt() {
         return createdAt;
     }
 
     public LocalDateTime getModifiedAt() {
         return modifiedAt;
     }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
 }
diff --git a/.../src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java b/.../src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java
@@ -10,10 +10,10 @@
 
 public interface CustomChecklistQuestionRepository extends JpaRepository<CustomChecklistQuestion, Long> {
 
-    List<CustomChecklistQuestion> findByUser(User user);
+    @Query("SELECT c FROM CustomChecklistQuestion c WHERE c.user.id = :#{#user.id} AND c.deleted = false " )
+    List<CustomChecklistQuestion> findByUser(@Param("user") User user);
 
     @Modifying(flushAutomatically = true, clearAutomatically = true)
-    @Query("DELETE FROM CustomChecklistQuestion WHERE user.id = :#{#user.id}")
+    @Query("UPDATE CustomChecklistQuestion SET deleted = true WHERE user.id = :#{#user.id}")
     void deleteAllByUser(@Param("user") User user);
-
 }
diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql
@@ -1,15 +1,15 @@
-INSERT INTO users(id, name, created_at, modified_at)
-VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42');
+INSERT INTO users(id, name, created_at, modified_at, deleted)
+VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false);
 
-INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at)
-VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42');
+INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted)
+VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false);
diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql
@@ -4,6 +4,8 @@ DROP TABLE IF EXISTS checklist_option CASCADE;
 DROP TABLE IF EXISTS checklist_question CASCADE;
 DROP TABLE IF EXISTS room CASCADE;
 DROP TABLE IF EXISTS users CASCADE;
+DROP TABLE IF EXISTS test_entity CASCADE;
+DROP TABLE IF EXISTS custom_checklist_question CASCADE;
 
 -- Create tables
 CREATE TABLE room
@@ -15,15 +17,17 @@ CREATE TABLE room
     modified_at  TIMESTAMP(6),
     address      VARCHAR(255),
     name         VARCHAR(255),
-    station      VARCHAR(255)
+    station      VARCHAR(255),
+    deleted      BOOLEAN
 );
 
 CREATE TABLE users
 (
     id          BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     name        VARCHAR(255) NOT NULL,
     created_at  TIMESTAMP(6),
-    modified_at TIMESTAMP(6)
+    modified_at TIMESTAMP(6),
+    deleted      BOOLEAN
 );
 
 CREATE TABLE checklist
@@ -37,6 +41,7 @@ CREATE TABLE checklist
     room_id       BIGINT NOT NULL UNIQUE,
     user_id       BIGINT NOT NULL,
     real_estate   VARCHAR(255),
+    deleted      BOOLEAN,
     FOREIGN KEY (room_id) REFERENCES room (id),
     FOREIGN KEY (user_id) REFERENCES users (id)
 );
@@ -48,6 +53,7 @@ CREATE TABLE checklist_option
     checklist_id BIGINT  NOT NULL,
     created_at   TIMESTAMP(6),
     modified_at  TIMESTAMP(6),
+    deleted      BOOLEAN,
     FOREIGN KEY (checklist_id) REFERENCES checklist (id)
 );
 
@@ -59,17 +65,18 @@ CREATE TABLE checklist_question
     created_at   TIMESTAMP(6),
     modified_at  TIMESTAMP(6),
     grade       VARCHAR(255),
+    deleted      BOOLEAN,
     FOREIGN KEY (checklist_id) REFERENCES checklist (id)
 );
 
-
-CREATE TABLE category_priority
+CREATE TABLE if not exists category_priority
 (
     id  bigint  generated by default as identity,
     category_id INTEGER not null,
     user_id bigint not null,
     created_at TIMESTAMP not null,
     modified_at TIMESTAMP not null,
+    deleted      BOOLEAN,
     primary key (id),
     foreign key (user_id) references users
 );
@@ -81,5 +88,6 @@ CREATE TABLE custom_checklist_question
     question     VARCHAR(255),
     created_at    TIMESTAMP(6),
     modified_at   TIMESTAMP(6),
+    deleted      BOOLEAN,
     FOREIGN KEY (user_id) references users
 );
diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import java.util.ArrayList;
 import java.util.List;
 
 import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST;

diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql
@@ -1,15 +1,15 @@
-INSERT INTO users(id, name, created_at, modified_at)
-VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42');
+INSERT INTO users(id, name, created_at, modified_at, deleted)
+VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false);
 
-INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at)
-VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42'),
-       (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42');
+INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted)
+VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),
+       (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false);
diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql
@@ -17,15 +17,17 @@ CREATE TABLE room
     modified_at  TIMESTAMP(6),
     address      VARCHAR(255),
     name         VARCHAR(255),
-    station      VARCHAR(255)
+    station      VARCHAR(255),
+    deleted      BOOLEAN
 );
 
 CREATE TABLE users
 (
     id          BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
     name        VARCHAR(255) NOT NULL,
     created_at  TIMESTAMP(6),
-    modified_at TIMESTAMP(6)
+    modified_at TIMESTAMP(6),
+    deleted      BOOLEAN
 );
 
 CREATE TABLE checklist
@@ -39,6 +41,7 @@ CREATE TABLE checklist
     room_id       BIGINT NOT NULL UNIQUE,
     user_id       BIGINT NOT NULL,
     real_estate   VARCHAR(255),
+    deleted      BOOLEAN,
     FOREIGN KEY (room_id) REFERENCES room (id),
     FOREIGN KEY (user_id) REFERENCES users (id)
 );
@@ -50,6 +53,7 @@ CREATE TABLE checklist_option
     checklist_id BIGINT  NOT NULL,
     created_at   TIMESTAMP(6),
     modified_at  TIMESTAMP(6),
+    deleted      BOOLEAN,
     FOREIGN KEY (checklist_id) REFERENCES checklist (id)
 );
 
@@ -61,6 +65,7 @@ CREATE TABLE checklist_question
     created_at   TIMESTAMP(6),
     modified_at  TIMESTAMP(6),
     grade       VARCHAR(255),
+    deleted      BOOLEAN,
     FOREIGN KEY (checklist_id) REFERENCES checklist (id)
 );
 
@@ -71,6 +76,7 @@ CREATE TABLE if not exists category_priority
     user_id bigint not null,
     created_at TIMESTAMP not null,
     modified_at TIMESTAMP not null,
+    deleted      BOOLEAN,
     primary key (id),
     foreign key (user_id) references users
 );
@@ -82,6 +88,7 @@ CREATE TABLE test_entity
     name varchar(255) not null,
     created_at TIMESTAMP not null,
     modified_at TIMESTAMP not null,
+    deleted      BOOLEAN,
     primary key (id)
 );
 
@@ -92,5 +99,6 @@ CREATE TABLE custom_checklist_question
     question     VARCHAR(255),
     created_at    TIMESTAMP(6),
     modified_at   TIMESTAMP(6),
+    deleted      BOOLEAN,
     FOREIGN KEY (user_id) references users
 );