Skip to content

Commit 2f473b0

Browse files
committed
feat: update service and controller
1 parent 8240ea6 commit 2f473b0

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/main/java/com/itasocialacademy/oitassist/participation/controller/ApplicationController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public ResponseEntity<ProcessApplicationResponse> acceptRequest(@PathVariable Lo
108108
content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
109109
})
110110
@PreAuthorize("hasRole('ORG')")
111-
@PostMapping("/enrollment/applications/accept/list")
111+
@PostMapping("/enrollment/applications/accept-batch")
112112
public ResponseEntity<AcceptedApplicationListResponse> acceptRequests(
113113
@Valid @RequestBody AcceptApplicationListRequest request) {
114114
return ResponseEntity.status(HttpStatus.CREATED)
@@ -161,7 +161,7 @@ public ResponseEntity<ProcessApplicationResponse> rejectRequest(
161161
content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
162162
})
163163
@PreAuthorize("hasRole('ORG')")
164-
@PostMapping("/enrollment/applications/reject/list")
164+
@PostMapping("/enrollment/applications/reject-batch")
165165
public ResponseEntity<RejectedApplicationListResponse> rejectRequests(
166166
@Valid @RequestBody RejectApplicationListRequest request) {
167167
return ResponseEntity.status(HttpStatus.CREATED)

src/main/java/com/itasocialacademy/oitassist/participation/service/ApplicationServiceImpl.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -205,20 +205,15 @@ public RejectedApplicationListResponse rejectApplicationList(RejectApplicationLi
205205

206206
for (Application application : applications) {
207207
if (application.getStatus() != PENDING_STATUS) {
208-
failed.add(new FailedApplicationDecisionItemResponse(
209-
application.getId(), "Application is not pending"));
208+
failed.add(
209+
new FailedApplicationDecisionItemResponse(application.getId(), "Application is not pending"));
210210
continue;
211211
}
212-
try {
213-
Application savedApplication = applicationSaver.saveRejectedApplication(
214-
userId, application, request.rejectionReason());
215-
succeeded.add(new SucceededApplicationRejectingItemResponse(
216-
savedApplication.getId(), savedApplication.getUserId(), RequestStatus.REJECTED));
217-
} catch (DataIntegrityViolationException e) {
218-
throw new UnexpectedConstraintViolationException(
219-
"Unexpected database constraint violation while accepting application",
220-
ErrorCode.DATA_ACCESS_ERROR, e);
221-
}
212+
Application savedApplication = applicationSaver.saveRejectedApplication(
213+
userId, application, request.rejectionReason());
214+
succeeded.add(
215+
new SucceededApplicationRejectingItemResponse(savedApplication.getId(), userId,
216+
RequestStatus.REJECTED));
222217
}
223218
RejectedApplicationListResponse response = RejectedApplicationListResponse.builder()
224219
.application(new ApplicationDecisionSummary(competitionId, stageId, userId, Instant.now()))

0 commit comments

Comments
 (0)