Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
authorizeRequests
.requestMatchers("/signup").permitAll()
.requestMatchers("/login").permitAll()
.requestMatchers("/searches").permitAll()
.requestMatchers("/swagger-ui/**").permitAll()
.requestMatchers("/**").permitAll()
.anyRequest().authenticated()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ public EntityNotFoundException(String request, String entityType) {
this.request = request;
this.entityType = entityType;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.codeit.todo.common.exception.search;

import com.codeit.todo.common.exception.ApplicationException;
import com.codeit.todo.common.exception.payload.ErrorStatus;

public class SearchException extends ApplicationException {
/**
* @param errorStatus 상태 코드, 메세지, 발생시간을 저장한 객체
*/
public SearchException(ErrorStatus errorStatus) {
super(errorStatus);
}
}
3 changes: 3 additions & 0 deletions src/main/java/com/codeit/todo/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class User {
@Column(name = "profile_pic", nullable = false)
private String profilePic;

@OneToMany(mappedBy= "user", cascade = CascadeType.REMOVE, orphanRemoval = true)
private List<Goal> goals = new ArrayList<>();

//나를 팔로우 하는 사람들
@OneToMany(mappedBy = "followee", cascade = CascadeType.REMOVE, orphanRemoval = true)
private List<Follow> followers = new ArrayList<>();
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/codeit/todo/domain/enums/SearchField.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.codeit.todo.domain.enums;

import lombok.Getter;

@Getter
public enum SearchField {
USER_NAME("유저명"),
GOAL_TITLE("목표명");

private final String value;

SearchField(String value){
this.value = value;
}

}
2 changes: 2 additions & 0 deletions src/main/java/com/codeit/todo/repository/GoalRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ public interface GoalRepository extends JpaRepository<Goal, Integer> {
and :today between t.startDate and t.endDate
""")
Slice<Goal> findByUserAndHasTodosAfterLastGoalId(@Param("lastGoalId") Integer lastGoalId, @Param("userId") int userId, Pageable pageable, @Param("today") LocalDate today);

List<Goal> findByGoalTitleContains(@Param("keyword") String keyword);
}
5 changes: 5 additions & 0 deletions src/main/java/com/codeit/todo/repository/UserRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@

import com.codeit.todo.domain.Todo;
import com.codeit.todo.domain.User;
import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Optional;

@Repository
public interface UserRepository extends JpaRepository<User, Integer> {


Optional<User> findByEmail(String email);

List<User> findByNameContains(@Param("keyword") String keyword);
}
10 changes: 10 additions & 0 deletions src/main/java/com/codeit/todo/service/search/SearchService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.codeit.todo.service.search;

import com.codeit.todo.web.dto.request.search.ReadSearchRequest;
import com.codeit.todo.web.dto.response.search.ReadSearchResponse;

import java.util.List;

public interface SearchService {
List<ReadSearchResponse> findUserAndGoal(ReadSearchRequest request);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package com.codeit.todo.service.search.impl;

import com.codeit.todo.common.exception.EntityNotFoundException;
import com.codeit.todo.common.exception.goal.GoalNotFoundException;
import com.codeit.todo.common.exception.payload.ErrorStatus;
import com.codeit.todo.common.exception.search.SearchException;
import com.codeit.todo.common.exception.user.UserNotFoundException;
import com.codeit.todo.domain.Goal;
import com.codeit.todo.domain.User;
import com.codeit.todo.domain.enums.SearchField;
import com.codeit.todo.repository.GoalRepository;
import com.codeit.todo.repository.UserRepository;
import com.codeit.todo.service.search.SearchService;
import com.codeit.todo.web.dto.request.search.ReadSearchRequest;
import com.codeit.todo.web.dto.response.goal.ReadGoalSearchResponse;
import com.codeit.todo.web.dto.response.search.ReadSearchResponse;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional
public class SearchServiceImpl implements SearchService {
private final UserRepository userRepository;
private final GoalRepository goalRepository;

private static final int BAD_REQUEST = 400;

private static final int NOT_FOUND = 404;

@Override
public List<ReadSearchResponse> findUserAndGoal(ReadSearchRequest request) {
String searchField = request.searchField();
String keyword = request.keyword();

log.info("Starting search for field: {} with keyword: {}", searchField, keyword);

if( searchField.equals(SearchField.USER_NAME.getValue()) ){
List<User> searchedUsers = userRepository.findByNameContains(keyword);
if(searchedUsers.isEmpty()) throw new SearchException(ErrorStatus.toErrorStatus("유저에 대한 검색 결과가 없습니다.", NOT_FOUND));

List<ReadSearchResponse> responses = searchedUsers.stream()
.map(user -> {
List<Goal> goals = user.getGoals();
List<ReadGoalSearchResponse> goalsResponses = goals.stream()
.map(ReadGoalSearchResponse::from)
.toList();

return ReadSearchResponse.from(user, goalsResponses);
}).toList();
return responses;

}else if(searchField.equals(SearchField.GOAL_TITLE.getValue())){
List<Goal> searchedGoals = goalRepository.findByGoalTitleContains(keyword);
if(searchedGoals.isEmpty()) throw new SearchException(ErrorStatus.toErrorStatus("목표에 대한 검색 결과가 없습니다.", NOT_FOUND));

Map<User, List<Goal>> userGoalsMap = searchedGoals.stream()
.collect(Collectors.groupingBy(Goal::getUser));

List<ReadSearchResponse> responses = userGoalsMap.entrySet().stream()
.map(entry -> {
User user = entry.getKey();
List<Goal> goals = entry.getValue();

List<ReadGoalSearchResponse> goalsResponses = goals.stream()
.map(ReadGoalSearchResponse::from)
.toList();

return ReadSearchResponse.from(user, goalsResponses);

}).toList();
return responses;
}else{
throw new SearchException(ErrorStatus.toErrorStatus("해당 필드로는 검색할 수 없습니다", BAD_REQUEST));
}
Comment on lines +46 to +83
Copy link
Member

@bbbbooo bbbbooo Dec 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

현재 코드에서는 SearchField 조건이 추가될 경우 else if를 사용해야 해서 코드 복잡도가 증가할거같아요.

검색 조건별로 코드를 별도의 클래스로 분리하여, 조건에 따라 실행할 로직을 동적으로 결정할 수 있는 구조는 어떻게 생각하시나요? 전략 패턴과 유사한 느낌입니다

}
}
39 changes: 39 additions & 0 deletions src/main/java/com/codeit/todo/web/controller/SearchController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.codeit.todo.web.controller;

import com.codeit.todo.repository.CustomUserDetails;

import com.codeit.todo.service.search.SearchService;
import com.codeit.todo.web.dto.request.search.ReadSearchRequest;
import com.codeit.todo.web.dto.response.Response;
import com.codeit.todo.web.dto.response.search.ReadSearchResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/searches")
public class SearchController {

private final SearchService searchService;

@Operation(summary = "유저 또는 목표 검색", description = "유저 또는 목표를 검색하고 유저와 목표를 함께 반환합니다")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "검색 성공")
})
@GetMapping
public Response<List<ReadSearchResponse>> getSearch(
@Valid @RequestBody ReadSearchRequest request
){
return Response.ok(searchService.findUserAndGoal(request));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.codeit.todo.web.dto.request.search;

import jakarta.validation.constraints.NotNull;

public record ReadSearchRequest(
@NotNull
String searchField,

@NotNull
String keyword
) {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.codeit.todo.web.dto.response.goal;

import com.codeit.todo.domain.Goal;
import lombok.Builder;

import java.time.LocalDateTime;

@Builder
public record ReadGoalSearchResponse(
int goalId,
String goalTitle,
String color

) {
public static ReadGoalSearchResponse from(Goal goal){
return ReadGoalSearchResponse.builder()
.goalId(goal.getGoalId())
.goalTitle(goal.getGoalTitle())
.color(goal.getColor())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.codeit.todo.web.dto.response.search;

import com.codeit.todo.domain.User;
import com.codeit.todo.web.dto.response.goal.ReadGoalSearchResponse;
import lombok.Builder;

import java.util.List;

@Builder
public record ReadSearchResponse (
String name,
String profilePic,

List<ReadGoalSearchResponse> goals
){
public static ReadSearchResponse from(User user, List<ReadGoalSearchResponse> responses) {
return ReadSearchResponse.builder()
.name(user.getName())
.profilePic(user.getProfilePic())
.goals(responses)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private void processExceptionHandle(HttpServletResponse response, ErrorStatus er
*/
@Override
protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
String[] excludedPaths = {"/api/v1/auths/signup", "/api/v1/auths/login", "/v3/**", "/swagger-ui/**"};
String[] excludedPaths = {"/api/v1/auths/signup", "/api/v1/auths/login", "/api/v1/searches", "/v3/**", "/swagger-ui/**"};
AntPathMatcher antPathMatcher = new AntPathMatcher();

for (String excludedPath : excludedPaths) {
Expand Down
Loading