Skip to content

Commit 87deee4

Browse files
committed
fix: coderabbit issues
1 parent 83ad458 commit 87deee4

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,11 @@ public class InvitationController {
6464
public ResponseEntity<CreateInvitationResponse> invite(
6565
@PathVariable Long competitionId,
6666
@PathVariable Long stageId,
67-
@Valid @RequestBody CreateInvitationRequest createInvitationRequest) {
67+
@Valid @RequestBody CreateInvitationRequest request) {
68+
request.setCompetitionId(competitionId);
69+
request.setStageId(stageId);
6870
return ResponseEntity.status(HttpStatus.CREATED)
69-
.body((CreateInvitationResponse) invitationService.sendEnrollmentRequest(createInvitationRequest));
71+
.body((CreateInvitationResponse) invitationService.sendEnrollmentRequest(request));
7072
}
7173

7274
@Operation(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ public Page<ApplicationListItemResponse> getEnrollmentRequests(
153153
}
154154
Page<Application> applications = applicationRepository.findAll(
155155
ApplicationSpecification.hasCompetitionAndStage(competitionId, stageId)
156-
.and(ApplicationSpecification.userIdIn(filterIds)),
156+
.and(ApplicationSpecification.userIdIn(filterIds))
157+
.and(ApplicationSpecification.hasStatus(RequestStatus.PENDING)),
157158
pageable);
158159
List<ApplicationListItemResponse> responses = enrollmentAssembler.enrichWithUser(
159160
applications.toList(), Application::getUserId,
@@ -162,7 +163,7 @@ public Page<ApplicationListItemResponse> getEnrollmentRequests(
162163
application.getIssuedAt(),
163164
application.getStatus(),
164165
userSummaryMapper.toUserSummary(user)));
165-
return new PageImpl<>(responses);
166+
return new PageImpl<>(responses, pageable, applications.getTotalPages());
166167
}
167168

168169
private void validateUserCanApply(Long userId, CreateApplicationRequest request) {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ public Page<InvitationListItemResponse> getEnrollmentRequests(EnrollmentRequests
183183
}
184184
Page<Invitation> invitations = invitationRepository.findAll(
185185
InvitationSpecification.hasCompetitionAndStage(competitionId, stageId)
186-
.and(InvitationSpecification.studentIdIn(filterIds)),
186+
.and(InvitationSpecification.studentIdIn(filterIds))
187+
.and(InvitationSpecification.hasStatus(RequestStatus.PENDING)),
187188
pageable);
188189

189190
List<InvitationListItemResponse> responses = enrollmentAssembler.enrichWithUser(
@@ -193,7 +194,7 @@ public Page<InvitationListItemResponse> getEnrollmentRequests(EnrollmentRequests
193194
invitation.getIssuedAt(),
194195
invitation.getStatus(),
195196
userSummaryMapper.toUserSummary(user)));
196-
return new PageImpl<>(responses);
197+
return new PageImpl<>(responses, pageable, invitations.getTotalPages());
197198
}
198199

199200
private Set<Long> findStudentsWithPendingInvitations(List<Long> studentIds, CreateInvitationRequest request) {

0 commit comments

Comments
 (0)