Skip to content

Commit

Permalink
feat: move validation logic into separate function
Browse files Browse the repository at this point in the history
  • Loading branch information
Inderpal Singh committed Mar 21, 2024
1 parent 9bf6d93 commit 93572c5
Showing 1 changed file with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ public void submitApplication(Long id) {
var principal = (OidcJwtCallerPrincipal) identity.getPrincipal();
String userId = principal.getClaim(USER_ID_CLAIM);

checkApplication(id, userId);

SubmitApplicationCommand command = SubmitApplicationCommand.builder()
.applicationId(id)
.build();

remsApplicationCommandApi.apiApplicationsSubmitPost(command, remsApiKey, userId);
}

private void checkApplication(Long id, String userId) {
try {
var application = remsApplicationsApi.apiApplicationsApplicationIdGet(id, remsApiKey, userId);

Expand All @@ -56,19 +66,14 @@ public void submitApplication(Long id) {
if (!application.getApplicationState().equals(ApplicationStateEnum.DRAFT) && !application.getApplicationState().equals(ApplicationStateEnum.RETURNED)) {
throw new ApplicationNotInCorrectStateException("Application is not in a submittable status");
}

} catch (WebApplicationException e) {
if (e.getResponse().getStatus() == 404) {
throw new ApplicationNotFoundException("Application not found");
} else {
throw e;
}
}

SubmitApplicationCommand command = SubmitApplicationCommand.builder()
.applicationId(id)
.build();
throw e;
}

remsApplicationCommandApi.apiApplicationsSubmitPost(command, remsApiKey, userId);
}

}

0 comments on commit 93572c5

Please sign in to comment.