diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/controller/AgendaControllerTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/controller/AgendaControllerTest.java index 1bef0cb0d..9e765fa55 100644 --- a/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/controller/AgendaControllerTest.java +++ b/gg-agenda-api/src/test/java/gg/agenda/api/user/agenda/controller/AgendaControllerTest.java @@ -587,11 +587,11 @@ void finishAgendaSuccess() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true, AgendaStatus.CONFIRM); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()) .awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); @@ -629,12 +629,12 @@ void finishAgendaFailedWithNoAwards() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true, AgendaStatus.CONFIRM); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i) + .awardPriority(i + 1).build()) .collect(Collectors.toList()); // expected @@ -680,12 +680,12 @@ void finishAgendaSuccessWithNoRankAndAwards() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), false, AgendaStatus.CONFIRM); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i) + .awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); String response = objectMapper.writeValueAsString(agendaAwardsReqDto); @@ -722,12 +722,10 @@ void finishAgendaFailedWithInvalidTeam() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true, AgendaStatus.CONFIRM); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); awards.add(AgendaTeamAward.builder() @@ -750,12 +748,11 @@ void finishAgendaFailedWithNoAgenda() throws Exception { int teamSize = 10; int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i) + .awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); String response = objectMapper.writeValueAsString(agendaAwardsReqDto); @@ -821,12 +818,10 @@ void finishAgendaFailedNotHost() throws Exception { int awardSize = 3; User another = testDataUtils.createNewUser(); Agenda agenda = agendaMockData.createAgenda(another.getIntraId(), LocalDateTime.now().minusDays(10), true); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); String response = objectMapper.writeValueAsString(agendaAwardsReqDto); @@ -848,12 +843,10 @@ void finishAgendaFailedAlreadyConfirm() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), AgendaStatus.FINISH); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); String response = objectMapper.writeValueAsString(agendaAwardsReqDto); @@ -875,12 +868,10 @@ void finishAgendaFailedAlreadyCancel() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), AgendaStatus.CANCEL); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); String response = objectMapper.writeValueAsString(agendaAwardsReqDto); @@ -902,12 +893,10 @@ void finishAgendaFailedBeforeStartTime() throws Exception { int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().plusDays(1), AgendaStatus.OPEN); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); AgendaAwardsReqDto agendaAwardsReqDto = AgendaAwardsReqDto.builder().awards(awards).build(); String response = objectMapper.writeValueAsString(agendaAwardsReqDto); @@ -928,12 +917,10 @@ void finishAgendaFailedWithEmptyAwardName() throws Exception { int teamSize = 10; int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); awards.add(AgendaTeamAward.builder().teamName(agendaTeams.get(awardSize).getName()) .awardName("").awardPriority(awardSize).build()); // empty award name @@ -956,12 +943,10 @@ void finishAgendaFailedWithNullAwardName() throws Exception { int teamSize = 10; int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); awards.add(AgendaTeamAward.builder().teamName(agendaTeams.get(awardSize).getName()) .awardPriority(awardSize).build()); // null award name @@ -984,12 +969,10 @@ void finishAgendaFailedWithEmptyTeamName() throws Exception { int teamSize = 10; int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); awards.add(AgendaTeamAward.builder().awardName("prize" + awardSize) .teamName("").awardPriority(awardSize).build()); // empty award name @@ -1012,12 +995,10 @@ void finishAgendaFailedWithNullTeamName() throws Exception { int teamSize = 10; int awardSize = 3; Agenda agenda = agendaMockData.createAgenda(user.getIntraId(), LocalDateTime.now().minusDays(10), true); - List agendaTeams = IntStream.range(0, teamSize) - .mapToObj(i -> agendaMockData.createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)) - .collect(Collectors.toList()); - List awards = IntStream.range(0, awardSize) - .mapToObj(i -> AgendaTeamAward.builder().teamName(agendaTeams.get(i).getName()) - .awardName("prize" + i).awardPriority(i + 1).build()) + List agendaTeams = IntStream.range(0, teamSize).mapToObj(i -> agendaMockData + .createAgendaTeam(agenda, "team" + i, AgendaTeamStatus.CONFIRM)).collect(Collectors.toList()); + List awards = IntStream.range(0, awardSize).mapToObj(i -> AgendaTeamAward.builder() + .teamName(agendaTeams.get(i).getName()).awardName("prize" + i).awardPriority(i + 1).build()) .collect(Collectors.toList()); awards.add(AgendaTeamAward.builder().awardName("prize" + awardSize) .awardPriority(awardSize).build()); // null award name