diff --git a/src/main/java/goorm/reinput/folder/domain/dto/InsightSearchDto.java b/src/main/java/goorm/reinput/folder/domain/dto/InsightSearchDto.java index d7964e7..e1d6272 100644 --- a/src/main/java/goorm/reinput/folder/domain/dto/InsightSearchDto.java +++ b/src/main/java/goorm/reinput/folder/domain/dto/InsightSearchDto.java @@ -2,7 +2,6 @@ import lombok.Builder; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; @@ -15,18 +14,18 @@ public class InsightSearchDto { private String insightTitle; private String insightSummary; private String insightMemo; - private List hashTagList; + private List insightTagList; // 검색 우선순위를 위한 필드들 private transient int matchScore; @Builder - public InsightSearchDto(Long insightId, String insightMainImage, String insightTitle, String insightSummary, String insightMemo, List hashTagList) { + public InsightSearchDto(Long insightId, String insightMainImage, String insightTitle, String insightSummary, String insightMemo, List insightTagList) { this.insightId = insightId; this.insightMainImage = insightMainImage; this.insightTitle = insightTitle; this.insightSummary = insightSummary; this.insightMemo = insightMemo; - this.hashTagList = hashTagList; + this.insightTagList = insightTagList; } public void calculateMatchScores(String searchKeyword) { @@ -50,7 +49,7 @@ public void calculateMatchScores(String searchKeyword) { } // 태그 목록 중 하나라도 검색어를 포함하고 있으면 2점 추가 - if (this.hashTagList != null && this.hashTagList.stream().anyMatch(tag -> tag.toLowerCase().contains(keywordLowerCase))) { + if (this.insightTagList != null && this.insightTagList.stream().anyMatch(tag -> tag.toLowerCase().contains(keywordLowerCase))) { this.matchScore += 2; } } diff --git a/src/main/java/goorm/reinput/folder/repository/CustomFolderRepository.java b/src/main/java/goorm/reinput/folder/repository/CustomFolderRepository.java index 0e2d77f..4625014 100644 --- a/src/main/java/goorm/reinput/folder/repository/CustomFolderRepository.java +++ b/src/main/java/goorm/reinput/folder/repository/CustomFolderRepository.java @@ -130,7 +130,7 @@ public List searchInsight(List insightIds) { .insightTitle(dto.getInsightTitle()) .insightSummary(dto.getInsightSummary()) .insightMemo(dto.getInsightMemo()) - .hashTagList(tags) // 태그 리스트 설정 + .insightTagList(tags) // 태그 리스트 설정 .build(); }).collect(Collectors.toList()); } diff --git a/src/main/java/goorm/reinput/folder/service/FolderService.java b/src/main/java/goorm/reinput/folder/service/FolderService.java index 7235c43..45afb49 100644 --- a/src/main/java/goorm/reinput/folder/service/FolderService.java +++ b/src/main/java/goorm/reinput/folder/service/FolderService.java @@ -210,7 +210,7 @@ public List findAllInsights(Long userId, String keywor .insightMainImage(insightSearchDto.getInsightMainImage()) .insightTitle(insightSearchDto.getInsightTitle()) .insightSummary(insightSearchDto.getInsightSummary()) - .hashTagList(insightSearchDto.getHashTagList()) + .insightTagList(insightSearchDto.getInsightTagList()) .build()) .collect(Collectors.toList()); } diff --git a/src/main/java/goorm/reinput/insight/domain/dto/InsightCreateDto.java b/src/main/java/goorm/reinput/insight/domain/dto/InsightCreateDto.java index f98171f..ecddebb 100644 --- a/src/main/java/goorm/reinput/insight/domain/dto/InsightCreateDto.java +++ b/src/main/java/goorm/reinput/insight/domain/dto/InsightCreateDto.java @@ -18,7 +18,7 @@ public class InsightCreateDto { private String insightMemo; private String insightSource; private Integer viewCount; - private List hashTagList; + private List insightTagList; private List insightImageList; private boolean enable; private RemindType remindType; diff --git a/src/main/java/goorm/reinput/insight/domain/dto/InsightModifyDto.java b/src/main/java/goorm/reinput/insight/domain/dto/InsightModifyDto.java index 1aa390b..b7a6228 100644 --- a/src/main/java/goorm/reinput/insight/domain/dto/InsightModifyDto.java +++ b/src/main/java/goorm/reinput/insight/domain/dto/InsightModifyDto.java @@ -21,7 +21,7 @@ public class InsightModifyDto { private String insightMemo; private String insightSource; - private List hashTagList; + private List insightTagList; private List insightImageList; private boolean enable; diff --git a/src/main/java/goorm/reinput/insight/domain/dto/InsightResponseDto.java b/src/main/java/goorm/reinput/insight/domain/dto/InsightResponseDto.java index 7ec6e15..6d2cee2 100644 --- a/src/main/java/goorm/reinput/insight/domain/dto/InsightResponseDto.java +++ b/src/main/java/goorm/reinput/insight/domain/dto/InsightResponseDto.java @@ -1,7 +1,5 @@ package goorm.reinput.insight.domain.dto; -import goorm.reinput.insight.domain.HashTag; -import goorm.reinput.insight.domain.InsightImage; import goorm.reinput.reminder.domain.RemindType; import goorm.reinput.reminder.domain.ReminderQuestion; import lombok.*; @@ -23,7 +21,7 @@ public class InsightResponseDto { private String insightMemo; private String insightSource; private Integer viewCount; - private List hashTagList; + private List insightTagList; private List insightImageList; private boolean isEnable; private RemindType remindType; diff --git a/src/main/java/goorm/reinput/insight/domain/dto/InsightShareResponseDto.java b/src/main/java/goorm/reinput/insight/domain/dto/InsightShareResponseDto.java index 5bc3e8d..f2880bf 100644 --- a/src/main/java/goorm/reinput/insight/domain/dto/InsightShareResponseDto.java +++ b/src/main/java/goorm/reinput/insight/domain/dto/InsightShareResponseDto.java @@ -1,6 +1,5 @@ package goorm.reinput.insight.domain.dto; -import goorm.reinput.reminder.domain.RemindType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -22,7 +21,7 @@ public class InsightShareResponseDto { private String insightMemo; private String insightSource; private Integer viewCount; - private List hashTagList; + private List insightTagList; private List insightImageList; private String folderName; diff --git a/src/main/java/goorm/reinput/insight/domain/dto/InsightSimpleResponseDto.java b/src/main/java/goorm/reinput/insight/domain/dto/InsightSimpleResponseDto.java index 988a2f6..ba755e3 100644 --- a/src/main/java/goorm/reinput/insight/domain/dto/InsightSimpleResponseDto.java +++ b/src/main/java/goorm/reinput/insight/domain/dto/InsightSimpleResponseDto.java @@ -14,5 +14,5 @@ public class InsightSimpleResponseDto { private String insightMainImage; private String insightTitle; private String insightSummary; - private List hashTagList; + private List insightTagList; } diff --git a/src/main/java/goorm/reinput/insight/service/InsightService.java b/src/main/java/goorm/reinput/insight/service/InsightService.java index 15bebf4..8165c41 100644 --- a/src/main/java/goorm/reinput/insight/service/InsightService.java +++ b/src/main/java/goorm/reinput/insight/service/InsightService.java @@ -126,7 +126,7 @@ public List accessSharedFolder( String token) { .folderName(insight.getFolder().getFolderName()) .folderId(folderId) .isCopyable(isCopyable) - .hashTagList(hashTags) + .insightTagList(hashTags) .insightImageList(insightImages) .build(); }).collect(Collectors.toList()); @@ -197,7 +197,7 @@ public void modifyInsight(Long userId, InsightModifyDto dto) { hashTagRepository.delete(tag); } - List hashTagNameList = dto.getHashTagList(); + List hashTagNameList = dto.getInsightTagList(); for (String tag : hashTagNameList) { HashTag hashTag = HashTag.builder() .insight(insight) @@ -263,7 +263,7 @@ public List getInsightList(Long userId, Long folderId) ht.add(h.getHashTagName()); } - return InsightSimpleResponseDto.builder().insightId(insight.getInsightId()).insightSummary(insight.getInsightSummary()).insightTitle(insight.getInsightTitle()).insightMainImage(insight.getInsightMainImage()).hashTagList(ht).build(); + return InsightSimpleResponseDto.builder().insightId(insight.getInsightId()).insightSummary(insight.getInsightSummary()).insightTitle(insight.getInsightTitle()).insightMainImage(insight.getInsightMainImage()).insightTagList(ht).build(); }).collect(Collectors.toList()); } @@ -306,7 +306,7 @@ public InsightResponseDto getInsightDetail(Long userId, Long insightId) { insightMemo(insight.getInsightMemo()). insightSource(insight.getInsightSource()). viewCount(insight.getViewCount()). - hashTagList(hashTagNameList). + insightTagList(hashTagNameList). insightImageList(insightImageNameList). isEnable(reminder.getIsEnable()). folderName(folder.getFolderName()).folderId(folder.getFolderId()). @@ -354,7 +354,7 @@ public Long saveInsight(Long userId, InsightCreateDto dto) { } - List hashTagList = dto.getHashTagList(); + List hashTagList = dto.getInsightTagList(); for (String tag : hashTagList) { HashTag hashTag = HashTag.builder() .insight(insight)