Merge pull request #106 from sharemindteam/fix/105-searchword-all

fix: searchword jwt 인증 부분 해결
sharemindteam · Jan 31, 2024 · 4d636e6 · 4d636e6
2 parents 1f09511 + 9ae8b6c
commit 4d636e6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git 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)

diff --git 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<CounselorGetListResponse> storeSearchWordAndGetCounselors(Long customerId, String sortType,
-                                                                   SearchWordFindRequest searchWordFindRequest);
+    List<CounselorGetListResponse> storeSearchWordAndGetCounselorsByCustomer(Long customerId, String sortType,
+                                                                             SearchWordFindRequest searchWordFindRequest);
+
+    List<CounselorGetListResponse> storeAllSearchWordAndGetCounselors(String sortType,
+                                                                      SearchWordFindRequest searchWordFindRequest);
 
     List<String> 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
@@ -34,8 +34,8 @@ public class SearchWordServiceImpl implements SearchWordService {
 
     @Transactional
     @Override
-    public List<CounselorGetListResponse> storeSearchWordAndGetCounselors(Long customerId, String sortType,
-                                                                          SearchWordFindRequest searchWordFindRequest) {
+    public List<CounselorGetListResponse> storeSearchWordAndGetCounselorsByCustomer(Long customerId, String sortType,
+                                                                                    SearchWordFindRequest searchWordFindRequest) {
         storeSearchWordInRedis(customerId, searchWordFindRequest.getWord());
         storeSearchWordInDB(searchWordFindRequest.getWord());
 
@@ -50,6 +50,19 @@ public List<CounselorGetListResponse> storeSearchWordAndGetCounselors(Long custo
                 .toList();
     }
 
+    @Transactional
+    @Override
+    public List<CounselorGetListResponse> storeAllSearchWordAndGetCounselors(String sortType,
+                                                                          SearchWordFindRequest searchWordFindRequest) {
+        storeSearchWordInDB(searchWordFindRequest.getWord());
+
+        List<Counselor> 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
@@ -65,8 +65,10 @@ public ResponseEntity<List<CounselorGetListResponse>> 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));
     }