diff --git a/src/main/generated/com/example/api/domain/QOfferEmployment.java b/src/main/generated/com/example/api/domain/QOfferEmployment.java index a6634fba..9f79f3ce 100644 --- a/src/main/generated/com/example/api/domain/QOfferEmployment.java +++ b/src/main/generated/com/example/api/domain/QOfferEmployment.java @@ -30,6 +30,8 @@ public class QOfferEmployment extends EntityPathBase { public final DateTimePath suggestEndTime = createDateTime("suggestEndTime", java.time.LocalDateTime.class); + public final BooleanPath suggestFinished = createBoolean("suggestFinished"); + public final NumberPath suggestHourlyPay = createNumber("suggestHourlyPay", Integer.class); public final NumberPath suggestId = createNumber("suggestId", Long.class); diff --git a/src/main/java/com/example/api/account/repository/AccountRepository.java b/src/main/java/com/example/api/account/repository/AccountRepository.java index 4622727f..363aa6f5 100644 --- a/src/main/java/com/example/api/account/repository/AccountRepository.java +++ b/src/main/java/com/example/api/account/repository/AccountRepository.java @@ -30,9 +30,9 @@ public interface AccountRepository extends JpaRepository { @Modifying @Query("update Account a " + - "set a.starPoint = ((a.starPoint * a.workCount) + :newStarPoint) / (a.workCount+1), " + + "set a.starPoint = ((a.starPoint * a.workCount) + :starPoint) / (a.workCount+1), " + "a.workCount = a.workCount + 1 " + "where a.accountId in " + "(select oe.employee.accountId From OfferEmployment oe where oe.suggestId = :suggestId)") - void updateWorkCountBySuggestId(@Param("suggestId") Long suggestId, @Param("starPoint") Integer newStarPoint); + void updateWorkCountAndStarPointBySuggestId(@Param("suggestId") Long suggestId, @Param("starPoint") Integer newStarPoint); } \ No newline at end of file diff --git a/src/main/java/com/example/api/offeremployment/OfferEmploymentService.java b/src/main/java/com/example/api/offeremployment/OfferEmploymentService.java index 32dc5790..0d855656 100644 --- a/src/main/java/com/example/api/offeremployment/OfferEmploymentService.java +++ b/src/main/java/com/example/api/offeremployment/OfferEmploymentService.java @@ -43,6 +43,6 @@ public void completeOfferEmployment(OfferEmploymentCompleteRequest completeReque // 알바생 평점 조정 Integer reviewScore = reviewRepository.findReviewStarPointBySuggestId(completeRequest.suggestId()); // 알바 횟수 count + 1 - accountRepository.updateWorkCountBySuggestId(completeRequest.suggestId(), reviewScore); + accountRepository.updateWorkCountAndStarPointBySuggestId(completeRequest.suggestId(), reviewScore); } } \ No newline at end of file diff --git a/src/main/java/com/example/api/offeremployment/controller/OfferEmploymentController.java b/src/main/java/com/example/api/offeremployment/controller/OfferEmploymentController.java index b4923e1f..3fa02cd6 100644 --- a/src/main/java/com/example/api/offeremployment/controller/OfferEmploymentController.java +++ b/src/main/java/com/example/api/offeremployment/controller/OfferEmploymentController.java @@ -27,7 +27,7 @@ public ResponseEntity sendOfferEmployment( return ResponseEntity.ok(offerEmploymentResponse); } - @PostMapping + @PostMapping("/complete") public ResponseEntity completeOfferEmployment( @RequestBody final OfferEmploymentCompleteRequest completeRequest ) {