[feat] 사용자 검색 api 구현

src/main/java/konkuk/thip/book/application/service/BookSearchService.java

@@ -72,7 +72,7 @@ public NaverBookParseResult searchBooks(String keyword, int page, Long userId) {
                         .type(BOOK_SEARCH.getSearchType())
                         .userId(userId)
                         .build();
-        recentSearchCommandPort.save(userId,recentSearch);
+        recentSearchCommandPort.save(recentSearch);
 
         return result;
     }

src/main/java/konkuk/thip/common/entity/BaseDomainEntity.java

@@ -1,6 +1,7 @@
 package konkuk.thip.common.entity;
 
 import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDateTime;
@@ -9,6 +10,7 @@
 @SuperBuilder
 public class BaseDomainEntity {
 
+    @Setter
     private LocalDateTime createdAt;
 
     private LocalDateTime modifiedAt;

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -72,6 +72,7 @@ public enum ErrorCode implements ResponseCode {
      * 90000 : recentSearch error
      */
     INVALID_SEARCH_TYPE(HttpStatus.BAD_REQUEST, 90000,"알맞은 검색어 타입을 찾을 수 없습니다."),
+    RECENT_SEARCH_NOT_FOUND(HttpStatus.NOT_FOUND, 90001, "존재하지 않는 RECENT SEARCH 입니다."),
 
     /**
      * 100000 : room error

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -23,6 +23,9 @@ public enum SwaggerResponseDescription {
     USER_SIGNUP(new LinkedHashSet<>(Set.of(
         ALIAS_NAME_NOT_MATCH
     ))),
+    USER_SEARCH(new LinkedHashSet<>(Set.of(
+            USER_NOT_FOUND
+    ))),
 
     // Follow
     CHANGE_FOLLOW_STATE(new LinkedHashSet<>(Set.of(

src/main/java/konkuk/thip/recentSearch/adapter/out/jpa/RecentSearchJpaEntity.java

@@ -3,6 +3,7 @@
 
 import jakarta.persistence.*;
 import konkuk.thip.common.entity.BaseJpaEntity;
+import konkuk.thip.recentSearch.domain.RecentSearch;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import lombok.*;
 
@@ -29,4 +30,10 @@ public class RecentSearchJpaEntity extends BaseJpaEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private UserJpaEntity userJpaEntity;
+
+    public void updateFrom(RecentSearch recentSearch) {
+        this.searchTerm = recentSearch.getSearchTerm();
+        this.type = SearchType.from(recentSearch.getType());
+        this.setCreatedAt(recentSearch.getCreatedAt());
+    }
 }

src/main/java/konkuk/thip/recentSearch/adapter/out/jpa/SearchType.java

@@ -10,7 +10,7 @@
 public enum SearchType {
 
     USER_SEARCH("사용자 검색"),
-    BOOK_SEARCH("책_검색");
+    BOOK_SEARCH("책 검색");
 
     private final String searchType;
 

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/RecentSearchCommandPersistenceAdapter.java

@@ -11,6 +11,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import static konkuk.thip.common.exception.code.ErrorCode.RECENT_SEARCH_NOT_FOUND;
 import static konkuk.thip.common.exception.code.ErrorCode.USER_NOT_FOUND;
 
 @Repository
@@ -23,14 +24,31 @@ public class RecentSearchCommandPersistenceAdapter implements RecentSearchComman
     private final RecentSearchMapper recentSearchMapper;
 
     @Override
-    public void save(Long userId,RecentSearch recentSearch) {
+    public void save(RecentSearch recentSearch) {
 
-        UserJpaEntity userJpaEntity = userJpaRepository.findById(userId)
+        UserJpaEntity userJpaEntity = userJpaRepository.findById(recentSearch.getUserId())
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
 
         RecentSearchJpaEntity recentSearchJpaEntity =
                 recentSearchMapper.toJpaEntity(recentSearch, userJpaEntity);
 
         recentSearchJpaRepository.save(recentSearchJpaEntity);
     }
+
+    @Override
+    public void delete(Long id) {
+        recentSearchJpaRepository.delete(
+                recentSearchJpaRepository.findById(id)
+                        .orElseThrow(() -> new EntityNotFoundException(RECENT_SEARCH_NOT_FOUND))
+        );
+    }
+
+    @Override
+    public void update(RecentSearch recentSearch) {
+        RecentSearchJpaEntity recentSearchJpaEntity = recentSearchJpaRepository.findById(recentSearch.getId())
+                .orElseThrow(() -> new EntityNotFoundException(RECENT_SEARCH_NOT_FOUND));
+
+        recentSearchJpaEntity.updateFrom(recentSearch);
+        recentSearchJpaRepository.save(recentSearchJpaEntity);
+    }
 }

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/RecentSearchQueryPersistenceAdapter.java

@@ -3,14 +3,24 @@
 import konkuk.thip.recentSearch.adapter.out.mapper.RecentSearchMapper;
 import konkuk.thip.recentSearch.adapter.out.persistence.repository.RecentSearchJpaRepository;
 import konkuk.thip.recentSearch.application.port.out.RecentSearchQueryPort;
+import konkuk.thip.recentSearch.domain.RecentSearch;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
+import static konkuk.thip.recentSearch.adapter.out.jpa.SearchType.USER_SEARCH;
+
 @Repository
 @RequiredArgsConstructor
 public class RecentSearchQueryPersistenceAdapter implements RecentSearchQueryPort {
 
     private final RecentSearchJpaRepository recentSearchJpaRepository;
     private final RecentSearchMapper recentSearchMapper;
 
+    @Override
+    public Optional<RecentSearch> findRecentSearchByKeywordAndUserId(String keyword, Long userId) {
+        return recentSearchJpaRepository.findBySearchTermAndTypeAndUserId(keyword, USER_SEARCH, userId)
+                .map(recentSearchMapper::toDomainEntity);
+    }
 }

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/repository/RecentSearchJpaRepository.java

@@ -2,6 +2,8 @@
 
 import konkuk.thip.recentSearch.adapter.out.jpa.RecentSearchJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
-public interface RecentSearchJpaRepository extends JpaRepository<RecentSearchJpaEntity, Long> {
+@Repository
+public interface RecentSearchJpaRepository extends JpaRepository<RecentSearchJpaEntity, Long>, RecentSearchQueryRepository {
 }

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/repository/RecentSearchQueryRepository.java

@@ -0,0 +1,10 @@
+package konkuk.thip.recentSearch.adapter.out.persistence.repository;
+
+import konkuk.thip.recentSearch.adapter.out.jpa.RecentSearchJpaEntity;
+import konkuk.thip.recentSearch.adapter.out.jpa.SearchType;
+
+import java.util.Optional;
+
+public interface RecentSearchQueryRepository {
+    Optional<RecentSearchJpaEntity> findBySearchTermAndTypeAndUserId(String searchTerm, SearchType type, Long userId);
+}

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/repository/RecentSearchQueryRepositoryImpl.java

@@ -0,0 +1,32 @@
+package konkuk.thip.recentSearch.adapter.out.persistence.repository;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import konkuk.thip.recentSearch.adapter.out.jpa.RecentSearchJpaEntity;
+import konkuk.thip.recentSearch.adapter.out.jpa.SearchType;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+import static konkuk.thip.recentSearch.adapter.out.jpa.QRecentSearchJpaEntity.recentSearchJpaEntity;
+
+@Repository
+@RequiredArgsConstructor
+public class RecentSearchQueryRepositoryImpl implements RecentSearchQueryRepository {
+
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public Optional<RecentSearchJpaEntity> findBySearchTermAndTypeAndUserId(String searchTerm, SearchType type, Long userId) {
+        RecentSearchJpaEntity result = queryFactory
+                .selectFrom(recentSearchJpaEntity)
+                .where(
+                        recentSearchJpaEntity.searchTerm.eq(searchTerm),
+                        recentSearchJpaEntity.type.eq(type),
+                        recentSearchJpaEntity.userJpaEntity.userId.eq(userId)
+                )
+                .fetchOne();
+
+        return Optional.ofNullable(result);
+    }
+}

src/main/java/konkuk/thip/recentSearch/application/port/out/RecentSearchCommandPort.java

@@ -4,5 +4,8 @@
 import konkuk.thip.recentSearch.domain.RecentSearch;
 
 public interface RecentSearchCommandPort {
-    void save(Long userId, RecentSearch recentSearch);
+    void save(RecentSearch recentSearch);
+    void delete(Long id);
+
+    void update(RecentSearch recentSearch);
 }

src/main/java/konkuk/thip/recentSearch/application/port/out/RecentSearchQueryPort.java

@@ -1,5 +1,11 @@
 package konkuk.thip.recentSearch.application.port.out;
 
+import konkuk.thip.recentSearch.domain.RecentSearch;
+
+import java.util.Optional;
+
 public interface RecentSearchQueryPort {
 
+    Optional<RecentSearch> findRecentSearchByKeywordAndUserId(String keyword, Long userId);
+
 }

src/main/java/konkuk/thip/recentSearch/application/service/manager/RecentSearchCreateManager.java

@@ -0,0 +1,37 @@
+package konkuk.thip.recentSearch.application.service.manager;
+
+import konkuk.thip.recentSearch.application.port.out.RecentSearchCommandPort;
+import konkuk.thip.recentSearch.application.port.out.RecentSearchQueryPort;
+import konkuk.thip.recentSearch.domain.RecentSearch;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class RecentSearchCreateManager {
+
+    private static final String USER_SEARCH_TERM = "사용자 검색";
+
+    private final RecentSearchCommandPort recentSearchCommandPort;
+    private final RecentSearchQueryPort recentSearchQueryPort;
+
+    public void saveRecentSearchByUser(Long userId, String keyword) {
+
+        // 동일 조건 (userId + keyword + type) 검색 기록이 이미 있는지 확인
+        recentSearchQueryPort.findRecentSearchByKeywordAndUserId(keyword, userId)
+                .ifPresentOrElse(
+                        existingRecentSearch -> {
+                            // 이미 존재하면 createdAt만 갱신
+                            existingRecentSearch.updateCreatedAt(LocalDateTime.now());
+                            recentSearchCommandPort.update(existingRecentSearch);
+                        },
+                        () -> {
+                            // 없으면 새로 저장
+                            RecentSearch userRecentSearch = RecentSearch.withoutId(keyword, USER_SEARCH_TERM, userId);
+                            recentSearchCommandPort.save(userRecentSearch);
+                        }
+                );
+    }
+}

src/main/java/konkuk/thip/recentSearch/domain/RecentSearch.java

@@ -4,6 +4,8 @@
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 
+import java.time.LocalDateTime;
+
 @Getter
 @SuperBuilder
 public class RecentSearch extends BaseDomainEntity {
@@ -15,4 +17,16 @@ public class RecentSearch extends BaseDomainEntity {
     private String type;
 
     private Long userId;
+
+    public static RecentSearch withoutId(String searchTerm, String type, Long userId) {
+        return RecentSearch.builder()
+                .searchTerm(searchTerm)
+                .type(type)
+                .userId(userId)
+                .build();
+    }
+
+    public void updateCreatedAt(LocalDateTime localDateTime) {
+        this.setCreatedAt(localDateTime);
+    }
 }

src/main/java/konkuk/thip/user/adapter/in/web/UserQueryController.java

@@ -6,8 +6,10 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import konkuk.thip.common.dto.BaseResponse;
 import konkuk.thip.common.security.annotation.UserId;
+import konkuk.thip.user.adapter.in.web.response.*;
 import konkuk.thip.common.swagger.annotation.ExceptionDescription;
 import konkuk.thip.user.adapter.in.web.request.UserVerifyNicknameRequest;
 import konkuk.thip.user.adapter.in.web.response.UserFollowersResponse;
@@ -18,13 +20,22 @@
 import konkuk.thip.user.application.port.in.UserGetFollowUsecase;
 import konkuk.thip.user.application.port.in.UserVerifyNicknameUseCase;
 import konkuk.thip.user.application.port.in.UserIsFollowingUsecase;
+import konkuk.thip.user.application.port.in.UserSearchUsecase;
 import konkuk.thip.user.application.port.in.UserViewAliasChoiceUseCase;
+import konkuk.thip.user.application.port.in.dto.UserSearchQuery;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
 import static konkuk.thip.common.swagger.SwaggerResponseDescription.GET_USER_FOLLOW;
+import static konkuk.thip.common.swagger.SwaggerResponseDescription.USER_SEARCH;
 
 @Tag(name = "User Query API", description = "사용자가 주체가 되는 조회")
+@Validated
 @RestController
 @RequiredArgsConstructor
 public class UserQueryController {
@@ -33,6 +44,7 @@ public class UserQueryController {
     private final UserGetFollowUsecase userGetFollowUsecase;
     private final UserIsFollowingUsecase userIsFollowingUsecase;
     private final UserVerifyNicknameUseCase userVerifyNicknameUseCase;
+    private final UserSearchUsecase userSearchUsecase;
 
     @Operation(
             summary = "닉네임 중복 확인",
@@ -94,4 +106,18 @@ public BaseResponse<UserIsFollowingResponse> checkIsFollowing(
             @Parameter(description = "팔로우 여부를 확인할 대상 사용자 ID") @PathVariable final Long targetUserId) {
         return BaseResponse.ok(UserIsFollowingResponse.of(userIsFollowingUsecase.isFollowing(userId, targetUserId)));
     }
+
+
+    @Operation(
+            summary = "사용자 검색",
+            description = "닉네임을 기준으로 사용자를 검색합니다. 정확도순 정렬을 지원합니다."
+    )
+    @ExceptionDescription(USER_SEARCH)
+    @GetMapping("/users")
+    public BaseResponse<UserSearchResponse> showSearchUsers(
+            @Parameter(description = "검색어", example = "thip") @RequestParam @NotBlank(message = "검색어는 필수입니다.") final String keyword,
+            @Parameter(description = "단일 검색 결과 페이지 크기 (1~30) / default : 30", example = "30") @RequestParam(required = false, defaultValue = "30") @Min(1) @Max(30) final Integer size,
+            @Parameter(hidden = true) @UserId final Long userId) {
+        return BaseResponse.ok(userSearchUsecase.searchUsers(UserSearchQuery.of(keyword, userId, size)));
+    }
 }

src/main/java/konkuk/thip/user/adapter/in/web/response/UserFollowersResponse.java

@@ -6,16 +6,17 @@
 
 @Builder
 public record UserFollowersResponse(
-        List<Follower> followers,
+        List<FollowerDto> followers,
         String nextCursor,
         boolean isLast
 ) {
     @Builder
-    public record Follower(
+    public record FollowerDto(
             Long userId,
             String nickname,
             String profileImageUrl,
             String aliasName,
+            String aliasColor,
             Integer followerCount
     ){
 

src/main/java/konkuk/thip/user/adapter/in/web/response/UserFollowingResponse.java

@@ -6,16 +6,17 @@
 
 @Builder
 public record UserFollowingResponse(
-        List<Following> followings,
+        List<FollowingDto> followings,
         String nextCursor,
         boolean isLast
 ) {
     @Builder
-    public record Following(
+    public record FollowingDto(
             Long userId,
             String nickname,
             String profileImageUrl,
-            String aliasName
+            String aliasName,
+            String aliasColor
     ){
     }