Merge pull request #93 from team9502/dev

feat: 사용자/기업(회원) 비밀번호 수정 + 포인트 총액 내역 조회시 다음 페이지 여부 추가 + 리뷰 조회시 현재 페이지 번호와 전체 페이지 수 응답값에 포함 + 리뷰 조회시 공개된 리뷰가 최상단으로 오게 수정
team9502 · Jun 16, 2024 · ac8a1a4 · ac8a1a4
2 parents 17e55ce + f672358
commit ac8a1a4
Show file tree

Hide file tree

Showing 19 changed files with 297 additions and 42 deletions.
diff --git a/src/main/java/team9502/sinchulgwinong/domain/companyUser/controller/CpUserController.java b/src/main/java/team9502/sinchulgwinong/domain/companyUser/controller/CpUserController.java
@@ -10,14 +10,14 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import team9502.sinchulgwinong.domain.companyUser.dto.request.CpUserPasswordUpdateRequestDTO;
 import team9502.sinchulgwinong.domain.companyUser.dto.request.CpUserProfileUpdateRequestDTO;
 import team9502.sinchulgwinong.domain.companyUser.dto.response.CpUserProfileResponseDTO;
 import team9502.sinchulgwinong.domain.companyUser.service.CpUserService;
 import team9502.sinchulgwinong.global.response.GlobalApiResponse;
 import team9502.sinchulgwinong.global.security.UserDetailsImpl;
 
-import static team9502.sinchulgwinong.global.response.SuccessCode.SUCCESS_CP_USER_PROFILE_READ;
-import static team9502.sinchulgwinong.global.response.SuccessCode.SUCCESS_CP_USER_PROFILE_UPDATED;
+import static team9502.sinchulgwinong.global.response.SuccessCode.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -32,7 +32,7 @@ public class CpUserController {
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "기업(회원) 프로필 조회 성공",
                     content = @Content(mediaType = "application/json",
-                            examples = @ExampleObject(value = "{ \"code\": \"200\", \"message\": \"프로필 조회 성공\", \"data\": {\"cpUserId\": 1, \"cpName\": \"팀9502\", \"cpEmail\": \"[email protected]\", \"cpPhoneNumber\": \"01012345678\", \"cpUsername\": \"김은채\", \"hiringStatus\": true, \"employeeCount\": 50, \"description\": \"기업 소개 예시입니다.\", \"cpNum\": \"1234567890\"} }"))),
+                            examples = @ExampleObject(value = "{ \"code\": \"200\", \"message\": \"프로필 조회 성공\", \"data\": {\"cpUserId\": 1, \"cpName\": \"팀9502\", \"cpEmail\": \"[email protected]\", \"cpPhoneNumber\": \"01012345678\", \"cpUsername\": \"김은채\", \"hiringStatus\": true, \"employeeCount\": 50, \"foundationDate\": \"2021-01-01\", \"description\": \"기업 소개 예시입니다.\", \"cpNum\": \"1234567890\", \"averageRating\": 4.5, \"reviewCount\": 20} }"))),
             @ApiResponse(responseCode = "400", description = "잘못된 사용자 유형",
                     content = @Content(mediaType = "application/json",
                             examples = @ExampleObject(value = "{ \"code\": \"400\", \"message\": \"잘못된 사용자 유형입니다.\", \"data\": null }"))),
@@ -87,4 +87,39 @@ public ResponseEntity<GlobalApiResponse<CpUserProfileResponseDTO>> updateCompany
                         )
                 );
     }
+
+    @PatchMapping("/password")
+    @Operation(summary = "비밀번호 변경", description = "로그인한 기업(회원)의 비밀번호를 안전하게 변경합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "비밀번호 변경 성공",
+                    content = @Content(mediaType = "application/json",
+                            examples = @ExampleObject(value = "{ \"code\": \"200\", \"message\": \"비밀번호 변경 성공\" }"))),
+            @ApiResponse(responseCode = "400", description = "비밀번호 불일치 또는 유효하지 않은 요청",
+                    content = @Content(mediaType = "application/json",
+                            examples = {
+                                    @ExampleObject(name = "비밀번호 불일치", value = "{ \"code\": \"400\", \"message\": \"입력한 비밀번호가 기존 비밀번호와 일치하지 않습니다.\" }"),
+                                    @ExampleObject(name = "비밀번호 확인 불일치", value = "{ \"code\": \"400\", \"message\": \"비밀번호와 비밀번호 확인이 일치하지 않습니다.\" }")
+                            })),
+            @ApiResponse(responseCode = "400", description = "잘못된 사용자 유형",
+                    content = @Content(mediaType = "application/json",
+                            examples = @ExampleObject(value = "{ \"code\": \"400\", \"message\": \"잘못된 사용자 유형입니다.\", \"data\": null }"))),
+            @ApiResponse(responseCode = "404", description = "사용자를 찾을 수 없음",
+                    content = @Content(mediaType = "application/json",
+                            examples = @ExampleObject(value = "{ \"code\": \"404\", \"message\": \"사용자를 찾을 수 없습니다.\" }"))),
+            @ApiResponse(responseCode = "500", description = "서버 내부 오류",
+                    content = @Content(mediaType = "application/json",
+                            examples = @ExampleObject(value = "{ \"code\": \"500\", \"message\": \"서버 오류가 발생했습니다.\" }")))
+    })
+    public ResponseEntity<GlobalApiResponse<Void>> updateUserProfile(
+            @AuthenticationPrincipal UserDetailsImpl userDetails,
+            @RequestBody CpUserPasswordUpdateRequestDTO requestDTO) {
+
+        cpUserService.updateCpUserPassword(userDetails.getCpUserId(), requestDTO);
+
+        return ResponseEntity.status(SUCCESS_USER_PASSWORD_UPDATED.getHttpStatus())
+                .body(
+                        GlobalApiResponse.of(
+                                SUCCESS_USER_PASSWORD_UPDATED.getMessage(),
+                                null));
+    }
 }
diff --git a/...eam9502/sinchulgwinong/domain/companyUser/dto/request/CpUserPasswordUpdateRequestDTO.java b/...eam9502/sinchulgwinong/domain/companyUser/dto/request/CpUserPasswordUpdateRequestDTO.java
@@ -0,0 +1,21 @@
+package team9502.sinchulgwinong.domain.companyUser.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CpUserPasswordUpdateRequestDTO {
+
+    @Schema(description = "현재 비밀번호", example = "password")
+    private String currentPassword;
+
+    @Schema(description = "변경할 비밀번호", example = "newPassword")
+    private String newPassword;
+
+    @Schema(description = "변경할 비밀번호 확인", example = "newPassword")
+    private String newPasswordConfirm;
+}
diff --git a/...ava/team9502/sinchulgwinong/domain/companyUser/dto/response/CpUserProfileResponseDTO.java b/...ava/team9502/sinchulgwinong/domain/companyUser/dto/response/CpUserProfileResponseDTO.java
@@ -41,4 +41,10 @@ public class CpUserProfileResponseDTO {
 
     @Schema(description = "사업자 번호", example = "1234567890")
     private String cpNum;
+
+    @Schema(description = "평균 평점", example = "4.5")
+    private Float averageRating;
+
+    @Schema(description = "리뷰 개수", example = "10")
+    private Integer reviewCount;
 }
diff --git a/src/main/java/team9502/sinchulgwinong/domain/companyUser/entity/CompanyUser.java b/src/main/java/team9502/sinchulgwinong/domain/companyUser/entity/CompanyUser.java
@@ -57,7 +57,15 @@ public class CompanyUser extends BaseTimeEntity implements CommonPoint {
     @Column(nullable = false, length = 11)
     private String cpPhoneNumber;
 
+    @Setter
     @Column(nullable = false, length = 150)
     private String cpPassword;
 
+    @Setter
+    @Column(nullable = true)
+    private Float averageRating;
+
+    @Setter
+    @Column(nullable = true)
+    private Integer reviewCount;
 }
diff --git a/src/main/java/team9502/sinchulgwinong/domain/companyUser/service/CpUserService.java b/src/main/java/team9502/sinchulgwinong/domain/companyUser/service/CpUserService.java
@@ -2,8 +2,10 @@
 
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import team9502.sinchulgwinong.domain.companyUser.dto.request.CpUserPasswordUpdateRequestDTO;
 import team9502.sinchulgwinong.domain.companyUser.dto.request.CpUserProfileUpdateRequestDTO;
 import team9502.sinchulgwinong.domain.companyUser.dto.response.CpUserProfileResponseDTO;
 import team9502.sinchulgwinong.domain.companyUser.entity.CompanyUser;
@@ -17,6 +19,7 @@ public class CpUserService {
 
     private final CompanyUserRepository companyUserRepository;
     private final EncryptionService encryptionService;
+    private final PasswordEncoder passwordEncoder;
 
     @Transactional(readOnly = true)
     public CpUserProfileResponseDTO getCpUserProfile(Long cpUserId) {
@@ -34,7 +37,9 @@ public CpUserProfileResponseDTO getCpUserProfile(Long cpUserId) {
                 companyUser.getEmployeeCount(),
                 companyUser.getFoundationDate(),
                 companyUser.getDescription(),
-                encryptionService.decryptCpNum(companyUser.getCpNum())
+                encryptionService.decryptCpNum(companyUser.getCpNum()),
+                companyUser.getAverageRating(),
+                companyUser.getReviewCount()
         );
     }
 
@@ -70,7 +75,27 @@ public CpUserProfileResponseDTO updateCpUserProfile(Long cpUserId, CpUserProfile
                 companyUser.getEmployeeCount(),
                 companyUser.getFoundationDate(),
                 companyUser.getDescription(),
-                encryptionService.decryptCpNum(companyUser.getCpNum())
+                encryptionService.decryptCpNum(companyUser.getCpNum()),
+                companyUser.getAverageRating(),
+                companyUser.getReviewCount()
         );
     }
+
+    @Transactional
+    public void updateCpUserPassword(Long cpUserId, CpUserPasswordUpdateRequestDTO requestDTO) {
+
+        CompanyUser companyUser = companyUserRepository.findById(cpUserId)
+                .orElseThrow(() -> new ApiException(ErrorCode.COMPANY_USER_NOT_FOUND));
+
+        if (!passwordEncoder.matches(requestDTO.getCurrentPassword(), companyUser.getCpPassword())) {
+            throw new ApiException(ErrorCode.PASSWORD_MISMATCH);
+        }
+
+        if (!requestDTO.getNewPassword().equals(requestDTO.getNewPasswordConfirm())) {
+            throw new ApiException(ErrorCode.PASSWORD_CONFIRM_MISMATCH);
+        }
+
+        companyUser.setCpPassword(passwordEncoder.encode(requestDTO.getNewPassword()));
+        companyUserRepository.save(companyUser);
+    }
 }
diff --git a/src/main/java/team9502/sinchulgwinong/domain/point/controller/PointController.java b/src/main/java/team9502/sinchulgwinong/domain/point/controller/PointController.java
@@ -15,15 +15,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import team9502.sinchulgwinong.domain.point.dto.response.PagedResponseDTO;
 import team9502.sinchulgwinong.domain.point.dto.response.PointSummaryResponseDTO;
 import team9502.sinchulgwinong.domain.point.dto.response.SavedPointDetailResponseDTO;
 import team9502.sinchulgwinong.domain.point.dto.response.UsedPointDetailResponseDTO;
 import team9502.sinchulgwinong.domain.point.service.PointService;
 import team9502.sinchulgwinong.global.response.GlobalApiResponse;
 import team9502.sinchulgwinong.global.security.UserDetailsImpl;
 
-import java.util.List;
-
 import static team9502.sinchulgwinong.global.response.SuccessCode.*;
 
 @RestController
@@ -66,7 +65,7 @@ public ResponseEntity<GlobalApiResponse<PointSummaryResponseDTO>> getPointSummar
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "포인트 적립 내역 조회 성공",
                     content = @Content(mediaType = "application/json",
-                            examples = @ExampleObject(value = "{ \"code\": \"200\", \"message\": \"적립 포인트 조회 성공\", \"data\": [{\"type\": \"REVIEW\", \"savedPoint\": 300, \"createdAt\": \"2024-06-11\"}, {\"type\": \"SIGNUP\", \"savedPoint\": 300, \"createdAt\": \"2024-06-11\"}] }"))),
+                            examples = @ExampleObject(value = "{ \"code\": \"200\", \"message\": \"적립 포인트 조회 성공\", \"data\": [{\"type\": \"REVIEW\", \"savedPoint\": 300, \"createdAt\": \"2024-06-11\"}, {\"type\": \"SIGNUP\", \"savedPoint\": 300, \"createdAt\": \"2024-06-11\", \"hasNextPage\": false}] }"))),
             @ApiResponse(responseCode = "404", description = "포인트를 찾을 수 없습니다.",
                     content = @Content(mediaType = "application/json",
                             examples = @ExampleObject(value = "{ \"code\": \"404\", \"message\": \"포인트를 찾을 수 없습니다.\", \"data\": null }"))),
@@ -86,7 +85,7 @@ public ResponseEntity<GlobalApiResponse<PointSummaryResponseDTO>> getPointSummar
             required = false,
             schema = @Schema(type = "integer", defaultValue = "6")
     )
-    public ResponseEntity<GlobalApiResponse<List<SavedPointDetailResponseDTO>>> getPointDetails(
+    public ResponseEntity<GlobalApiResponse<PagedResponseDTO<SavedPointDetailResponseDTO>>> getPointDetails(
             @AuthenticationPrincipal UserDetailsImpl userDetails,
             @RequestParam(value = "cursorId", required = false) Long cursorId,
             @RequestParam(value = "limit", defaultValue = "6") int limit) {
@@ -95,7 +94,7 @@ public ResponseEntity<GlobalApiResponse<List<SavedPointDetailResponseDTO>>> getP
             cursorId = Long.MAX_VALUE;
         }
 
-        List<SavedPointDetailResponseDTO> responseDTOs = pointService.getSpDetails(userDetails, cursorId, limit);
+        PagedResponseDTO<SavedPointDetailResponseDTO> responseDTOs = pointService.getSpDetails(userDetails, cursorId, limit);
 
         return ResponseEntity.status(SUCCESS_SAVED_POINT_READ.getHttpStatus())
                 .body(
@@ -129,7 +128,7 @@ public ResponseEntity<GlobalApiResponse<List<SavedPointDetailResponseDTO>>> getP
             @ApiResponse(responseCode = "200", description = "포인트 사용 내역 조회 성공",
                     content = @Content(mediaType = "application/json",
                             examples = @ExampleObject(
-                                    value = "{ \"code\": \"200\", \"message\": \"포인트 사용 내역 조회 성공\", \"data\": [{\"type\": \"REVIEW\", \"usedPoint\": 100, \"usedAt\": \"2024-06-11\"}, {\"type\": \"BANNER\", \"usedPoint\": 50, \"usedAt\": \"2024-06-10\"}] }"
+                                    value = "{ \"code\": \"200\", \"message\": \"포인트 사용 내역 조회 성공\", \"data\": [{\"type\": \"REVIEW\", \"usedPoint\": 100, \"usedAt\": \"2024-06-11\", \"hasNextPage\": true}, {\"type\": \"BANNER\", \"usedPoint\": 50, \"usedAt\": \"2024-06-10\", \"hasNextPage\": false}] }"
                             )
                     )
             ),
@@ -144,7 +143,7 @@ public ResponseEntity<GlobalApiResponse<List<SavedPointDetailResponseDTO>>> getP
                     )
             )
     })
-    public ResponseEntity<GlobalApiResponse<List<UsedPointDetailResponseDTO>>> getUsedPointDetails(
+    public ResponseEntity<GlobalApiResponse<PagedResponseDTO<UsedPointDetailResponseDTO>>> getUsedPointDetails(
             @AuthenticationPrincipal UserDetailsImpl userDetails,
             @RequestParam(value = "cursorId", required = false) Long cursorId,
             @RequestParam(value = "limit", defaultValue = "6") int limit) {
@@ -153,7 +152,7 @@ public ResponseEntity<GlobalApiResponse<List<UsedPointDetailResponseDTO>>> getUs
             cursorId = Long.MAX_VALUE;
         }
 
-        List<UsedPointDetailResponseDTO> responseDTOs = pointService.getUpDetails(userDetails, cursorId, limit);
+        PagedResponseDTO<UsedPointDetailResponseDTO> responseDTOs = pointService.getUpDetails(userDetails, cursorId, limit);
 
         return ResponseEntity.status(SUCCESS_USED_POINT_READ.getHttpStatus())
                 .body(

diff --git a/src/main/java/team9502/sinchulgwinong/domain/point/dto/response/PagedResponseDTO.java b/src/main/java/team9502/sinchulgwinong/domain/point/dto/response/PagedResponseDTO.java
@@ -0,0 +1,19 @@
+package team9502.sinchulgwinong.domain.point.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class PagedResponseDTO<T> {
+
+    private List<T> data;
+
+    @Schema(description = "다음 페이지 존재 여부", example = "true")
+    private boolean hasNextPage;
+}
diff --git a/src/main/java/team9502/sinchulgwinong/domain/point/service/PointService.java b/src/main/java/team9502/sinchulgwinong/domain/point/service/PointService.java
@@ -4,8 +4,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import team9502.sinchulgwinong.domain.companyUser.entity.CompanyUser;
-import team9502.sinchulgwinong.domain.companyUser.repository.CompanyUserRepository;
 import team9502.sinchulgwinong.domain.point.CommonPoint;
+import team9502.sinchulgwinong.domain.point.dto.response.PagedResponseDTO;
 import team9502.sinchulgwinong.domain.point.dto.response.PointSummaryResponseDTO;
 import team9502.sinchulgwinong.domain.point.dto.response.SavedPointDetailResponseDTO;
 import team9502.sinchulgwinong.domain.point.dto.response.UsedPointDetailResponseDTO;
@@ -18,7 +18,6 @@
 import team9502.sinchulgwinong.domain.point.repository.SavedPointRepository;
 import team9502.sinchulgwinong.domain.point.repository.UsedPointRepository;
 import team9502.sinchulgwinong.domain.user.entity.User;
-import team9502.sinchulgwinong.domain.user.repository.UserRepository;
 import team9502.sinchulgwinong.global.exception.ApiException;
 import team9502.sinchulgwinong.global.exception.ErrorCode;
 import team9502.sinchulgwinong.global.security.UserDetailsImpl;
@@ -30,8 +29,6 @@
 @RequiredArgsConstructor
 public class PointService {
 
-    private final UserRepository userRepository;
-    private final CompanyUserRepository companyUserRepository;
     private final PointRepository pointRepository;
     private final SavedPointRepository savedPointRepository;
     private final UsedPointRepository usedPointRepository;
@@ -137,33 +134,47 @@ public PointSummaryResponseDTO getPointSummary(UserDetailsImpl userDetails) {
     }
 
     @Transactional(readOnly = true)
-    public List<SavedPointDetailResponseDTO> getSpDetails(UserDetailsImpl userDetails, Long cursorId, int limit) throws ApiException {
+    public PagedResponseDTO<SavedPointDetailResponseDTO> getSpDetails(UserDetailsImpl userDetails, Long cursorId, int limit) throws ApiException {
 
         Long pointId = getPointId(userDetails);
 
         if (cursorId == null) {
             cursorId = Long.MAX_VALUE;
         }
-        List<SavedPoint> savedPoints = savedPointRepository.findSavedPointsWithCursor(pointId, cursorId, limit);
+        List<SavedPoint> savedPoints = savedPointRepository.findSavedPointsWithCursor(pointId, cursorId, limit + 1);
+        boolean hasNextPage = savedPoints.size() > limit;
 
-        return savedPoints.stream()
+        if (hasNextPage) {
+            savedPoints.remove(savedPoints.size() - 1);
+        }
+
+        List<SavedPointDetailResponseDTO> dtoList = savedPoints.stream()
                 .map(sp -> new SavedPointDetailResponseDTO(sp.getSpType(), sp.getSpAmount(), sp.getCreatedAt().toLocalDate()))
                 .collect(Collectors.toList());
+
+        return new PagedResponseDTO<>(dtoList, hasNextPage);
     }
 
     @Transactional(readOnly = true)
-    public List<UsedPointDetailResponseDTO> getUpDetails(UserDetailsImpl userDetails, Long cursorId, int limit) throws ApiException {
+    public PagedResponseDTO<UsedPointDetailResponseDTO> getUpDetails(UserDetailsImpl userDetails, Long cursorId, int limit) throws ApiException {
 
         Long pointId = getPointId(userDetails);
 
         if (cursorId == null) {
             cursorId = Long.MAX_VALUE;
         }
-        List<UsedPoint> usedPoints = usedPointRepository.findUsedPointsWithCursor(pointId, cursorId, limit);
+        List<UsedPoint> usedPoints = usedPointRepository.findUsedPointsWithCursor(pointId, cursorId, limit + 1);
+        boolean hasNextPage = usedPoints.size() > limit;
 
-        return usedPoints.stream()
+        if (hasNextPage) {
+            usedPoints.remove(usedPoints.size() - 1);
+        }
+
+        List<UsedPointDetailResponseDTO> dtoList = usedPoints.stream()
                 .map(up -> new UsedPointDetailResponseDTO(up.getUpType(), up.getUpAmount(), up.getCreatedAt().toLocalDate()))
                 .collect(Collectors.toList());
+
+        return new PagedResponseDTO<>(dtoList, hasNextPage);
     }
 
     /*