Merge pull request #149 from YAPP-Github/fix/143

YAPP-Github · Jun 1, 2023 · de64beb · de64beb
2 parents 208c29c + 9c997e1
commit de64beb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java b/src/main/java/com/yapp/artie/domain/archive/service/CategoryService.java
@@ -40,13 +40,10 @@ public Category findCategoryWithUser(Long id, Long userId) {
   }
 
   public List<CategoryDto> categoriesOf(Long userId) {
-    UserJpaEntity user = findUser(userId);
-    List<CategoryDto> categories = categoryRepository.findCategoriesByUserOrderBySequence(user)
-        .stream().map(this::buildCategoryDto).collect(
-            Collectors.toList());
-    validateExistAtLeastOneCategory(categories);
-
-    return categories;
+    return categoryRepository.findCategoriesByUserOrderBySequence(findUser(userId))
+        .stream()
+        .map(this::buildCategoryDto)
+        .collect(Collectors.toList());
   }
 
   @Transactional
@@ -110,12 +107,6 @@ private int getSequence(UserJpaEntity user) {
     return categoryRepository.countCategoriesByUser(user);
   }
 
-  private void validateExistAtLeastOneCategory(List<CategoryDto> categories) {
-    if (categories.size() == 0) {
-      throw new CategoryNotFoundException();
-    }
-  }
-
   private void validateDuplicateCategory(String name, UserJpaEntity user) {
     List<CategoryDto> categories = categoryRepository.findCategoryDto(user);
     long count = categories.stream()

diff --git a/src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java b/src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java
@@ -139,10 +139,9 @@ private Category findCategory(Long id) {
   }
 
   @Test
-  public void categoriesOf_카테고리가_하나도_존재하지_않으면_예외를_발생한다() throws Exception {
-    assertThatThrownBy(() -> {
-      categoryService.categoriesOf(findUser("1").getId());
-    }).isInstanceOf(CategoryNotFoundException.class);
+  public void categoriesOf_카테고리가_하나도_존재하지_않는다면_빈_리스트를_반환한다() throws Exception {
+    List<CategoryDto> actual = categoryService.categoriesOf(findUser("1").getId());
+    assertThat(actual.size()).isEqualTo(0);
   }
 
   @Test