Skip to content

Feat/#293 securityPath 경로 추가 및 캠핑장명 검색어 가중치 분리 #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhYun505 merged 4 commits into from
Dec 12, 2024
Merged

Feat/#293 securityPath 경로 추가 및 캠핑장명 검색어 가중치 분리 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
041d29e
feat: SecurityPath mongoDB, review경로 추가
bumstone Dec 11, 2024
8c68403
Merge branch 'dev' of https://github.com/CampingOn/CampingOn-BE into …
bumstone Dec 11, 2024
ad47ff3
feat: 자동완성 글자 2개 이상으로 수정, 정규식 전방일치 검색 추가
bumstone Dec 11, 2024
5addbe2
Merge branch 'dev' of https://github.com/CampingOn/CampingOn-BE into …
bumstone Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/site/campingon/campingon/camp/repository/mongodb/MongoSearchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,21 @@ private String createShouldClauses(String searchTerm, List<String> userKeywords)
List<String> clauses = new ArrayList<>();

if (StringUtils.hasText(searchTerm)) {
clauses.add("{text: {query: '" + searchTerm + "', path: 'name', score: {boost: {value: 5}}, fuzzy: {maxEdits: 2}}}");
clauses.add("{text: {query: '" + searchTerm + "', path: 'name', score: {boost: {value: 5}}, fuzzy: {maxEdits: 1}}}");
clauses.add("{text: {query: '" + searchTerm + "', path: 'name', score: {boost: {value: 4.5}}, fuzzy: {maxEdits: 2}}}");

clauses.add("{text: {query: '" + searchTerm + "', path: 'hashtags', score: {boost: {value: 4}}, fuzzy: {maxEdits: 1}}}");
clauses.add("{text: {query: '" + searchTerm + "', path: 'address.state', score: {boost: {value: 3}}, fuzzy: {maxEdits: 1}}}");
clauses.add("{text: {query: '" + searchTerm + "', path: 'address.city', score: {boost: {value: 2}}}}");
clauses.add("{text: {query: '" + searchTerm + "', path: 'intro', score: {boost: {value: 2}}}}");

clauses.add("{text: {query: '" + searchTerm + "', path: 'address.city', score: {boost: {value: 2.5}}}}");
clauses.add("{text: {query: '" + searchTerm + "', path: 'intro', score: {boost: {value: 2.5}}}}");

//clauses.add("{regex: {query: '" + searchTerm + "', path: 'name', allowAnalyzedField: true, score: {boost: {value: 3.5}}}}");
clauses.add("{regex: {query: '" + searchTerm + ".*', path: 'name', allowAnalyzedField: true, score: {boost: {value: 4}}}}");
}

if (userKeywords != null && !userKeywords.isEmpty()) {
for (String keyword : userKeywords) {
if (StringUtils.hasText(keyword)) {
clauses.add("{text: {query: '" + keyword + "', path: 'hashtags', score: {boost: {value: 2.5}}}}");
clauses.add("{text: {query: '" + keyword + "', path: 'hashtags', score: {boost: {value: 2}}}}");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/site/campingon/campingon/camp/service/mongodb/SearchInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public Page<CampListResponseDto> getMatchedCampsByKeywords(

// 검색어 자동완성
public List<String> getAutocompleteResults(String word) {
if (!StringUtils.hasText(word) || word.length() < 3) {
if (!StringUtils.hasText(word) || word.length() < 2) {
return new ArrayList<>();
}
return mongoSearchClient.getAutocompleteResults(word);
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/site/campingon/campingon/common/config/SecurityPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class SecurityPath {
"/api/users/check-duplicate",
"/",
"/api/mongo/camps/search",
"/api/mongo/camps/autocomplete",
"/api/camps/*/available",
"/api/camps/*"
};
Expand All @@ -26,7 +27,10 @@ public class SecurityPath {
"/api/logout",
"/api/keywords",
"/api/keywords/me",
"/api/camps/bookmarked"
"/api/camps/bookmarked",
"/api/camps/reviews/*",
"/api/camps/*/reviews",
"/api/camps/*/reviews/*"
};

// hasRole("ADMIN")
Expand Down
Loading