#19 feat(ContractService): 계약 리뷰 작섵 기능 구현

feat(Review): 양방향 관계 설정
feat(ContractReviewService): 계약 리뷰 추가 기능 ContractService로부터 분리
feat(Review): 별점 1~5 만 가능하도록 검증 기능추가
feat(ContractReviewService): 정상종료 되도록 변경

Author: huhdy32

build.gradle

@@ -26,6 +26,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     compileOnly 'org.projectlombok:lombok'
 //    runtimeOnly 'com.mysql:mysql-connector-j'
     runtimeOnly 'com.h2database:h2'

src/main/java/com/example/api/contracts/ContractRepository.java

@@ -1,7 +1,12 @@
 package com.example.api.contracts;
 
 import com.example.api.domain.Contract;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
+@Repository
 interface ContractRepository extends JpaRepository<Contract, Long> {
 }

src/main/java/com/example/api/contracts/ContractReviewService.java

@@ -0,0 +1,32 @@
+package com.example.api.contracts;
+
+import com.example.api.contracts.dto.AddContractReviewCommand;
+import com.example.api.domain.Contract;
+import com.example.api.domain.Review;
+import com.example.api.exception.BusinessException;
+import com.example.api.exception.ErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+@Service
+@RequiredArgsConstructor
+public class ContractReviewService {
+    private final ReviewRepository reviewRepository;
+    private final ContractRepository contractRepository;
+    private final ReviewMapper reviewMapper;
+
+    @Transactional
+    public void addContractReview(@Validated final AddContractReviewCommand addContractReviewCommand) {
+        final Contract contract = contractRepository.findById(addContractReviewCommand.contractId())
+                .orElseThrow(() -> new BusinessException(ErrorCode.CONTRACT_EXCEPTION));
+        if (contract.isContractSucceeded()) {
+            final Review contractReview = reviewMapper.createReview(addContractReviewCommand);
+            contract.addReview(contractReview);
+            reviewRepository.save(contractReview);
+            return;
+        }
+        throw new BusinessException("계약이 완료되지 않았습니다.", ErrorCode.CONTRACT_EXCEPTION);
+    }
+}

src/main/java/com/example/api/contracts/ContractService.java

@@ -2,9 +2,9 @@
 
 import com.example.api.contracts.dto.AcceptContractCommand;
 import com.example.api.contracts.dto.AcceptSuggestCommand;
-import com.example.api.contracts.dto.UpdateContractConditionCommand;
 import com.example.api.contracts.dto.QueryAllSuggestsForMeCommand;
 import com.example.api.contracts.dto.SuggestedBusinessResponse;
+import com.example.api.contracts.dto.UpdateContractConditionCommand;
 import com.example.api.contracts.update.UpdateContractConditionManager;
 import com.example.api.domain.Contract;
 import com.example.api.domain.OfferEmployment;

src/main/java/com/example/api/contracts/OfferRepository.java

@@ -7,7 +7,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-public interface OfferRepository extends JpaRepository<OfferEmployment, Long> {
+interface OfferRepository extends JpaRepository<OfferEmployment, Long> {
     @Query("SELECT new com.example.api.contracts.dto.SuggestedBusinessResponse(offer.business.businessId, offer.suggestStartTime, offer.suggestEndTime, offer.suggestHourlyPay, offer.suggestReaded, offer.suggestSucceeded) "
             + "FROM OfferEmployment offer "
             + "WHERE offer.employee.employeeId = :employeeId")

src/main/java/com/example/api/contracts/ReviewMapper.java

@@ -0,0 +1,12 @@
+package com.example.api.contracts;
+
+import com.example.api.contracts.dto.AddContractReviewCommand;
+import com.example.api.domain.Review;
+import org.springframework.stereotype.Service;
+
+@Service
+class ReviewMapper {
+    public Review createReview(final AddContractReviewCommand reviewCommand) {
+        return new Review(reviewCommand.starPoint(), reviewCommand.reviewContent());
+    }
+}

src/main/java/com/example/api/contracts/ReviewRepository.java

@@ -0,0 +1,9 @@
+package com.example.api.contracts;
+
+import com.example.api.domain.Review;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+interface ReviewRepository extends JpaRepository<Review, Long> {
+}

src/main/java/com/example/api/contracts/controller/ContractController.java

@@ -3,6 +3,8 @@
 import com.example.api.contracts.ContractService;
 import com.example.api.contracts.dto.AcceptContractCommand;
 import com.example.api.contracts.dto.AcceptSuggestCommand;
+import com.example.api.contracts.dto.AddContractReviewCommand;
+import com.example.api.contracts.dto.AddContractReviewRequest;
 import com.example.api.contracts.dto.QueryAllSuggestsForMeCommand;
 import com.example.api.contracts.dto.SuggestedBusinessResponse;
 import com.example.api.contracts.dto.UpdateContractConditionCommand;

src/main/java/com/example/api/contracts/controller/ContractReviewController.java

@@ -0,0 +1,27 @@
+package com.example.api.contracts.controller;
+
+import com.example.api.contracts.ContractReviewService;
+import com.example.api.contracts.dto.AddContractReviewCommand;
+import com.example.api.contracts.dto.AddContractReviewRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+class ContractReviewController {
+    private final ContractReviewService contractReviewService;
+
+    @PostMapping("/api/v1/contracts/{contractId}/reviews")
+    public ResponseEntity<?> addContractReview(
+            @PathVariable(required = true) final Long contractId,
+            @RequestBody final AddContractReviewRequest addContractReviewRequest
+    ) {
+        final AddContractReviewCommand addReviewCommand = addContractReviewRequest.toCommand(contractId);
+        contractReviewService.addContractReview(addReviewCommand);
+        return ResponseEntity.ok(null);
+    }
+}

src/main/java/com/example/api/contracts/dto/AcceptContractCommand.java

@@ -1,9 +1,9 @@
 package com.example.api.contracts.dto;
 
-import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotNull;
 
 public record AcceptContractCommand(
-        @NonNull
+        @NotNull
         Long contractId
 ) {
 }

src/main/java/com/example/api/contracts/dto/AddContractReviewCommand.java

@@ -0,0 +1,14 @@
+package com.example.api.contracts.dto;
+
+import org.hibernate.validator.constraints.Range;
+import org.springframework.lang.NonNull;
+
+public record AddContractReviewCommand(
+        @NonNull
+        Long contractId,
+        String reviewContent,
+        @NonNull
+        @Range(min = 0L, max = 5L)
+        Integer starPoint
+) {
+}

src/main/java/com/example/api/contracts/dto/AddContractReviewRequest.java

@@ -0,0 +1,10 @@
+package com.example.api.contracts.dto;
+
+public record AddContractReviewRequest(
+        String reviewContent,
+        Integer starPoint
+) {
+    public AddContractReviewCommand toCommand(final Long contractId) {
+        return new AddContractReviewCommand(contractId, reviewContent, starPoint);
+    }
+}

src/main/java/com/example/api/domain/Contract.java

@@ -25,6 +25,9 @@ public class Contract extends BaseEntity {
     private int contractHourlyPay;
     @Column(name = "CONTRACT_SUCCEDED", columnDefinition = "boolean DEFAULT false")
     private boolean contractSucceeded;
+    @OneToOne
+    @JoinColumn(name = "REVIEW_ID")
+    private Review review;
 
     public Contract(
             final OfferEmployment offerEmployment,
@@ -59,5 +62,10 @@ public boolean isValidContractRangeTime() {
     public void succeed() {
         this.contractSucceeded = true;
     }
+
+    public void addReview(final Review review) {
+        this.review = review;
+        review.setContract(this);
+    }
 }
 

src/main/java/com/example/api/domain/Review.java

@@ -10,18 +10,22 @@
 @Getter
 @Setter
 @Table(name = "REVIEW")
-@AllArgsConstructor
 @NoArgsConstructor
 public class Review extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long suggestId;
-
+    private Long reviewId;
+    @OneToOne(mappedBy = "review")
+    private Contract contract;
     @Column(name = "REVIEW_STAR_POINT")
     private int reviewStarPoint;
-
     @Column(name = "REVIEW_CONTENT")
     private String reviewContent;
+
+    public Review(final int reviewStarPoint, final String reviewContent) {
+        this.reviewStarPoint = reviewStarPoint;
+        this.reviewContent = reviewContent;
+    }
 }
 

src/main/java/com/example/api/exception/ErrorCode.java

@@ -5,7 +5,9 @@
 
 @Getter
 public enum ErrorCode {
-    SERVER_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "-000", "서버 에러");
+    SERVER_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "-000", "서버 에러"),
+
+    CONTRACT_EXCEPTION(HttpStatus.BAD_REQUEST, "-400", "계약 정보 에러");
 
     private final HttpStatus httpStatus;
     private final String errorCode;