diff --git a/src/main/java/com/ftm/server/application/service/post/LoadPostHashTagsService.java b/src/main/java/com/ftm/server/application/service/post/LoadPostHashTagsService.java index 1f3c642..bf40a7c 100644 --- a/src/main/java/com/ftm/server/application/service/post/LoadPostHashTagsService.java +++ b/src/main/java/com/ftm/server/application/service/post/LoadPostHashTagsService.java @@ -21,15 +21,17 @@ public List execute() { Arrays.stream(PostHashtag.values()) .collect(Collectors.groupingBy(PostHashtag::getCategory)); - return hashtagGroup.entrySet().stream() + return Arrays.stream(HashtagCategory.values()) .map( - entry -> { - HashtagCategoryDetailVo category = - HashtagCategoryDetailVo.of(entry.getKey()); - List hashtags = - entry.getValue().stream().map(PostHashTagVo::of).toList(); + category -> { + HashtagCategoryDetailVo categoryDetailVo = + HashtagCategoryDetailVo.of(category); + List hashTagVos = + hashtagGroup.getOrDefault(category, List.of()).stream() + .map(PostHashTagVo::of) + .toList(); - return PostHashTagDetailVo.of(category, hashtags); + return PostHashTagDetailVo.of(categoryDetailVo, hashTagVos); }) .toList(); }