️refactor: 검색 api, 검색어 저장 api 분리 (#323)

* refactor: 검색어 저장 api 분리

* feat: 검색어 전체 삭제 구현

* refactor: 중복 검색어 처리 변경

Author: seheonnn

api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java

@@ -23,6 +23,7 @@
 import com.sponus.sponusbe.domain.organization.company.dto.OrganizationGetResponse;
 import com.sponus.sponusbe.domain.organization.dto.OrganizationCreateRequest;
 import com.sponus.sponusbe.domain.organization.dto.OrganizationImageUploadResponse;
+import com.sponus.sponusbe.domain.organization.dto.OrganizationSearchRequest;
 import com.sponus.sponusbe.domain.organization.dto.OrganizationSearchResponse;
 import com.sponus.sponusbe.domain.organization.service.OrganizationService;
 
@@ -68,13 +69,26 @@ public ApiResponse<Void> deleteOrganization(@PathVariable Long organizationId) {
 	@GetMapping("/search")
 	public ApiResponse<PageResponse<OrganizationSearchResponse>> searchOrganization(
 		@ModelAttribute @Valid PageCondition pageCondition,
-		@RequestParam("search") String keyword,
+		@RequestParam("keyword") String keyword,
 		@AuthOrganization Organization organization
 	) {
 		return ApiResponse.onSuccess(
 			organizationService.searchOrganizations(pageCondition, keyword, organization.getId()));
 	}
 
+	@DeleteMapping("/search")
+	public ApiResponse<Void> deleteAllSearchKeyword(@AuthOrganization Organization organization) {
+		organizationService.deleteAllSearchKeyword(organization.getId());
+		return ApiResponse.onSuccess(null);
+	}
+
+	@PostMapping("/search/keywords")
+	public ApiResponse<Void> createSearchHistory(@AuthOrganization Organization organization,
+		@RequestBody @Valid OrganizationSearchRequest request) {
+		organizationService.createSearchHistory(organization.getId(), request.keyword());
+		return ApiResponse.onSuccess(null);
+	}
+
 	@GetMapping("/search/keywords")
 	public ApiResponse<List<String>> getSearchHistory(@AuthOrganization Organization organization) {
 		return ApiResponse.onSuccess(organizationService.getSearchHistory(organization.getId()));
@@ -83,9 +97,9 @@ public ApiResponse<List<String>> getSearchHistory(@AuthOrganization Organization
 	@DeleteMapping("/search/keywords")
 	public ApiResponse<Void> deleteSearchKeyword(
 		@AuthOrganization Organization organization,
-		@RequestParam("keyword") String keyword
+		@RequestBody @Valid OrganizationSearchRequest request
 	) {
-		organizationService.deleteSearchKeyword(organization.getId(), keyword);
+		organizationService.deleteSearchKeyword(organization.getId(), request.keyword());
 		return ApiResponse.onSuccess(null);
 	}
 }

api/src/main/java/com/sponus/sponusbe/domain/organization/dto/OrganizationSearchRequest.java

@@ -0,0 +1,10 @@
+package com.sponus.sponusbe.domain.organization.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record OrganizationSearchRequest(
+
+	@NotBlank(message = "[ERROR] 검색어 입력은 필수 입니다.")
+	String keyword
+) {
+}

api/src/main/java/com/sponus/sponusbe/domain/organization/service/OrganizationService.java

@@ -89,15 +89,12 @@ public PageResponse<OrganizationGetResponse> getOrganizations(
 	public PageResponse<OrganizationSearchResponse> searchOrganizations(PageCondition pageCondition, String keyword,
 		Long organizationId) {
 
-		SearchHistory searchHistory = findSearchHistory(organizationId);
-		searchHistory.getKeywords().add(keyword);
-		searchHistoryRepository.save(searchHistory);
-
 		Pageable pageable = PageRequest.of(pageCondition.getPage() - 1, pageCondition.getSize());
 		List<OrganizationSearchResponse> organizations = organizationRepository.findByNameContains(
 				keyword, pageable)
 			.stream()
 			.filter(organization -> organization.getProfileStatus().equals(ProfileStatus.ACTIVE))
+			.filter(organization -> !organization.getId().equals(organizationId))
 			.map(OrganizationSearchResponse::of)
 			.toList();
 
@@ -106,11 +103,21 @@ public PageResponse<OrganizationSearchResponse> searchOrganizations(PageConditio
 				() -> organizationRepository.countByNameContains(keyword)));
 	}
 
+	public void createSearchHistory(Long organizationId, String keyword) {
+		SearchHistory searchHistory = findSearchHistory(organizationId);
+
+		// 기존 값이 존재할 경우 제거 후 추가
+		if (searchHistory.getKeywords().contains(keyword)) {
+			searchHistory.getKeywords().remove(keyword);
+		}
+
+		searchHistory.getKeywords().add(keyword);
+		searchHistoryRepository.save(searchHistory);
+	}
+
 	public List<String> getSearchHistory(Long organizationId) {
 		Set<String> searchHistory = findSearchHistory(organizationId).getKeywords();
 
-		log.info("{} : ", searchHistory);
-
 		List<String> searchHistoryList = new ArrayList<>(searchHistory);
 		searchHistoryList.removeIf(String::isEmpty);
 
@@ -131,11 +138,17 @@ public SearchHistory findSearchHistory(Long organizationId) {
 	}
 
 	public void deleteSearchKeyword(Long organizationId, String keyword) {
-
 		// TODO 검색어 에러 처리
 		SearchHistory searchHistory = searchHistoryRepository.findById(organizationId)
 			.orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_ERROR));
-		
 		searchHistory.getKeywords().remove(keyword);
+		searchHistoryRepository.save(searchHistory);
+	}
+
+	public void deleteAllSearchKeyword(Long organizationId) {
+		SearchHistory searchHistory = searchHistoryRepository.findById(organizationId)
+			.orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_ERROR));
+		searchHistory.getKeywords().clear();
+		searchHistoryRepository.save(searchHistory);
 	}
 }