From f186d61a18183c6c9e3c0572039e8f99a36ee196 Mon Sep 17 00:00:00 2001 From: aeyongdodam Date: Thu, 1 Feb 2024 06:37:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#105=20fix:=20counselor=20all=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20Security=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/sharemind/global/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/sharemind/global/config/SecurityConfig.java b/src/main/java/com/example/sharemind/global/config/SecurityConfig.java index 29aa2e87..d7c93317 100644 --- a/src/main/java/com/example/sharemind/global/config/SecurityConfig.java +++ b/src/main/java/com/example/sharemind/global/config/SecurityConfig.java @@ -51,7 +51,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti requests -> requests.requestMatchers("/error", "/swagger-ui/**", "/api-docs/**", "/api/v1/auth/signUp", "/api/v1/auth/signIn", "/api/v1/auth/reissue", "/api/v1/emails/**").permitAll() - .requestMatchers("/api/v1/counselors/all**", "/api/v1/searchWords/results**").permitAll() + .requestMatchers("/api/v1/counselors/all/**", "/api/v1/searchWords/results").permitAll() .requestMatchers("/index.html", "/favicon.ico", "/chat/**", "/customer.html", "/counselor.html").permitAll() .requestMatchers("/api/v1/admins/**").hasRole(ROLE_ADMIN) From 9ae8b6cd964f8a6793cf06ef255efa8e5454a273 Mon Sep 17 00:00:00 2001 From: aeyongdodam Date: Thu, 1 Feb 2024 06:37:42 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#105=20fix:=20jwt=EC=97=86=EC=9D=B4=20?= =?UTF-8?q?=EC=A0=91=EA=B7=BC=ED=95=98=EC=98=80=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/SearchWordService.java | 8 ++++++-- .../application/SearchWordServiceImpl.java | 17 +++++++++++++++-- .../presentation/SearchWordController.java | 4 +++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/sharemind/searchWord/application/SearchWordService.java b/src/main/java/com/example/sharemind/searchWord/application/SearchWordService.java index f5de11c3..a9a813e3 100644 --- a/src/main/java/com/example/sharemind/searchWord/application/SearchWordService.java +++ b/src/main/java/com/example/sharemind/searchWord/application/SearchWordService.java @@ -3,12 +3,16 @@ import com.example.sharemind.counselor.dto.response.CounselorGetListResponse; import com.example.sharemind.searchWord.dto.request.SearchWordDeleteRequest; import com.example.sharemind.searchWord.dto.request.SearchWordFindRequest; + import java.util.List; public interface SearchWordService { - List storeSearchWordAndGetCounselors(Long customerId, String sortType, - SearchWordFindRequest searchWordFindRequest); + List storeSearchWordAndGetCounselorsByCustomer(Long customerId, String sortType, + SearchWordFindRequest searchWordFindRequest); + + List storeAllSearchWordAndGetCounselors(String sortType, + SearchWordFindRequest searchWordFindRequest); List getRecentSearchWordsByCustomer(Long customerId); diff --git a/src/main/java/com/example/sharemind/searchWord/application/SearchWordServiceImpl.java b/src/main/java/com/example/sharemind/searchWord/application/SearchWordServiceImpl.java index 01bb199f..a8d5183b 100644 --- a/src/main/java/com/example/sharemind/searchWord/application/SearchWordServiceImpl.java +++ b/src/main/java/com/example/sharemind/searchWord/application/SearchWordServiceImpl.java @@ -34,8 +34,8 @@ public class SearchWordServiceImpl implements SearchWordService { @Transactional @Override - public List storeSearchWordAndGetCounselors(Long customerId, String sortType, - SearchWordFindRequest searchWordFindRequest) { + public List storeSearchWordAndGetCounselorsByCustomer(Long customerId, String sortType, + SearchWordFindRequest searchWordFindRequest) { storeSearchWordInRedis(customerId, searchWordFindRequest.getWord()); storeSearchWordInDB(searchWordFindRequest.getWord()); @@ -50,6 +50,19 @@ public List storeSearchWordAndGetCounselors(Long custo .toList(); } + @Transactional + @Override + public List storeAllSearchWordAndGetCounselors(String sortType, + SearchWordFindRequest searchWordFindRequest) { + storeSearchWordInDB(searchWordFindRequest.getWord()); + + List counselors = counselorService.getCounselorByWordWithPagination(searchWordFindRequest, sortType); + + return counselors.stream() + .map(counselor -> CounselorGetListResponse.of(counselor, false)) + .toList(); + } + @Transactional @Override public void storeSearchWordInDB(String word) { diff --git a/src/main/java/com/example/sharemind/searchWord/presentation/SearchWordController.java b/src/main/java/com/example/sharemind/searchWord/presentation/SearchWordController.java index 6098de26..1caf2670 100644 --- a/src/main/java/com/example/sharemind/searchWord/presentation/SearchWordController.java +++ b/src/main/java/com/example/sharemind/searchWord/presentation/SearchWordController.java @@ -65,8 +65,10 @@ public ResponseEntity> getSearchWordResults( if (searchWordFindRequest.getIndex() < 0) { return ResponseEntity.ok(Collections.emptyList()); } + if (customUserDetails == null) + return ResponseEntity.ok(searchWordService.storeAllSearchWordAndGetCounselors(sortType, searchWordFindRequest)); return ResponseEntity.ok( - searchWordService.storeSearchWordAndGetCounselors(customUserDetails.getCustomer().getCustomerId(), + searchWordService.storeSearchWordAndGetCounselorsByCustomer(customUserDetails.getCustomer().getCustomerId(), sortType, searchWordFindRequest)); }