Skip to content

Commit

Permalink
Merge pull request #277 from Modagbul/MNG-22
Browse files Browse the repository at this point in the history
MNG-22 : 반복미션 모아보기 인증 인원수 리턴 타입 변경
  • Loading branch information
minsu20 authored May 6, 2024
2 parents 407791d + 02c7527 commit 4841dcc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ public class GatherSingleMissionRes {
private String missionTitle;
private String dueTo;
private String status;
private Long done;
private Long total;
private String done;
private String total;

public GatherSingleMissionRes(Long missionId, Long teamId, String teamName, String missionTitle, String dueTo, String status, Long total) {
public GatherSingleMissionRes(Long missionId, Long teamId, String teamName, String missionTitle, String dueTo, String status, String total) {
this.missionId = missionId;
this.teamId = teamId;
this.teamName = teamName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public Optional<List<GatherSingleMissionRes>> findSingleMissionByMemberId(Long m
missionArchive.status.coalesce(mission.status).stringValue(),

JPAExpressions
.select(missionArchive.member.count().longValue())
.select(missionArchive.member.count().stringValue())
.from(missionArchive)
.where(
missionArchive.mission.id.eq(mission.id),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public class MissionGatherControllerTest extends CommonControllerTest {
.teamName("team name")
.missionTitle("mission title")
.status("WAIT/ONGOING/SKIP/COMPLETE")
.done(0L)
.total(5L)
.done("0")
.total("5")
.build());

given(missionGatherBoardUseCase.getAllActiveSingleMissions(any())).willReturn(output);
Expand Down Expand Up @@ -152,8 +152,8 @@ public class MissionGatherControllerTest extends CommonControllerTest {
.teamName("team name")
.missionTitle("mission title")
.status("WAIT/ONGOING/SKIP/COMPLETE")
.done(0L)
.total(5L)
.done("0")
.total("5")
.build());

given(missionGatherBoardUseCase.getTeamActiveSingleMissions(any(),any())).willReturn(output);
Expand Down

0 comments on commit 4841dcc

Please sign in to comment.