diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/flash/dto/FlashDetailResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/flash/dto/FlashDetailResponse.java index a017d1b5..de838265 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/flash/dto/FlashDetailResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/flash/dto/FlashDetailResponse.java @@ -64,6 +64,6 @@ public static FlashDetailResponse from(FlashFacade.FlashDetail result) { meeting.isApply(), meeting.isApproved(), MeetingUserResponse.from(meeting.leader()), - meeting.applies().stream().map(MeetingApplyWithUserResponse::from).toList()); + MeetingApplyWithUserResponse.fromAll(meeting.applies())); } } diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/JoinedMeetingPageResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/JoinedMeetingPageResponse.java index 019aba09..24450251 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/JoinedMeetingPageResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/JoinedMeetingPageResponse.java @@ -5,23 +5,12 @@ import org.sopt.makers.domain.crew.meeting.facade.MeetingFacade; public record JoinedMeetingPageResponse( - List data, - long totalCount, - int totalPage, - int limit, - int pageNo, - boolean hasNextPage, - boolean hasPrevPage) { + List meetings, MeetingPageMetaResponse meta) { public static JoinedMeetingPageResponse from(PageResult page) { return new JoinedMeetingPageResponse( page.content().stream().map(JoinedMeetingResponse::from).toList(), - page.totalElements(), - page.totalPages(), - page.limit(), - page.page(), - page.hasNext(), - page.hasPrevious()); + MeetingPageMetaResponse.from(page)); } public record JoinedMeetingResponse(String role, MeetingSummaryResponse meeting) { diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplicantListResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplicantListResponse.java index fec4623d..6d1745f1 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplicantListResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplicantListResponse.java @@ -10,7 +10,6 @@ public record MeetingApplicantListResponse(List ap } public static MeetingApplicantListResponse from(List applicants) { - return new MeetingApplicantListResponse( - applicants.stream().map(MeetingApplyWithUserResponse::from).toList()); + return new MeetingApplicantListResponse(MeetingApplyWithUserResponse.fromAll(applicants)); } } diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplyWithUserResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplyWithUserResponse.java index fb661888..f62ae9a0 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplyWithUserResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingApplyWithUserResponse.java @@ -1,31 +1,42 @@ package org.sopt.makers.api.controller.crew.meeting.dto; import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.IntStream; import org.sopt.makers.domain.crew.meeting.MeetingApply; import org.sopt.makers.domain.crew.meeting.service.MeetingService; public record MeetingApplyWithUserResponse( Long id, - Integer applyNumber, + int applyNumber, Integer type, Long meetingId, Long userId, String content, LocalDateTime appliedDate, Integer status, - MeetingUserResponse user) { + MeetingUserProfileResponse user) { - public static MeetingApplyWithUserResponse from(MeetingService.ApplyDetail detail) { + /** 서비스가 정렬·필터링한 응답 목록 순서대로 1부터 번호를 부여한다. */ + public static List fromAll( + List details) { + return IntStream.range(0, details.size()) + .mapToObj(index -> from(details.get(index), index + 1)) + .toList(); + } + + private static MeetingApplyWithUserResponse from( + MeetingService.ApplyDetail detail, int applyNumber) { MeetingApply apply = detail.apply(); return new MeetingApplyWithUserResponse( apply.id(), - null, + applyNumber, apply.type().getValue(), apply.meetingId(), apply.userId(), apply.content(), apply.appliedDate(), apply.status().getValue(), - MeetingUserResponse.from(detail.user())); + MeetingUserProfileResponse.from(detail.user())); } } diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingCoLeaderResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingCoLeaderResponse.java new file mode 100644 index 00000000..90bf7637 --- /dev/null +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingCoLeaderResponse.java @@ -0,0 +1,11 @@ +package org.sopt.makers.api.controller.crew.meeting.dto; + +import org.sopt.makers.domain.crew.meeting.MeetingUser; + +public record MeetingCoLeaderResponse( + Long userId, Long orgId, String userName, String userprofileImage) { + + public static MeetingCoLeaderResponse from(MeetingUser user) { + return new MeetingCoLeaderResponse(user.id(), user.id(), user.name(), user.profileImage()); + } +} diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingDetailResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingDetailResponse.java index fc2d348c..1a87f91c 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingDetailResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingDetailResponse.java @@ -20,6 +20,8 @@ public record MeetingDetailResponse( LocalDateTime startDate, LocalDateTime endDate, Integer capacity, + int status, + LocalDateTime createdTimestamp, String desc, String processDesc, LocalDateTime mStartDate, @@ -32,14 +34,14 @@ public record MeetingDetailResponse( Integer createdGeneration, Integer targetActiveGeneration, List joinableParts, - MeetingUserResponse meetingCreator, - List coMeetingLeaders, - Boolean isHost, + MeetingUserProfileResponse user, + List coMeetingLeaders, + Boolean host, Boolean apply, Boolean approved, Boolean isCoLeader, long approvedApplyCount, - List applies, + List appliedInfo, List welcomeMessageTypes, List meetingKeywordTypes) { @@ -48,33 +50,35 @@ public static MeetingDetailResponse from(MeetingFacade.MeetingDetailResult resul Meeting meeting = detail.meeting(); return baseFrom( meeting, - MeetingUserResponse.from(detail.leader()), - detail.coLeaders().stream().map(MeetingUserResponse::from).toList(), + detail.status().getValue(), + MeetingUserProfileResponse.from(detail.leader()), + detail.coLeaders().stream().map(MeetingCoLeaderResponse::from).toList(), detail.isHost(), detail.isApply(), detail.isApproved(), detail.isCoLeader(), detail.approvedApplyCount(), - detail.applies().stream().map(MeetingApplyWithUserResponse::from).toList(), + MeetingApplyWithUserResponse.fromAll(detail.applies()), MeetingTagMapper.fromWelcomeMessageTypes(result.meetingTagInfo().welcomeMessageTypes()), MeetingTagMapper.fromMeetingKeywordTypes(result.meetingTagInfo().meetingKeywordTypes())); } private static MeetingDetailResponse baseFrom( Meeting meeting, - MeetingUserResponse meetingCreator, - List coMeetingLeaders, - Boolean isHost, + int status, + MeetingUserProfileResponse user, + List coMeetingLeaders, + Boolean host, Boolean apply, Boolean approved, Boolean isCoLeader, long approvedApplyCount, - List applies, + List appliedInfo, List welcomeMessageTypes, List meetingKeywordTypes) { return new MeetingDetailResponse( meeting.id(), - meetingCreator.userId(), + user.id(), meeting.meetingDemandId(), meeting.title(), meeting.subTitle(), @@ -83,6 +87,8 @@ private static MeetingDetailResponse baseFrom( meeting.startDate(), meeting.endDate(), meeting.capacity(), + status, + meeting.createdAt(), meeting.description(), meeting.processDescription(), meeting.activityStartDate(), @@ -95,14 +101,14 @@ private static MeetingDetailResponse baseFrom( meeting.createdGeneration(), meeting.targetActiveGeneration(), meeting.joinableParts(), - meetingCreator, + user, coMeetingLeaders, - isHost, + host, apply, approved, isCoLeader, approvedApplyCount, - applies, + appliedInfo, welcomeMessageTypes, meetingKeywordTypes); } diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPageMetaResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPageMetaResponse.java new file mode 100644 index 00000000..f0cf7c48 --- /dev/null +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPageMetaResponse.java @@ -0,0 +1,22 @@ +package org.sopt.makers.api.controller.crew.meeting.dto; + +import org.sopt.makers.core.pagination.PageResult; + +public record MeetingPageMetaResponse( + int page, + int take, + long itemCount, + int pageCount, + boolean hasPreviousPage, + boolean hasNextPage) { + + public static MeetingPageMetaResponse from(PageResult page) { + return new MeetingPageMetaResponse( + page.page(), + page.limit(), + page.totalElements(), + page.totalPages(), + page.hasPrevious(), + page.hasNext()); + } +} diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPartMembersResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPartMembersResponse.java index b1aafa3c..b1f1ce4d 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPartMembersResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingPartMembersResponse.java @@ -16,6 +16,6 @@ public static MeetingPartMembersResponse from(MeetingService.MeetingPartMembers members.participantCount(), members.isActiveGeneration(), members.activeGeneration(), - members.appliedInfo().stream().map(MeetingApplyWithUserResponse::from).toList()); + MeetingApplyWithUserResponse.fromAll(members.appliedInfo())); } } diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingSummaryPageResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingSummaryPageResponse.java index 0a1abe17..8b08042a 100644 --- a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingSummaryPageResponse.java +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingSummaryPageResponse.java @@ -5,23 +5,12 @@ import org.sopt.makers.domain.crew.meeting.facade.MeetingFacade; public record MeetingSummaryPageResponse( - List data, - long totalCount, - int totalPage, - int limit, - int pageNo, - boolean hasNextPage, - boolean hasPrevPage) { + List meetings, MeetingPageMetaResponse meta) { public static MeetingSummaryPageResponse from( PageResult page) { return new MeetingSummaryPageResponse( page.content().stream().map(MeetingSummaryResponse::from).toList(), - page.totalElements(), - page.totalPages(), - page.limit(), - page.page(), - page.hasNext(), - page.hasPrevious()); + MeetingPageMetaResponse.from(page)); } } diff --git a/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingUserProfileResponse.java b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingUserProfileResponse.java new file mode 100644 index 00000000..92312e0f --- /dev/null +++ b/api/src/main/java/org/sopt/makers/api/controller/crew/meeting/dto/MeetingUserProfileResponse.java @@ -0,0 +1,36 @@ +package org.sopt.makers.api.controller.crew.meeting.dto; + +import java.util.List; +import org.sopt.makers.domain.crew.meeting.MeetingUser; +import org.sopt.makers.domain.user.Activity; + +/** 기존 CREW 모임장 및 신청자 사용자 응답 계약. */ +public record MeetingUserProfileResponse( + Long id, + String name, + Long orgId, + String profileImage, + List activities, + String phone) { + + public static MeetingUserProfileResponse from(MeetingUser user) { + if (user == null) { + return null; + } + return new MeetingUserProfileResponse( + user.id(), + user.name(), + user.id(), + user.profileImage(), + user.activities().stream().map(ActivityResponse::from).toList(), + user.phone()); + } + + public record ActivityResponse(String part, int generation) { + + private static ActivityResponse from(Activity activity) { + return new ActivityResponse( + activity.part() == null ? null : activity.part().getName(), activity.generation()); + } + } +} diff --git a/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingControllerTest.java b/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingControllerTest.java index a5f13abe..fafaba34 100644 --- a/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingControllerTest.java +++ b/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingControllerTest.java @@ -43,7 +43,7 @@ class MeetingControllerTest { .param("pageNo", "1") .param("limit", "20")) .andExpect(status().isOk()) - .andExpect(jsonPath("$.data.totalCount").value(0)); + .andExpect(jsonPath("$.data.meta.itemCount").value(0)); ArgumentCaptor commandCaptor = ArgumentCaptor.forClass(MeetingService.SearchMeetingsCommand.class); @@ -85,7 +85,7 @@ class MeetingControllerTest { mockMvc .perform(get("/meeting/v2/me/joined")) .andExpect(status().isOk()) - .andExpect(jsonPath("$.data.data").isArray()); + .andExpect(jsonPath("$.data.meetings").isArray()); verify(meetingFacade).findJoinedMeetings(USER_ID, 1, 10); } diff --git a/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingResponseContractTest.java b/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingResponseContractTest.java new file mode 100644 index 00000000..45a5d787 --- /dev/null +++ b/api/src/test/java/org/sopt/makers/api/controller/crew/meeting/MeetingResponseContractTest.java @@ -0,0 +1,363 @@ +package org.sopt.makers.api.controller.crew.meeting; + +import static org.hamcrest.Matchers.nullValue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.time.LocalDateTime; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; +import org.sopt.makers.api.controller.crew.CrewChannelMockMvc; +import org.sopt.makers.api.controller.crew.flash.FlashController; +import org.sopt.makers.core.pagination.PageResult; +import org.sopt.makers.core.type.Part; +import org.sopt.makers.domain.crew.flash.Flash; +import org.sopt.makers.domain.crew.flash.FlashPlaceType; +import org.sopt.makers.domain.crew.flash.FlashTimingType; +import org.sopt.makers.domain.crew.flash.facade.FlashFacade; +import org.sopt.makers.domain.crew.meeting.Meeting; +import org.sopt.makers.domain.crew.meeting.MeetingApply; +import org.sopt.makers.domain.crew.meeting.MeetingApplyStatus; +import org.sopt.makers.domain.crew.meeting.MeetingApplyType; +import org.sopt.makers.domain.crew.meeting.MeetingCategory; +import org.sopt.makers.domain.crew.meeting.MeetingStatus; +import org.sopt.makers.domain.crew.meeting.MeetingUser; +import org.sopt.makers.domain.crew.meeting.Member; +import org.sopt.makers.domain.crew.meeting.facade.MeetingFacade; +import org.sopt.makers.domain.crew.meeting.service.MeetingService; +import org.sopt.makers.domain.crew.meeting.tag.service.MeetingTagService; +import org.sopt.makers.domain.user.Activity; +import org.sopt.makers.domain.user.Team; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +class MeetingResponseContractTest { + + private static final Long USER_ID = 10L; + private static final LocalDateTime CREATED_AT = LocalDateTime.of(2026, 8, 1, 12, 0); + private final MeetingService service = mock(MeetingService.class); + private final MeetingFacade facade = mock(MeetingFacade.class); + private final MockMvc mockMvc = + CrewChannelMockMvc.of(new MeetingController(service, facade), USER_ID); + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void 상세는_기존_필드명으로_모임장_여부와_사용자_신청목록을_반환한다(boolean host) throws Exception { + when(facade.getMeetingDetail(1L, USER_ID)).thenReturn(detail(host, List.of())); + + mockMvc + .perform(get("/meeting/v2/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.host").value(host)) + .andExpect(jsonPath("$.data.status").value(1)) + .andExpect(jsonPath("$.data.createdTimestamp").value("2026-08-01T12:00:00")) + .andExpect(jsonPath("$.data.meetingDemandId").value(7)) + .andExpect(jsonPath("$.data.user.name").value("모임장")) + .andExpect(jsonPath("$.data.appliedInfo").isEmpty()) + .andExpect(jsonPath("$.data.isHost").doesNotExist()) + .andExpect(jsonPath("$.data.meetingCreator").doesNotExist()) + .andExpect(jsonPath("$.data.applies").doesNotExist()); + } + + @Test + void 모임장과_공동모임장과_신청자는_기존_사용자_필드를_반환한다() throws Exception { + MeetingService.ApplyDetail applicant = + new MeetingService.ApplyDetail( + MeetingApply.createApply(1L, 20L, "신청합니다", CREATED_AT), profile(20L)); + when(facade.getMeetingDetail(1L, USER_ID)).thenReturn(detail(true, List.of(applicant))); + + mockMvc + .perform(get("/meeting/v2/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.user.id").value(10)) + .andExpect(jsonPath("$.data.user.orgId").value(10)) + .andExpect(jsonPath("$.data.user.profileImage").value("leader.png")) + .andExpect(jsonPath("$.data.user.phone").value("01012345678")) + .andExpect(jsonPath("$.data.user.activities.length()").value(2)) + .andExpect(jsonPath("$.data.user.activities[0].part").value("웹")) + .andExpect(jsonPath("$.data.user.activities[0].generation").value(35)) + .andExpect(jsonPath("$.data.user.activities[1].part").value("서버")) + .andExpect(jsonPath("$.data.user.activities[1].generation").value(36)) + .andExpect(jsonPath("$.data.user.userId").doesNotExist()) + .andExpect(jsonPath("$.data.user.generation").doesNotExist()) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].userId").value(30)) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].orgId").value(30)) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].userName").value("공동 모임장")) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].userprofileImage").value("co-leader.png")) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].name").doesNotExist()) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].profileImage").doesNotExist()) + .andExpect(jsonPath("$.data.appliedInfo[0].user.id").value(20)) + .andExpect(jsonPath("$.data.appliedInfo[0].user.orgId").value(20)) + .andExpect(jsonPath("$.data.appliedInfo[0].user.activities[0].part").value("웹")); + } + + @ParameterizedTest + @CsvSource({ + "1, 10, 0, 0, false, false", + "1, 10, 1, 1, false, false", + "1, 10, 21, 3, false, true", + "2, 10, 21, 3, true, true", + "3, 10, 21, 3, true, false" + }) + void 모임_목록은_meetings와_기존_meta를_반환한다( + int page, int take, long count, int pages, boolean previous, boolean next) throws Exception { + MeetingService.MeetingSummary summary = + new MeetingService.MeetingSummary( + meeting(), Member.leader(1L, USER_ID), 0, 0, MeetingStatus.APPLY_ABLE); + MeetingFacade.MeetingSummaryResult result = + new MeetingFacade.MeetingSummaryResult(summary, MeetingTagService.MeetingTagInfo.empty()); + PageResult meetings = + new PageResult<>( + count == 0 ? List.of() : List.of(result), count, pages, page, take, next, previous); + when(facade.searchMeetings(any(), eq(page), eq(take))).thenReturn(meetings); + when(facade.findMeetingsByCreator(USER_ID, page, take)).thenReturn(meetings); + MeetingFacade.JoinedMeetingResult joined = + new MeetingFacade.JoinedMeetingResult( + new MeetingService.JoinedMeeting(summary, Member.participant(1L, USER_ID)), + MeetingTagService.MeetingTagInfo.empty()); + when(facade.findJoinedMeetings(USER_ID, page, take)) + .thenReturn( + new PageResult<>( + count == 0 ? List.of() : List.of(joined), + count, + pages, + page, + take, + next, + previous)); + + for (String path : List.of("/meeting/v2", "/meeting/v2/me", "/meeting/v2/me/joined")) { + mockMvc + .perform( + get(path) + .param("pageNo", Integer.toString(page)) + .param("limit", Integer.toString(take))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.meetings.length()").value(count == 0 ? 0 : 1)) + .andExpect(jsonPath("$.data.meta.page").value(page)) + .andExpect(jsonPath("$.data.meta.take").value(take)) + .andExpect(jsonPath("$.data.meta.itemCount").value(count)) + .andExpect(jsonPath("$.data.meta.pageCount").value(pages)) + .andExpect(jsonPath("$.data.meta.hasPreviousPage").value(previous)) + .andExpect(jsonPath("$.data.meta.hasNextPage").value(next)) + .andExpect(jsonPath("$.data.data").doesNotExist()) + .andExpect(jsonPath("$.data.totalCount").doesNotExist()) + .andExpect(jsonPath("$.data.meta.totalCount").doesNotExist()); + } + } + + @ParameterizedTest + @CsvSource({ + "/meeting/v2/1, appliedInfo", + "/meeting/v2/1/applicants, applicants", + "/meeting/v2/1/members, appliedInfo" + }) + void 신청_번호는_응답_목록마다_1부터_연속된_숫자다(String path, String listKey) throws Exception { + List applies = + List.of(application(41L, 20L), application(97L, 30L)); + when(facade.getMeetingDetail(1L, USER_ID)).thenReturn(detail(true, applies)); + when(service.getApplicants(1L, USER_ID)).thenReturn(applies); + when(service.getMeetingPartMembers(1L, USER_ID)) + .thenReturn(new MeetingService.MeetingPartMembers("서버", 2, true, 36, applies)); + + for (int request = 0; request < 2; request++) { + mockMvc + .perform(get(path)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data." + listKey + "[0].applyNumber").value(1)) + .andExpect(jsonPath("$.data." + listKey + "[0].id").value(41)) + .andExpect(jsonPath("$.data." + listKey + "[0].user.id").value(20)) + .andExpect(jsonPath("$.data." + listKey + "[1].applyNumber").value(2)) + .andExpect(jsonPath("$.data." + listKey + "[1].id").value(97)) + .andExpect(jsonPath("$.data." + listKey + "[1].user.id").value(30)); + } + } + + @ParameterizedTest + @CsvSource({ + "/meeting/v2/1, appliedInfo", + "/meeting/v2/1/applicants, applicants", + "/meeting/v2/1/members, appliedInfo" + }) + void 신청이_없으면_빈_배열을_반환한다(String path, String listKey) throws Exception { + when(facade.getMeetingDetail(1L, USER_ID)).thenReturn(detail(false, List.of())); + when(service.getApplicants(1L, USER_ID)).thenReturn(List.of()); + when(service.getMeetingPartMembers(1L, USER_ID)) + .thenReturn(new MeetingService.MeetingPartMembers("서버", 0, true, 36, List.of())); + + mockMvc + .perform(get(path)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data." + listKey).isArray()) + .andExpect(jsonPath("$.data." + listKey).isEmpty()); + } + + @Test + void 활동과_공동모임장이_없고_프로필이_비어도_상세_계약을_유지한다() throws Exception { + MeetingService.MeetingDetail meetingDetail = + new MeetingService.MeetingDetail( + meeting(), + new MeetingUser(USER_ID, "모임장", null, List.of()), + List.of(), + true, + false, + false, + false, + 0, + List.of(), + MeetingStatus.RECRUITMENT_COMPLETE); + when(facade.getMeetingDetail(1L, USER_ID)) + .thenReturn( + new MeetingFacade.MeetingDetailResult( + meetingDetail, MeetingTagService.MeetingTagInfo.empty())); + + mockMvc + .perform(get("/meeting/v2/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.status").value(2)) + .andExpect(jsonPath("$.data.coMeetingLeaders").isEmpty()) + .andExpect(jsonPath("$.data.user.activities").isEmpty()) + .andExpect(jsonPath("$.data.user.profileImage").value(nullValue())) + .andExpect(jsonPath("$.data.user.phone").value(nullValue())); + } + + @Test + void 수정_응답도_조회와_같은_상세_계약을_반환한다() throws Exception { + when(facade.updateMeeting(eq(1L), any(), eq(USER_ID))) + .thenReturn(detail(true, List.of(application(41L, 20L)))); + + mockMvc + .perform( + patch("/meeting/v2/1") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"title\":\"스터디\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.host").value(true)) + .andExpect(jsonPath("$.data.status").value(1)) + .andExpect(jsonPath("$.data.createdTimestamp").value("2026-08-01T12:00:00")) + .andExpect(jsonPath("$.data.user.id").value(USER_ID)) + .andExpect(jsonPath("$.data.coMeetingLeaders[0].userName").value("공동 모임장")) + .andExpect(jsonPath("$.data.appliedInfo[0].applyNumber").value(1)) + .andExpect(jsonPath("$.data.isHost").doesNotExist()); + } + + @Test + void 신청_DTO를_공유하는_번쩍_상세도_신청번호를_반환한다() throws Exception { + FlashFacade flashFacade = mock(FlashFacade.class); + MockMvc flashMvc = CrewChannelMockMvc.of(new FlashController(flashFacade), USER_ID); + Flash flash = + new Flash( + 2L, + USER_ID, + 1L, + "번쩍 모임", + "소개", + FlashTimingType.IMMEDIATE, + CREATED_AT, + CREATED_AT.plusHours(1), + CREATED_AT.plusHours(2), + CREATED_AT.plusHours(3), + FlashPlaceType.OFFLINE, + "서울", + 2, + 10, + 36, + List.of(), + CREATED_AT, + CREATED_AT); + when(flashFacade.getFlashDetail(1L, USER_ID)) + .thenReturn( + new FlashFacade.FlashDetail( + flash, + detail(true, List.of(application(41L, 20L), application(97L, 30L))).meetingDetail(), + MeetingTagService.MeetingTagInfo.empty(), + MeetingStatus.APPLY_ABLE)); + + flashMvc + .perform(get("/flash/v2/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.appliedInfo[0].applyNumber").value(1)) + .andExpect(jsonPath("$.data.appliedInfo[1].applyNumber").value(2)) + .andExpect(jsonPath("$.data.appliedInfo[0].user.id").value(20)) + .andExpect(jsonPath("$.data.appliedInfo[0].user.orgId").value(20)); + } + + private MeetingService.ApplyDetail application(Long id, Long userId) { + return new MeetingService.ApplyDetail( + new MeetingApply( + id, + MeetingApplyType.APPLY, + 1L, + userId, + "신청합니다", + CREATED_AT, + MeetingApplyStatus.APPROVE, + CREATED_AT, + CREATED_AT), + profile(userId)); + } + + private MeetingUser profile(Long id) { + return new MeetingUser( + id, + "모임장", + "leader.png", + "01012345678", + List.of( + Activity.of(35, Team.MAKERS, Part.WEB, true), + Activity.of(36, Team.MAKERS, Part.SERVER, true))); + } + + private MeetingFacade.MeetingDetailResult detail( + boolean host, List applies) { + return new MeetingFacade.MeetingDetailResult( + new MeetingService.MeetingDetail( + meeting(), + profile(USER_ID), + List.of(new MeetingUser(30L, "공동 모임장", "co-leader.png", List.of())), + host, + false, + false, + false, + 0, + applies, + MeetingStatus.APPLY_ABLE), + MeetingTagService.MeetingTagInfo.empty()); + } + + private Meeting meeting() { + return new Meeting( + 1L, + 7L, + "스터디", + "함께 공부", + MeetingCategory.STUDY, + List.of(), + LocalDateTime.of(2026, 9, 1, 0, 0), + LocalDateTime.of(2026, 9, 2, 0, 0), + 10, + "소개", + null, + null, + null, + null, + null, + false, + false, + null, + 36, + 36, + List.of(), + CREATED_AT, + CREATED_AT); + } +} diff --git a/domain/domain-crew/src/main/java/org/sopt/makers/domain/crew/meeting/service/MeetingService.java b/domain/domain-crew/src/main/java/org/sopt/makers/domain/crew/meeting/service/MeetingService.java index 3c4bd112..07e8369b 100644 --- a/domain/domain-crew/src/main/java/org/sopt/makers/domain/crew/meeting/service/MeetingService.java +++ b/domain/domain-crew/src/main/java/org/sopt/makers/domain/crew/meeting/service/MeetingService.java @@ -263,7 +263,7 @@ public MeetingDetail getMeetingDetail(Long meetingId, Long userId) { getUserMap(applies.stream().map(MeetingApply::userId).distinct().toList()); List applyDetails = applies.stream() - .sorted(Comparator.comparing(MeetingApply::appliedDate)) + .sorted(Comparator.comparing(MeetingApply::appliedDate).thenComparing(MeetingApply::id)) .map(apply -> new ApplyDetail(apply, applyUserMap.get(apply.userId()))) .toList(); @@ -279,7 +279,8 @@ public MeetingDetail getMeetingDetail(Long meetingId, Long userId) { members.hasRole(meetingId, userId, MemberRole.PARTICIPANT), members.hasRole(meetingId, userId, MemberRole.CO_LEADER), members.getByRole(MemberRole.PARTICIPANT).size(), - applyDetails); + applyDetails, + meeting.getMeetingStatus(LocalDateTime.now(clock))); } public PageResult searchMeetings( @@ -365,7 +366,7 @@ public MeetingPartMembers getMeetingPartMembers(Long meetingId, Long userId) { apply -> isSamePartMember( userMap.get(apply.userId()), requestActivity, activeGenerationUser)) - .sorted(Comparator.comparing(MeetingApply::appliedDate)) + .sorted(Comparator.comparing(MeetingApply::appliedDate).thenComparing(MeetingApply::id)) .map(apply -> new ApplyDetail(apply, userMap.get(apply.userId()))) .toList(); @@ -628,7 +629,7 @@ private List getApplyDetails(List applies) { Map userMap = getUserMap(applies.stream().map(MeetingApply::userId).distinct().toList()); return applies.stream() - .sorted(Comparator.comparing(MeetingApply::appliedDate)) + .sorted(Comparator.comparing(MeetingApply::appliedDate).thenComparing(MeetingApply::id)) .map(apply -> new ApplyDetail(apply, userMap.get(apply.userId()))) .filter(detail -> detail.user() != null) .toList(); @@ -743,7 +744,8 @@ public record MeetingDetail( boolean isApproved, boolean isCoLeader, long approvedApplyCount, - List applies) {} + List applies, + MeetingStatus status) {} public record ApplyDetail(MeetingApply apply, MeetingUser user) {} diff --git a/domain/domain-crew/src/test/java/org/sopt/makers/domain/crew/meeting/service/MeetingServiceTest.java b/domain/domain-crew/src/test/java/org/sopt/makers/domain/crew/meeting/service/MeetingServiceTest.java index ae0d127c..9e2b551c 100644 --- a/domain/domain-crew/src/test/java/org/sopt/makers/domain/crew/meeting/service/MeetingServiceTest.java +++ b/domain/domain-crew/src/test/java/org/sopt/makers/domain/crew/meeting/service/MeetingServiceTest.java @@ -17,6 +17,8 @@ import java.util.Optional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.sopt.makers.core.pagination.PageQuery; @@ -329,6 +331,93 @@ void searchesMeetingsWithFilters() { assertThat(conditionCaptor.getValue().now()).isEqualTo(LocalDateTime.of(2026, 9, 1, 12, 0)); } + @ParameterizedTest + @CsvSource({ + "2026-08-31T23:59:59, BEFORE_START", + "2026-09-01T00:00:00, APPLY_ABLE", + "2026-09-01T23:59:59, APPLY_ABLE", + "2026-09-02T00:00:00, RECRUITMENT_COMPLETE" + }) + void 상세_모집상태는_주입된_시계와_모집기간_경계를_따른다(String now, MeetingStatus expected) { + Clock clock = + Clock.fixed(LocalDateTime.parse(now).atZone(CLOCK.getZone()).toInstant(), CLOCK.getZone()); + MeetingService timedService = + new MeetingService(meetingRepository, applyRepository, memberRepository, userPort, clock); + when(meetingRepository.findById(1L)).thenReturn(Optional.of(meeting(1L))); + when(memberRepository.findAllByMeetingId(1L)).thenReturn(List.of(Member.leader(1L, 10L))); + when(userPort.findById(10L)) + .thenReturn(Optional.of(new MeetingUser(10L, "모임장", null, List.of()))); + when(applyRepository.findAllByMeetingIdAndStatuses(eq(1L), any())).thenReturn(List.of()); + + assertThat(timedService.getMeetingDetail(1L, 10L).status()).isEqualTo(expected); + } + + @Test + void 상세와_지원자_목록은_신청시각과_ID_순으로_정렬한다() { + List applies = + List.of(orderedApply(300L, 20L, 1), orderedApply(200L, 30L, 0), orderedApply(100L, 40L, 0)); + when(meetingRepository.findById(1L)).thenReturn(Optional.of(meeting(1L))); + when(memberRepository.findAllByMeetingId(1L)).thenReturn(List.of(Member.leader(1L, 10L))); + when(userPort.findById(10L)).thenReturn(Optional.of(meetingUser(10L, Part.SERVER))); + when(userPort.findAllById(any())) + .thenReturn( + List.of( + meetingUser(20L, Part.SERVER), + meetingUser(30L, Part.WEB), + meetingUser(40L, Part.SERVER))); + when(applyRepository.findAllByMeetingIdAndStatuses(eq(1L), any())).thenReturn(applies); + when(applyRepository.findAllByMeetingId(1L)).thenReturn(applies); + + assertThat(service.getMeetingDetail(1L, 10L).applies()) + .extracting(detail -> detail.apply().id()) + .containsExactly(100L, 200L, 300L); + assertThat(service.getApplicants(1L, 10L)) + .extracting(detail -> detail.apply().id()) + .containsExactly(100L, 200L, 300L); + } + + @Test + void 파트_멤버_목록은_대상자를_필터링한_후_신청순으로_정렬한다() { + when(meetingRepository.findById(1L)).thenReturn(Optional.of(meeting(1L))); + when(userPort.findById(10L)).thenReturn(Optional.of(meetingUser(10L, Part.SERVER))); + when(userPort.findAllById(any())) + .thenReturn( + List.of( + meetingUser(20L, Part.SERVER), + meetingUser(30L, Part.WEB), + meetingUser(40L, Part.SERVER))); + when(applyRepository.findAllByMeetingIdAndStatuses(eq(1L), any())) + .thenReturn( + List.of( + orderedApply(300L, 20L, 1), + orderedApply(200L, 30L, 0), + orderedApply(100L, 40L, 0))); + + MeetingService.MeetingPartMembers result = service.getMeetingPartMembers(1L, 10L); + + assertThat(result.participantCount()).isEqualTo(2); + assertThat(result.appliedInfo()) + .extracting(detail -> detail.apply().id()) + .containsExactly(100L, 300L); + } + + private MeetingApply orderedApply(Long id, Long userId, int hourOffset) { + return new MeetingApply( + id, + MeetingApplyType.APPLY, + 1L, + userId, + "신청합니다", + LocalDateTime.of(2026, 9, 1, 12, 0).plusHours(hourOffset), + MeetingApplyStatus.APPROVE, + null, + null); + } + + private MeetingUser meetingUser(Long id, Part part) { + return new MeetingUser(id, "사용자", null, List.of(Activity.of(36, Team.MAKERS, part, true))); + } + private MeetingService.CreateMeetingCommand createCommand(List coLeaderUserIds) { return new MeetingService.CreateMeetingCommand( null,