Merge branch 'develop'

The-Monitor-Dev · Nov 26, 2024 · 3f65d42 · 3f65d42
2 parents 897927f + de33cc1
commit 3f65d42
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/the_monitor/application/dto/response/KeywordAndIdResponse.java b/src/main/java/the_monitor/application/dto/response/KeywordAndIdResponse.java
@@ -3,20 +3,24 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import the_monitor.domain.enums.CategoryType;
 
 @Getter
 @NoArgsConstructor
 public class KeywordAndIdResponse {
 
     private Long keywordId;
     private String keywordName;
+    private CategoryType categoryType;
 
     @Builder
     public KeywordAndIdResponse(Long keywordId,
-                                String keywordName) {
+                                String keywordName,
+                                CategoryType categoryType) {
 
         this.keywordId = keywordId;
         this.keywordName = keywordName;
+        this.categoryType = categoryType;
 
     }
 

diff --git a/src/main/java/the_monitor/application/serviceImpl/KeywordServiceImpl.java b/src/main/java/the_monitor/application/serviceImpl/KeywordServiceImpl.java
@@ -123,6 +123,7 @@ private List<KeywordAndIdResponse> getSELFKeywordAndIdResponses(List<Keyword> ke
                 .map(keyword -> KeywordAndIdResponse.builder()
                         .keywordId(keyword.getId())
                         .keywordName(keyword.getKeyword())
+                        .categoryType(CategoryType.SELF)
                         .build())
                 .toList();
     }
@@ -133,6 +134,7 @@ private List<KeywordAndIdResponse> getCOMPETITORKeywordAndIdResponses(List<Keywo
                 .map(keyword -> KeywordAndIdResponse.builder()
                         .keywordId(keyword.getId())
                         .keywordName(keyword.getKeyword())
+                        .categoryType(CategoryType.COMPETITOR)
                         .build())
                 .toList();
     }
@@ -143,6 +145,7 @@ private List<KeywordAndIdResponse> getINDUSTRYKeywordAndIdResponses(List<Keyword
                 .map(keyword -> KeywordAndIdResponse.builder()
                         .keywordId(keyword.getId())
                         .keywordName(keyword.getKeyword())
+                        .categoryType(CategoryType.INDUSTRY)
                         .build())
                 .toList();
     }