Skip to content

Commit

Permalink
refactor: change variable name hashTagList into insightTagList
Browse files Browse the repository at this point in the history
* 프론트엔드 측 요청에 따라 변수명을 insightTagList로 통일합니다.
  • Loading branch information
MinhoJJang committed Apr 10, 2024
1 parent 642ff31 commit e539f15
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import lombok.Builder;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand All @@ -15,18 +14,18 @@ public class InsightSearchDto {
private String insightTitle;
private String insightSummary;
private String insightMemo;
private List<String> hashTagList;
private List<String> insightTagList;
// 검색 우선순위를 위한 필드들
private transient int matchScore;

@Builder
public InsightSearchDto(Long insightId, String insightMainImage, String insightTitle, String insightSummary, String insightMemo, List<String> hashTagList) {
public InsightSearchDto(Long insightId, String insightMainImage, String insightTitle, String insightSummary, String insightMemo, List<String> 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) {
Expand All @@ -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;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public List<InsightSearchDto> searchInsight(List<Long> insightIds) {
.insightTitle(dto.getInsightTitle())
.insightSummary(dto.getInsightSummary())
.insightMemo(dto.getInsightMemo())
.hashTagList(tags) // 태그 리스트 설정
.insightTagList(tags) // 태그 리스트 설정
.build();
}).collect(Collectors.toList());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public List<InsightSimpleResponseDto> findAllInsights(Long userId, String keywor
.insightMainImage(insightSearchDto.getInsightMainImage())
.insightTitle(insightSearchDto.getInsightTitle())
.insightSummary(insightSearchDto.getInsightSummary())
.hashTagList(insightSearchDto.getHashTagList())
.insightTagList(insightSearchDto.getInsightTagList())
.build())
.collect(Collectors.toList());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class InsightCreateDto {
private String insightMemo;
private String insightSource;
private Integer viewCount;
private List<String> hashTagList;
private List<String> insightTagList;
private List<String> insightImageList;
private boolean enable;
private RemindType remindType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class InsightModifyDto {
private String insightMemo;
private String insightSource;

private List<String> hashTagList;
private List<String> insightTagList;
private List<String> insightImageList;

private boolean enable;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -23,7 +21,7 @@ public class InsightResponseDto {
private String insightMemo;
private String insightSource;
private Integer viewCount;
private List<String> hashTagList;
private List<String> insightTagList;
private List<String> insightImageList;
private boolean isEnable;
private RemindType remindType;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -22,7 +21,7 @@ public class InsightShareResponseDto {
private String insightMemo;
private String insightSource;
private Integer viewCount;
private List<String> hashTagList;
private List<String> insightTagList;
private List<String> insightImageList;

private String folderName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ public class InsightSimpleResponseDto {
private String insightMainImage;
private String insightTitle;
private String insightSummary;
private List<String> hashTagList;
private List<String> insightTagList;
}
10 changes: 5 additions & 5 deletions src/main/java/goorm/reinput/insight/service/InsightService.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public List<InsightShareResponseDto> accessSharedFolder( String token) {
.folderName(insight.getFolder().getFolderName())
.folderId(folderId)
.isCopyable(isCopyable)
.hashTagList(hashTags)
.insightTagList(hashTags)
.insightImageList(insightImages)
.build();
}).collect(Collectors.toList());
Expand Down Expand Up @@ -197,7 +197,7 @@ public void modifyInsight(Long userId, InsightModifyDto dto) {
hashTagRepository.delete(tag);
}

List<String> hashTagNameList = dto.getHashTagList();
List<String> hashTagNameList = dto.getInsightTagList();
for (String tag : hashTagNameList) {
HashTag hashTag = HashTag.builder()
.insight(insight)
Expand Down Expand Up @@ -263,7 +263,7 @@ public List<InsightSimpleResponseDto> 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());
}

Expand Down Expand Up @@ -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()).
Expand Down Expand Up @@ -354,7 +354,7 @@ public Long saveInsight(Long userId, InsightCreateDto dto) {

}

List<String> hashTagList = dto.getHashTagList();
List<String> hashTagList = dto.getInsightTagList();
for (String tag : hashTagList) {
HashTag hashTag = HashTag.builder()
.insight(insight)
Expand Down

0 comments on commit e539f15

Please sign in to comment.