Merge pull request #107 from prgrms-be-devcourse/feature/NAYB-8

[NAYB-8] 관리자는 상품을 삭제할 수 있다.
prgrms-be-devcourse · Sep 15, 2023 · b0c598e · b0c598e
2 parents 2d8d68d + f968fbe
commit b0c598e
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 7 deletions.
diff --git a/src/main/java/com/prgrms/nabmart/domain/item/Item.java b/src/main/java/com/prgrms/nabmart/domain/item/Item.java
@@ -6,7 +6,6 @@
 import com.prgrms.nabmart.domain.order.OrderItem;
 import com.prgrms.nabmart.domain.review.Review;
 import com.prgrms.nabmart.global.BaseTimeEntity;
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -23,10 +22,14 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 @Getter
 @Entity
+@Where(clause = "is_deleted = false")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@SQLDelete(sql = "UPDATE item SET is_deleted = true WHERE item_id = ?")
 public class Item extends BaseTimeEntity {
 
     @Id
@@ -64,13 +67,16 @@ public class Item extends BaseTimeEntity {
     @JoinColumn(name = "sub_category_id")
     private SubCategory subCategory;
 
-    @OneToMany(mappedBy = "item", cascade = CascadeType.REMOVE)
+    @Column(nullable = false)
+    private boolean isDeleted = Boolean.FALSE;
+
+    @OneToMany(mappedBy = "item")
     private List<Review> reviews = new ArrayList<>();
 
-    @OneToMany(mappedBy = "item", cascade = CascadeType.REMOVE)
+    @OneToMany(mappedBy = "item")
     private List<LikeItem> likeItems = new ArrayList<>();
 
-    @OneToMany(mappedBy = "item", cascade = CascadeType.REMOVE)
+    @OneToMany(mappedBy = "item")
     private List<OrderItem> orderItems = new ArrayList<>();
 
     @Builder

diff --git a/src/main/java/com/prgrms/nabmart/domain/item/controller/ItemController.java b/src/main/java/com/prgrms/nabmart/domain/item/controller/ItemController.java
@@ -16,6 +16,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -109,4 +110,10 @@ public ResponseEntity<Void> saveItem(
         URI location = URI.create(BASE_URI + savedItemId);
         return ResponseEntity.created(location).build();
     }
+
+    @DeleteMapping("/{itemId}")
+    public ResponseEntity<Void> deleteItem(@PathVariable Long itemId) {
+        itemService.deleteById(itemId);
+        return ResponseEntity.noContent().build();
+    }
 }
diff --git a/src/main/java/com/prgrms/nabmart/domain/item/service/ItemService.java b/src/main/java/com/prgrms/nabmart/domain/item/service/ItemService.java
@@ -113,6 +113,11 @@ public void updateItem(UpdateItemCommand updateItemCommand) {
             mainCategory, subCategory, updateItemCommand.discount());
     }
 
+    @Transactional
+    public void deleteById(Long itemId) {
+        itemRepository.deleteById(itemId);
+    }
+
     private SubCategory getSubCategoryById(Long subCategoryId) {
         SubCategory subCategory = null;
         if (subCategoryId != null) {

diff --git a/src/test/java/com/prgrms/nabmart/domain/delivery/DeliveryIntegrationTest.java b/src/test/java/com/prgrms/nabmart/domain/delivery/DeliveryIntegrationTest.java
@@ -21,6 +21,9 @@
 import com.prgrms.nabmart.domain.user.User;
 import com.prgrms.nabmart.domain.user.repository.UserRepository;
 import com.prgrms.nabmart.domain.user.support.UserFixture;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
@@ -66,6 +69,9 @@ public class DeliveryIntegrationTest {
     @Autowired
     RiderRepository riderRepository;
 
+    @Autowired
+    EntityManagerFactory emf;
+
     @BeforeAll
     static void beforeAll() {
         Properties properties = System.getProperties();
@@ -140,7 +146,11 @@ void tearDown() {
             deliveryRepository.deleteAll();
             riderRepository.deleteAll();
             orderRepository.deleteAll();
-            itemRepository.deleteAll();
+            EntityManager em = emf.createEntityManager();
+            EntityTransaction tx = em.getTransaction();
+            tx.begin();
+            em.createQuery("delete from Item").executeUpdate(); // 소프트 딜리트 아이템 강제 삭제
+            tx.commit();
             subCategoryRepository.deleteAll();
             mainCategoryRepository.deleteAll();
         }

diff --git a/src/test/java/com/prgrms/nabmart/domain/item/controller/ItemControllerTest.java b/src/test/java/com/prgrms/nabmart/domain/item/controller/ItemControllerTest.java
@@ -4,6 +4,7 @@
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.patch;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
@@ -297,13 +298,11 @@ public void updateItem() throws Exception {
 
     }
 
-
     @Nested
     @DisplayName("상품 등록 api 호출 시")
     class SaveItem {
 
         RegisterItemRequest registerItemRequest = ItemFixture.registerItemRequest();
-        Long ITEM_ID = 1L;
 
         @Test
         @DisplayName("성공")
@@ -341,4 +340,30 @@ public void registerItem() throws Exception {
                 );
         }
     }
+
+    @Nested
+    @DisplayName("상품 삭제 api 호출 시")
+    class DeleteItem {
+
+        private static final Long ITEM_ID = 1L;
+
+        @Test
+        @DisplayName("성공")
+        public void deleteItem() throws Exception {
+
+            // When
+            ResultActions resultActions = mockMvc.perform(
+                delete("/api/v1/items/{itemId}", ITEM_ID)
+                    .contentType(MediaType.APPLICATION_JSON));
+
+            // Then
+            resultActions.andExpect(status().isNoContent())
+                .andDo(document(
+                    "Delete Item",
+                    pathParameters(
+                        parameterWithName("itemId").description("상품 ID")
+                    ))
+                );
+        }
+    }
 }
diff --git a/src/test/java/com/prgrms/nabmart/domain/item/repository/ItemRepositoryTest.java b/src/test/java/com/prgrms/nabmart/domain/item/repository/ItemRepositoryTest.java
@@ -9,10 +9,12 @@
 import com.prgrms.nabmart.domain.category.repository.MainCategoryRepository;
 import com.prgrms.nabmart.domain.category.repository.SubCategoryRepository;
 import com.prgrms.nabmart.domain.item.Item;
+import com.prgrms.nabmart.domain.item.support.ItemFixture;
 import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -127,6 +129,29 @@ public void findByPriceLessThanAndMainCategoryOrderByPriceDescItemIdDesc() {
             assertThat(items.size()).isEqualTo(5);
         }
 
+        @Test
+        @DisplayName("삭제된 아이템은 조회되지 않는다.")
+        public void deletedItemIsNotSearch() {
+            //Given
+            mainCategoryRepository.save(mainCategory);
+            subCategoryRepository.save(subCategory);
+            for (int i = 0; i < 50; i++) {
+                Item item = new Item("item" + (i + 1), (int) (Math.random() * 1000), "0", 0, 0, 0,
+                    mainCategory,
+                    subCategory);
+                itemRepository.save(item);
+            }
+            for (long i = 1; i <= 30; i++) {
+                itemRepository.deleteById(i);
+            }
+
+            // When
+            List<Item> items = itemRepository.findAll();
+
+            // Then
+            assertThat(items.size()).isEqualTo(20);
+        }
+
         @Test
         @DisplayName("금액 낮은 순으로 조회된다.")
         public void findByPriceGreaterThanAndMainCategoryOrderByPriceAscItemIdDesc() {
@@ -149,4 +174,21 @@ public void findByPriceGreaterThanAndMainCategoryOrderByPriceAscItemIdDesc() {
             assertThat(items.size()).isEqualTo(5);
         }
     }
+
+    @Test
+    @DisplayName("아이템 삭제 시, 아이템 조회가 안된다.")
+    public void deleteItem() {
+        // Given
+        MainCategory mainCategory = new MainCategory("main");
+        SubCategory subCategory = new SubCategory(mainCategory, "sub");
+        Item item = ItemFixture.item(mainCategory, subCategory);
+        Item savedItem = itemRepository.save(item);
+
+        // When
+        itemRepository.deleteById(savedItem.getItemId());
+
+        // Then
+        Optional<Item> findItem = itemRepository.findByItemId(savedItem.getItemId());
+        assertThat(findItem.isEmpty()).isEqualTo(true);
+    }
 }