Skip to content

Commit 75cf3fd

Browse files
committed
Revert "임시 테스트용 배포(adminId 삭제)"
This reverts commit 24948b7, reversing changes made to a3a67c0.
1 parent 24948b7 commit 75cf3fd

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/main/java/com/matzip/admin/controller/AdminController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public ApiResponse<PlaceRegisterRequestDetailResponse> findPlaceRegisterRequestD
5555
@PostMapping("/requests/places/{placeId}/review")
5656
public ApiResponse<?> reviewPlaceRegisterRequest(
5757
@PathVariable("placeId") Long placeId,
58-
@RequestBody PlaceRegisterRequestReviewRequest request
59-
// @AuthenticationPrincipal UserPrincipal admin
58+
@RequestBody PlaceRegisterRequestReviewRequest request,
59+
@AuthenticationPrincipal UserPrincipal admin
6060
) {
6161
adminPlaceRegisterRequestService.review(
62-
placeId, request.status(), request.rejectedReason()
62+
placeId, request.status(), request.rejectedReason(), admin.getUserId()
6363
);
6464
return ApiResponse.successWithoutData();
6565
}

src/main/java/com/matzip/admin/domain/RequestReview.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class RequestReview extends BaseEntity {
1313

1414
private Long placeId;
1515

16-
// private Long adminId;
16+
private Long adminId;
1717

1818
@Enumerated(EnumType.STRING)
1919
private RequestReviewStatus status;
@@ -24,25 +24,25 @@ protected RequestReview() {
2424
}
2525

2626
@Builder
27-
public RequestReview(Long placeId, RequestReviewStatus status, String rejectedReason) {
27+
public RequestReview(Long placeId, Long adminId, RequestReviewStatus status, String rejectedReason) {
2828
this.placeId = placeId;
29-
// this.adminId = adminId;
29+
this.adminId = adminId;
3030
this.status = status;
3131
this.rejectedReason = rejectedReason;
3232
}
3333

34-
public static RequestReview approved(Long placeId) {
34+
public static RequestReview approved(Long placeId, Long adminId) {
3535
return RequestReview.builder()
3636
.placeId(placeId)
37-
// .adminId(adminId)
37+
.adminId(adminId)
3838
.status(RequestReviewStatus.APPROVED)
3939
.build();
4040
}
4141

42-
public static RequestReview rejected(Long placeId, String rejectedReason) {
42+
public static RequestReview rejected(Long placeId, Long adminId, String rejectedReason) {
4343
return RequestReview.builder()
4444
.placeId(placeId)
45-
// .adminId(adminId)
45+
.adminId(adminId)
4646
.status(RequestReviewStatus.REJECTED)
4747
.rejectedReason(rejectedReason)
4848
.build();

src/main/java/com/matzip/admin/service/AdminPlaceRegisterRequestService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,30 @@ public AdminPlaceRegisterRequestService(PlaceRepository placeRepository, Request
2727
}
2828

2929
@Transactional
30-
public void review(Long placeId, RequestReviewStatus status, String rejectedReason) {
30+
public void review(Long placeId, RequestReviewStatus status, String rejectedReason, Long adminId) {
3131
validateReviewRequest(status, rejectedReason);
3232

3333
Place place = placeRepository.findById(placeId)
3434
.orElseThrow(() -> new BusinessException(ErrorCode.PLACE_NOT_FOUND));
3535
validatePlaceStatus(place);
3636

3737
switch (status) {
38-
case APPROVED -> approve(place);
39-
case REJECTED -> reject(place, rejectedReason);
38+
case APPROVED -> approve(place, adminId);
39+
case REJECTED -> reject(place, rejectedReason, adminId);
4040
}
4141

4242
applicationEventPublisher.publishEvent(new RequestReviewEvent(placeId, status));
4343
}
4444

45-
private void approve(Place place) {
45+
private void approve(Place place, Long adminId) {
4646
place.approve();
47-
RequestReview approved = RequestReview.approved(place.getId());
47+
RequestReview approved = RequestReview.approved(place.getId(), adminId);
4848
requestReviewRepository.save(approved);
4949
}
5050

51-
private void reject(Place place, String rejectedReason) {
51+
private void reject(Place place, String rejectedReason, Long adminId) {
5252
place.reject();
53-
RequestReview rejected = RequestReview.rejected(place.getId(), rejectedReason);
53+
RequestReview rejected = RequestReview.rejected(place.getId(), adminId, rejectedReason);
5454
requestReviewRepository.save(rejected);
5555
}
5656

0 commit comments

Comments
 (0)