Merge pull request #80 from Happy-HOBAK/feat/#78

[#78] 활동 검색 오류 수정 및 description 검색 추가
Happy-HOBAK · May 14, 2024 · d77fc91 · d77fc91
2 parents 45b927b + bd05d91
commit d77fc91
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/src/main/java/com/hobak/happinessql/domain/activity/application/ActivitySearchService.java b/src/main/java/com/hobak/happinessql/domain/activity/application/ActivitySearchService.java
@@ -25,7 +25,7 @@ public class ActivitySearchService {
     public ActivitySearchResponseDto searchActivities(String keyword, Long userId) {
         List<Activity> activitiesByCategory = activityRepository.findByCategoryNameContaining(keyword);
         List<Activity> activitiesByName = activityRepository.findByNameContaining(keyword);
-
+        List<Activity> activitiesByDescription = activityRepository.findByDescriptionContaining(keyword);
         Map<Long, CategoryDto> categoryDtoMap = new HashMap<>();
 
         for (Activity activity : activitiesByCategory) {
@@ -39,21 +39,32 @@ public ActivitySearchResponseDto searchActivities(String keyword, Long userId) {
 
         for (Activity activity : activitiesByName) {
             Category category = activity.getCategory();
-            if(categoryDtoMap.containsKey(category.getCategoryId())){
+            if(activitiesByCategory.contains(activity)){
                 continue;
             }
-            if(category.getUserId() == null || category.getUserId().equals(userId)){
-                CategoryDto categoryDto = categoryDtoMap.getOrDefault(category.getCategoryId(), ActivityConverter.toCategoryDto(category));
-                ActivityDto activityDto = ActivityConverter.toActivityDto(activity);
-                if (!categoryDto.getActivities().contains(activityDto)) {
-                    categoryDto.getActivities().add(activityDto);
-                }
-                categoryDtoMap.put(category.getCategoryId(), categoryDto);
+            addActivity(userId, categoryDtoMap, activity, category);
+        }
+        for(Activity activity : activitiesByDescription) {
+            Category category = activity.getCategory();
+            if(activitiesByCategory.contains(activity) || activitiesByName.contains(activity)){
+                continue;
             }
+            addActivity(userId, categoryDtoMap, activity, category);
         }
-
         return ActivityConverter
                 .toActivitySearchResponseDto(new ArrayList<>(categoryDtoMap.values()));
+
+    }
+
+    private void addActivity(Long userId, Map<Long, CategoryDto> categoryDtoMap, Activity activity, Category category) {
+        if(category.getUserId() == null || category.getUserId().equals(userId)){
+            CategoryDto categoryDto = categoryDtoMap.getOrDefault(category.getCategoryId(), ActivityConverter.toCategoryDto(category));
+            ActivityDto activityDto = ActivityConverter.toActivityDto(activity);
+            if (!categoryDto.getActivities().contains(activityDto)) {
+                categoryDto.getActivities().add(activityDto);
+            }
+            categoryDtoMap.put(category.getCategoryId(), categoryDto);
+        }
     }
 
 }
diff --git a/src/main/java/com/hobak/happinessql/domain/activity/converter/ActivityConverter.java b/src/main/java/com/hobak/happinessql/domain/activity/converter/ActivityConverter.java
@@ -18,6 +18,7 @@ public static Activity toActivity(ActivityCreateRequestDto requestDto, Category
     }
     public static ActivityDto toActivityDto(Activity activity) {
         return ActivityDto.builder()
+                .description(activity.getDescription())
                 .id(activity.getActivityId())
                 .name(activity.getName())
                 .emoji(activity.getEmoji())

diff --git a/src/main/java/com/hobak/happinessql/domain/activity/repository/ActivityRepository.java b/src/main/java/com/hobak/happinessql/domain/activity/repository/ActivityRepository.java
@@ -14,4 +14,5 @@ public interface ActivityRepository extends JpaRepository<Activity, Long> {
 
     List<Activity> findByCategoryNameContaining(String keyword);
     List<Activity> findByNameContaining(String keyword);
+    List<Activity> findByDescriptionContaining(String keyword);
 }