From eacfbc2fc2ee00412ef0c206bb2f1129d2a071c7 Mon Sep 17 00:00:00 2001 From: EpicFn Date: Wed, 8 Oct 2025 17:05:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=EC=8A=A4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=B4=88=EB=8C=80=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C=20inviteId=20=EB=B0=98=ED=99=98=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../membership/controller/ApiV1InviteController.java | 10 ++++++---- .../space/space/dto/etc/SpaceInvitationInfo.java | 9 +++++++++ .../space/space/dto/res/ResBodyForSpaceInviteList.java | 3 ++- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/etc/SpaceInvitationInfo.java diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteController.java index 5543d697..6df5cbc1 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteController.java +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteController.java @@ -8,6 +8,7 @@ import org.tuna.zoopzoop.backend.domain.member.entity.Member; import org.tuna.zoopzoop.backend.domain.space.membership.entity.Membership; import org.tuna.zoopzoop.backend.domain.space.membership.service.MembershipService; +import org.tuna.zoopzoop.backend.domain.space.space.dto.etc.SpaceInvitationInfo; import org.tuna.zoopzoop.backend.domain.space.space.dto.res.ResBodyForSpaceInviteList; import org.tuna.zoopzoop.backend.domain.space.space.dto.res.ResBodyForSpaceSave; import org.tuna.zoopzoop.backend.domain.space.space.dto.etc.SpaceInfoWithoutAuthority; @@ -81,11 +82,12 @@ public RsData getMyInvites( // 멤버십(초대) 목록 조회 List invitations = membershipService.findByMember(member, "PENDING"); - List invitationInfos = invitations.stream() - .map(membership -> new SpaceInfoWithoutAuthority( + List invitationInfo = invitations.stream() + .map(membership -> new SpaceInvitationInfo( membership.getSpace().getId(), membership.getSpace().getName(), - membership.getSpace().getThumbnailUrl() + membership.getSpace().getThumbnailUrl(), + membership.getId() )) .toList(); @@ -93,7 +95,7 @@ public RsData getMyInvites( "200", "사용자에게 온 스페이스 초대 목록을 조회했습니다.", new ResBodyForSpaceInviteList( - invitationInfos + invitationInfo ) ); } diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/etc/SpaceInvitationInfo.java b/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/etc/SpaceInvitationInfo.java new file mode 100644 index 00000000..7d2df2e3 --- /dev/null +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/etc/SpaceInvitationInfo.java @@ -0,0 +1,9 @@ +package org.tuna.zoopzoop.backend.domain.space.space.dto.etc; + +public record SpaceInvitationInfo( + Integer spaceId, + String spaceName, + String spaceThumbnailUrl, + Integer inviteId +) { +} diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/res/ResBodyForSpaceInviteList.java b/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/res/ResBodyForSpaceInviteList.java index 2e813f33..42da7629 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/res/ResBodyForSpaceInviteList.java +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/space/space/dto/res/ResBodyForSpaceInviteList.java @@ -1,10 +1,11 @@ package org.tuna.zoopzoop.backend.domain.space.space.dto.res; import org.tuna.zoopzoop.backend.domain.space.space.dto.etc.SpaceInfoWithoutAuthority; +import org.tuna.zoopzoop.backend.domain.space.space.dto.etc.SpaceInvitationInfo; import java.util.List; public record ResBodyForSpaceInviteList( - List spaces + List spaces ) { } From 01a5c0c77b26591b15f2c94cf8fcc430c5641fec Mon Sep 17 00:00:00 2001 From: EpicFn Date: Wed, 8 Oct 2025 17:07:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EA=B4=80=EB=A0=A8=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiV1InviteControllerTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteControllerTest.java b/src/test/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteControllerTest.java index 2c16db5d..612473aa 100644 --- a/src/test/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteControllerTest.java +++ b/src/test/java/org/tuna/zoopzoop/backend/domain/space/membership/controller/ApiV1InviteControllerTest.java @@ -278,12 +278,14 @@ void getMyInvites_Success() throws Exception { resultActions .andExpect(jsonPath("$.data.spaces").isArray()) .andExpect(jsonPath("$.data.spaces.length()").value(2)) - .andExpect(jsonPath("$.data.spaces[0].id").value(space1.getId())) - .andExpect(jsonPath("$.data.spaces[0].name").value(space1.getName())) - .andExpect(jsonPath("$.data.spaces[0].thumbnailUrl").value(space1.getThumbnailUrl())) - .andExpect(jsonPath("$.data.spaces[1].id").value(space2.getId())) - .andExpect(jsonPath("$.data.spaces[1].name").value(space2.getName())) - .andExpect(jsonPath("$.data.spaces[1].thumbnailUrl").value(space2.getThumbnailUrl())); + .andExpect(jsonPath("$.data.spaces[0].spaceId").value(space1.getId())) + .andExpect(jsonPath("$.data.spaces[0].spaceName").value(space1.getName())) + .andExpect(jsonPath("$.data.spaces[0].spaceThumbnailUrl").value(space1.getThumbnailUrl())) + .andExpect(jsonPath("$.data.spaces[0].inviteId").isNumber()) + .andExpect(jsonPath("$.data.spaces[1].spaceId").value(space2.getId())) + .andExpect(jsonPath("$.data.spaces[1].spaceName").value(space2.getName())) + .andExpect(jsonPath("$.data.spaces[1].spaceThumbnailUrl").value(space2.getThumbnailUrl())) + .andExpect(jsonPath("$.data.spaces[1].inviteId").isNumber()); }