Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -81,19 +82,20 @@ public RsData<ResBodyForSpaceInviteList> getMyInvites(

// 멤버십(초대) 목록 조회
List<Membership> invitations = membershipService.findByMember(member, "PENDING");
List<SpaceInfoWithoutAuthority> invitationInfos = invitations.stream()
.map(membership -> new SpaceInfoWithoutAuthority(
List<SpaceInvitationInfo> invitationInfo = invitations.stream()
.map(membership -> new SpaceInvitationInfo(
membership.getSpace().getId(),
membership.getSpace().getName(),
membership.getSpace().getThumbnailUrl()
membership.getSpace().getThumbnailUrl(),
membership.getId()
))
.toList();

return new RsData<>(
"200",
"사용자에게 온 스페이스 초대 목록을 조회했습니다.",
new ResBodyForSpaceInviteList(
invitationInfos
invitationInfo
)
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
) {
}
Original file line number Diff line number Diff line change
@@ -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<SpaceInfoWithoutAuthority> spaces
List<SpaceInvitationInfo> spaces
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}


Expand Down