Merge pull request #98 from TU-NEBULA/refactor/SCRUM-240

SCRUM-240 : 기본 카테고리 설정 및 전체 조회 수정

Author: m3k0813

src/main/java/com/team_nebula/nebula/domain/category/repository/CategoryRepository.java

@@ -18,12 +18,20 @@ public interface CategoryRepository extends Neo4jRepository<Category, UUID> {
     MATCH (u:UserNode {userId: $userId})-[:GENERATED]->(c:Category)
     WHERE c.isDeletedStatus = false OR c.isDeletedStatus IS NULL
     OPTIONAL MATCH (c)<-[:BELONGS_TO]-(s:Star)
-    RETURN c.id AS id, c.name AS name, COUNT(s) AS includedStarCnt
+    WITH c, COUNT(s) AS includedStarCnt
+    RETURN c.id AS id, c.name AS name, includedStarCnt
+    ORDER BY c.created_at DESC
     """)
     List<GetCategoryOneResponseDTO> findUserCategoriesWithStarCount(@Param("userId") Long userId);
 
-    @Query("MATCH (c:Category) WHERE c.name = $name RETURN c")
-    Optional<Category> findByName(String name);
+
+    @Query("""
+    MATCH (u:UserNode {userId: $userId})-[:GENERATED]->(c:Category {name: $name})
+    WHERE c.isDeletedStatus = false OR c.isDeletedStatus IS NULL
+    RETURN c
+    LIMIT 1
+            """)
+    Optional<Category> findByNameAndUserId(String name, Long userId);
 
     @Query("""
     MATCH (c:Category)<-[:BELONGS_TO]-(s:Star{id: $starId})
@@ -41,5 +49,4 @@ RETURN c.id AS id, c.name AS name, COUNT(s) AS includedStarCnt
     """)
     String findNameByStarAndRemoveRelation(@Param("starId") UUID starId, @Param("categoryName") String categoryName);
 
-
 }

src/main/java/com/team_nebula/nebula/domain/category/service/CategoryCommandServiceImpl.java

@@ -59,20 +59,20 @@ public CreateCategoryResponseDTO createCategory(CreateCategoryRequestDTO request
 
     @Override
     public void linkStarToCategory(Star star, String categoryName, Long userId){
-        Category category = categoryRepository.findByName(categoryName)
+        Category category = categoryRepository.findByNameAndUserId(categoryName, userId)
                 .orElseGet(() -> {
-                    if (categoryName.equalsIgnoreCase("basic")) {
-                        Category basicCategory = Category.builder()
-                                .name("basic")
-                                .build();
-
-
-                        return categoryRepository.save(basicCategory);
-                    } else {
-                        throw new GeneralException(ErrorStatus._CATEGORY_NOT_FOUND);
-                    }
+                    Category newCategory = Category.builder()
+                            .name(categoryName)
+                            .build();
+                    categoryRepository.save(newCategory);
+                    
+                    UserNode userNode = userNodeRepository.findById(userId)
+                            .orElseThrow(() -> new GeneralException(ErrorStatus._USER_NOT_FOUND));
+                    userNode.getCategorySet().add(newCategory);
+                    userNodeRepository.save(userNode);
+                    
+                    return newCategory;
                 });
-
         category.getStars().add(star);
         categoryRepository.save(category);
     }

src/main/java/com/team_nebula/nebula/domain/star/service/StarCommandServiceImpl.java

@@ -274,7 +274,6 @@ public CreateStarResponseDTO createStar(Long userId, CreateStarRequestDTO reques
         userNode.getStars().add(savedStar);
         userNodeRepository.save(userNode);
 
-        // 카테고리 생성 및 유저-카테고리 관게설정
         String categoryName = Optional.ofNullable(requestDTO.getCategoryName())
                 .map(String::trim)
                 .filter(name -> !name.isEmpty())