Skip to content

Commit 5f50b29

Browse files
committed
fix git error
1 parent eaadba9 commit 5f50b29

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/main/java/com/itasocialacademy/oitassist/competition/service/CompetitionServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public CompetitionResponse changeStatus(Long competitionId, ChangeCompetitionSta
107107
if (request.status() == CompetitionStatus.ENROLLMENT
108108
|| request.status() == CompetitionStatus.PUBLISHED) {
109109
validatePublishingRequirements(competitionId);
110-
} else if (status == CompetitionStatus.FINISHED) {
110+
} else if (request.status() == CompetitionStatus.FINISHED) {
111111
validator.validateAllStagesCompletedForCompetition(competitionId);
112112
}
113113

src/test/java/com/itasocialacademy/oitassist/competition/service/CompetitionServiceTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,15 @@ void changeStatus_invalidTransition_publishedToDraft_shouldThrowException() {
215215

216216
@Test
217217
void changeStatus_publishedToFinished_withAllStagesCompleted_shouldSucceed() {
218+
ChangeCompetitionStatusRequest request = new ChangeCompetitionStatusRequest(
219+
CompetitionStatus.FINISHED, 1L);
220+
218221
competition.setCompetitionStatus(CompetitionStatus.PUBLISHED);
219222
when(competitionRepository.findById(1L)).thenReturn(Optional.of(competition));
220223
when(competitionRepository.save(any(Competition.class))).thenReturn(competition);
221224
when(mapper.toResponse(any(Competition.class))).thenReturn(getCompetitionResponse());
222225

223-
competitionService.changeStatus(1L, CompetitionStatus.FINISHED);
226+
competitionService.changeStatus(1L, request);
224227

225228
assertEquals(CompetitionStatus.FINISHED, competition.getCompetitionStatus());
226229
verify(validator).validateAllStagesCompletedForCompetition(1L);
@@ -229,6 +232,9 @@ void changeStatus_publishedToFinished_withAllStagesCompleted_shouldSucceed() {
229232

230233
@Test
231234
void changeStatus_publishedToFinished_withIncompleteStage_shouldThrowException() {
235+
ChangeCompetitionStatusRequest request = new ChangeCompetitionStatusRequest(
236+
CompetitionStatus.FINISHED, 1L);
237+
232238
competition.setCompetitionStatus(CompetitionStatus.PUBLISHED);
233239
when(competitionRepository.findById(1L)).thenReturn(Optional.of(competition));
234240

@@ -239,7 +245,7 @@ void changeStatus_publishedToFinished_withIncompleteStage_shouldThrowException()
239245

240246
CompetitionHierarchyValidationException exception = assertThrows(
241247
CompetitionHierarchyValidationException.class,
242-
() -> competitionService.changeStatus(1L, CompetitionStatus.FINISHED));
248+
() -> competitionService.changeStatus(1L, request));
243249

244250
assertTrue(exception.getMessage().contains("Not all stages are completed"));
245251
verify(competitionRepository, never()).save(any());

0 commit comments

Comments
 (0)