Skip to content

Commit

Permalink
Merge branch 'IT-Pick:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
minseok1015 authored Aug 19, 2024
2 parents bfda473 + 6e51de0 commit 007543a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/java/store/itpick/backend/config/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers)
public void addCorsMappings(CorsRegistry registry) {
log.info("CorsMapping이 호출 되었습니다.");
registry.addMapping("/**")
.allowedOrigins("http://localhost:3000", "http://localhost:5173", "https://localhost:5173", "https://itpick.netlify.app","https://itpick.vercel.app")
.allowedOrigins("http://localhost:3000", "http://localhost:5173", "https://localhost:5173", "https://itpick.netlify.app","https://itpick.vercel.app","https://deploy-preview-85--itpick.netlify.app")
.allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH","OPTIONS")
.exposedHeaders("location", "Authorization")
.allowedHeaders("Content-Type", "Authorization", "X-Requested-With", "Accept")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ Optional<Keyword> findTop1ByKeywordAndCommunityOrderByUpdatedAtDesc(@Param("keyw
/** 검색할때 사용하는 JPA **/
List<Keyword> findByKeywordStartingWithIgnoreCase(String substring);

List<Keyword> findByKeywordContainingIgnoreCase(String substring);


}
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public List<String> searchKeywords(String keyword) {
}

public List<SearchDTO> searchKeywordsWithBadge(String keyword) {
List<Keyword> keywordList= keywordRepository.findByKeywordStartingWithIgnoreCase(keyword);
List<Keyword> keywordList= keywordRepository.findByKeywordContainingIgnoreCase(keyword);
List<String> keywords= new ArrayList<>();
for (Keyword keyword1 : keywordList) {
keywords.add(keyword1.getKeyword());
Expand Down

0 comments on commit 007543a

Please sign in to comment.