Merge pull request #141 from Link-MIND/test

[Merge] delete category merge
Link-MIND · Jan 17, 2024 · 7d7ff7e · 7d7ff7e
2 parents d491ba2 + 7156d48
commit 7d7ff7e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/linkmind/src/main/java/com/app/toaster/controller/CategoryController.java b/linkmind/src/main/java/com/app/toaster/controller/CategoryController.java
@@ -11,11 +11,13 @@
 import com.app.toaster.service.category.CategoryService;
 import com.app.toaster.service.search.SearchService;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -41,7 +43,7 @@ public ApiResponse createCateory(
     @ResponseStatus(HttpStatus.OK)
     public ApiResponse deleteCategory(
             @UserId Long userId,
-            @RequestBody DeleteCategoryDto deleteCategoryDto
+            @NotNull @RequestParam(value = "deleteCategoryDto") ArrayList<Long> deleteCategoryDto
     ){
         categoryService.deleteCategory(deleteCategoryDto);
         return ApiResponse.success(Success.DELETE_CATEGORY_SUCCESS);

diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java b/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java
@@ -12,6 +12,7 @@
 import com.app.toaster.domain.Toast;
 import com.app.toaster.domain.User;
 import com.app.toaster.exception.Error;
+import com.app.toaster.exception.model.BadRequestException;
 import com.app.toaster.exception.model.CustomException;
 import com.app.toaster.exception.model.NotFoundException;
 import com.app.toaster.infrastructure.CategoryRepository;
@@ -63,11 +64,14 @@ public void createCategory(final Long userId, final CreateCategoryDto createCate
     }
 
     @Transactional
-    public void deleteCategory(final DeleteCategoryDto deleteCategoryDto){
+    public void deleteCategory(final ArrayList<Long> deleteCategoryDto){
+        if(deleteCategoryDto.isEmpty()){
+            throw new BadRequestException(Error.BAD_REQUEST_VALIDATION, Error.BAD_REQUEST_VALIDATION.getMessage());
+        }
 
-        toastRepository.updateCategoryIdsToNull(deleteCategoryDto.deleteCategoryList());
+        toastRepository.updateCategoryIdsToNull(deleteCategoryDto);
 
-        for (Long categoryId : deleteCategoryDto.deleteCategoryList()) {
+        for (Long categoryId : deleteCategoryDto) {
             Category category = categoryRepository.findById(categoryId)
                     .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_CATEGORY_EXCEPTION, Error.NOT_FOUND_CATEGORY_EXCEPTION.getMessage()));