Yeonba
diff --git a/‎be/src/main/java/yeonba/be/exception/JoinException.java
Lines changed: 4 additions & 22 deletions b/‎be/src/main/java/yeonba/be/exception/JoinException.java
Lines changed: 4 additions & 22 deletions
diff --git a/‎be/src/main/java/yeonba/be/mypage/entity/Acquaintance.java
Lines changed: 8 additions & 2 deletions b/‎be/src/main/java/yeonba/be/mypage/entity/Acquaintance.java
Lines changed: 8 additions & 2 deletions
diff --git a/‎be/src/main/java/yeonba/be/mypage/service/MyPageService.java
Lines changed: 4 additions & 15 deletions b/‎be/src/main/java/yeonba/be/mypage/service/MyPageService.java
Lines changed: 4 additions & 15 deletions
diff --git a/‎be/src/main/java/yeonba/be/user/controller/UserController.java
Lines changed: 16 additions & 1 deletion b/‎be/src/main/java/yeonba/be/user/controller/UserController.java
Lines changed: 16 additions & 1 deletion
diff --git a/‎be/src/main/java/yeonba/be/user/dto/request/UserSearchRequest.java
Lines changed: 65 additions & 0 deletions b/‎be/src/main/java/yeonba/be/user/dto/request/UserSearchRequest.java
Lines changed: 65 additions & 0 deletions
diff --git a/‎be/src/main/java/yeonba/be/user/dto/response/UserQueryPageResponse.java
Lines changed: 2 additions & 1 deletion b/‎be/src/main/java/yeonba/be/user/dto/response/UserQueryPageResponse.java
Lines changed: 2 additions & 1 deletion
diff --git a/‎be/src/main/java/yeonba/be/user/entity/User.java
Lines changed: 0 additions & 1 deletion b/‎be/src/main/java/yeonba/be/user/entity/User.java
Lines changed: 0 additions & 1 deletion
diff --git a/‎be/src/main/java/yeonba/be/user/entity/UserPreference.java
Lines changed: 4 additions & 4 deletions b/‎be/src/main/java/yeonba/be/user/entity/UserPreference.java
Lines changed: 4 additions & 4 deletions
diff --git a/‎be/src/main/java/yeonba/be/user/enums/Gender.java
Lines changed: 1 addition & 0 deletions b/‎be/src/main/java/yeonba/be/user/enums/Gender.java
Lines changed: 1 addition & 0 deletions
diff --git a/‎be/src/main/java/yeonba/be/user/repository/user/UserQuery.java
Lines changed: 15 additions & 2 deletions b/‎be/src/main/java/yeonba/be/user/repository/user/UserQuery.java
Lines changed: 15 additions & 2 deletions
diff --git a/‎be/src/main/java/yeonba/be/user/repository/user/UserRepositoryCustom.java
Lines changed: 10 additions & 3 deletions b/‎be/src/main/java/yeonba/be/user/repository/user/UserRepositoryCustom.java
Lines changed: 10 additions & 3 deletions
@@ -1,13 +1,13 @@
 package yeonba.be.exception;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
+@Getter
+@AllArgsConstructor
 public enum JoinException implements BaseException {
 
-    PASSWORD_CONFIRMATION_NOT_MATCH(
-        HttpStatus.BAD_REQUEST,
-        "비밀번호 확인 값이 비밀번호와 일치하지 않습니다."),
-
     ALREADY_USED_NICKNAME(
         HttpStatus.BAD_REQUEST,
         "이미 사용 중인 닉네임입니다."),
@@ -18,22 +18,4 @@ public enum JoinException implements BaseException {
 
     private final HttpStatus httpStatus;
     private final String reason;
-
-    JoinException(HttpStatus httpStatus, String reason) {
-
-        this.httpStatus = httpStatus;
-        this.reason = reason;
-    }
-
-    @Override
-    public HttpStatus getHttpStatus() {
-
-        return httpStatus;
-    }
-
-    @Override
-    public String getReason() {
-
-        return reason;
-    }
 }
@@ -1,10 +1,12 @@
 package yeonba.be.mypage.entity;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -14,20 +16,24 @@
 @Getter
 @Entity
 @EqualsAndHashCode(of = {"userId", "phoneNumber"})
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 public class Acquaintance {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(nullable = false)
     private long userId;
+
+    @Column(nullable = false)
     private String name;
+
+    @Column(nullable = false)
     private String phoneNumber;
 
     public Acquaintance(long userId, String name, String phoneNumber) {
-
         this.userId = userId;
         this.name = name;
         this.phoneNumber = phoneNumber;
 
@@ -1,9 +1,10 @@
 package yeonba.be.mypage.service;
 
+import static yeonba.be.util.BoundsValidator.validateBounds;
+
 import java.time.LocalDate;
 import java.time.Period;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,10 +36,10 @@
 import yeonba.be.user.entity.User;
 import yeonba.be.user.entity.UserPreference;
 import yeonba.be.user.entity.VocalRange;
-import yeonba.be.user.repository.block.BlockCommand;
-import yeonba.be.user.repository.block.BlockQuery;
 import yeonba.be.user.repository.animal.AnimalQuery;
 import yeonba.be.user.repository.area.AreaQuery;
+import yeonba.be.user.repository.block.BlockCommand;
+import yeonba.be.user.repository.block.BlockQuery;
 import yeonba.be.user.repository.user.UserQuery;
 import yeonba.be.user.repository.userpreference.UserPreferenceQuery;
 import yeonba.be.user.repository.vocalrange.VocalRangeQuery;
@@ -172,18 +173,6 @@ private Area findAreaByName(List<Area> areas, String name) {
             .orElseThrow(() -> new GeneralException(UserException.AREA_NOT_FOUND));
     }
 
-    private void validateBounds(Integer lowerBound, Integer upperBound) {
-
-        if (Objects.isNull(lowerBound) || Objects.isNull(upperBound)) {
-
-            return;
-        }
-
-        if (lowerBound > upperBound) {
-            throw new GeneralException(UserException.LOWER_BOUND_LESS_THAN_OR_EQUAL_UPPER_BOUND);
-        }
-    }
-
     public void updateProfilePhotos(List<MultipartFile> profilePhotos, MultipartFile realTimePhoto,
         long userId) {
 
 
@@ -20,6 +20,7 @@
 import yeonba.be.mypage.service.ReportService;
 import yeonba.be.user.dto.request.UserQueryRequest;
 import yeonba.be.user.dto.request.UserReportRequest;
+import yeonba.be.user.dto.request.UserSearchRequest;
 import yeonba.be.user.dto.request.UserUpdateDeviceTokenRequest;
 import yeonba.be.user.dto.response.UserProfileResponse;
 import yeonba.be.user.dto.response.UserQueryPageResponse;
@@ -54,7 +55,7 @@ public ResponseEntity<CustomResponse<UserQueryPageResponse>> getUsers(
 
     @Operation(summary = "추천 이성 조회", description = "추천 이성을 조회할 수 있다.")
     @ApiResponse(responseCode = "200", description = "추천 이성 정상 조회")
-    @GetMapping("/users/recommend")
+    @PostMapping("/users/recommend")
     public ResponseEntity<CustomResponse<UserQueryPageResponse>> getRecommendUsers(
         @RequestAttribute("userId") long userId) {
 
@@ -145,6 +146,20 @@ public ResponseEntity<CustomResponse<Void>> block(
             .body(new CustomResponse<>());
     }
 
+    @Operation(summary = "이성 검색", description = "이성을 검색할 수 있습니다.")
+    @ApiResponse(responseCode = "200", description = "이성 검색 성공")
+    @PostMapping("/users/search")
+    public ResponseEntity<CustomResponse<UserQueryPageResponse>> search(
+        @RequestAttribute("userId") long userId,
+        @Valid @RequestBody(required = false) UserSearchRequest request) {
+
+        UserQueryPageResponse response = userService.findUsersBySearchCondition(userId, request);
+
+        return ResponseEntity
+            .ok()
+            .body(new CustomResponse<>(response));
+    }
+
     @Operation(summary = "device token 업데이트", description = "device token을 업데이트할 수 있습니다.")
     @ApiResponse(responseCode = "200", description = "device token 업데이트 성공")
     @PatchMapping("/users/device-token")
 
@@ -0,0 +1,65 @@
+package yeonba.be.user.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+@Getter
+@NoArgsConstructor
+public class UserSearchRequest {
+
+    @Schema(
+        type = "number",
+        description = "페이지 번호, 기본 첫 페이지(0)",
+        example = "0")
+    @PositiveOrZero(message = "페이지 번호는 0이상이어야 합니다.")
+    private Integer page;
+
+    @Schema(
+        type = "string",
+        description = "검색 지역",
+        example = "서울")
+    private String area;
+
+    @Schema(
+        type = "string",
+        description = "검색 음역대",
+        example = "고음")
+    private String vocalRange;
+
+    @Schema(
+        type = "number",
+        description = "검색 나이 하한",
+        example = "20")
+    @Range(min = 20, max = 40, message = "검색 나이는 20~40내 값만 가능합니다.")
+    private Integer ageLowerBound;
+
+    @Schema(
+        type = "number",
+        description = "검색 나이 상한",
+        example = "30")
+    @Range(min = 20, max = 40, message = "검색 나이는 20~40내 값만 가능합니다.")
+    private Integer ageUpperBound;
+
+    @Schema(
+        type = "number",
+        description = "검색 키 하한",
+        example = "160")
+    @Range(min = 130, max = 220, message = "검색 키는 130~220cm 내 값만 가능합니다.")
+    private Integer heightLowerBound;
+
+    @Schema(
+        type = "number",
+        description = "검색 키 상한",
+        example = "170")
+    @Range(min = 130, max = 220, message = "검색 키는 130~220cm 내 값만 가능합니다.")
+    private Integer heightUpperBound;
+
+    @Schema(
+        type = "boolean",
+        description = "검색 기준에 선호하는 동물상 포함 여부",
+        example = "true")
+    private Boolean includePreferredAnimal;
+}
@@ -3,12 +3,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.data.domain.Page;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserQueryPageResponse {
 
     @Schema(
 
@@ -215,7 +215,6 @@ public void changeInactiveStatus(boolean inactiveStatus) {
     }
 
     public void updateProfilePhotos(List<ProfilePhoto> profilePhotos) {
-
         this.profilePhotos = profilePhotos;
     }
 
 
@@ -54,10 +54,10 @@ public class UserPreference {
     private Animal animal;
 
     public UserPreference(
-        int ageLowerBound,
-        int ageUpperBound,
-        int heightLowerBound,
-        int heightUpperBound,
+        Integer ageLowerBound,
+        Integer ageUpperBound,
+        Integer heightLowerBound,
+        Integer heightUpperBound,
         String mbti,
         String bodyType,
         User user,
 
@@ -13,6 +13,7 @@ public enum Gender {
 
     public final String genderString;
     public final boolean genderBoolean;
+
     public static Gender from(String genderString) {
 
         if (StringUtils.equals(genderString, MALE.genderString)) {
 
@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Component;
 import yeonba.be.exception.GeneralException;
 import yeonba.be.exception.UserException;
+import yeonba.be.user.dto.request.UserSearchRequest;
 import yeonba.be.user.dto.response.UserQueryPageResponse;
 import yeonba.be.user.dto.response.UserQueryResponse;
 import yeonba.be.user.entity.User;
@@ -73,10 +74,22 @@ public List<User> findByIds(List<Long> userIds) {
     }
 
     public UserQueryPageResponse findRecommendUsers(
-        long userId, boolean userGender, PageRequest pageRequest, LocalDate recommendDay) {
+        User user, PageRequest pageRequest, LocalDate recommendDay) {
 
         Page<UserQueryResponse> page = userRepository
-            .findRecommendUsers(userId, userGender, pageRequest, recommendDay);
+            .findRecommendUsers(user, pageRequest, recommendDay);
+
+        return UserQueryPageResponse.from(page);
+    }
+
+    public UserQueryPageResponse findUsersBySearchCondition(
+        User user,
+        PageRequest pageRequest,
+        LocalDate searchDay,
+        UserSearchRequest request) {
+
+        Page<UserQueryResponse> page = userRepository
+            .findUsersBySearchCondition(user, pageRequest, searchDay, request);
 
         return UserQueryPageResponse.from(page);
     }
 
@@ -3,7 +3,9 @@
 import java.time.LocalDate;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import yeonba.be.user.dto.request.UserSearchRequest;
 import yeonba.be.user.dto.response.UserQueryResponse;
+import yeonba.be.user.entity.User;
 
 public interface UserRepositoryCustom {
 
@@ -14,8 +16,13 @@ public interface UserRepositoryCustom {
     Page<UserQueryResponse> findArrowSendersBy(long receiverId, PageRequest pageRequest);
 
     Page<UserQueryResponse> findRecommendUsers(
-        long userId,
-        boolean userGender,
+        User queryingUser,
         PageRequest pageRequest,
         LocalDate recommendDay);
-}
+
+    Page<UserQueryResponse> findUsersBySearchCondition(
+        User searchingUser,
+        PageRequest pageRequest,
+        LocalDate searchDay,
+        UserSearchRequest request);
+}
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,6 @@ public void changeInactiveStatus(boolean inactiveStatus) {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`public void updateProfilePhotos(List<ProfilePhoto> profilePhotos) {`
`218`		`-`
`219`	`218`	`this.profilePhotos = profilePhotos;`
`220`	`219`	`}`
`221`	`220`