Merge pull request #152 from prgrms-web-devcourse-final-project/refactor/party

Refactor/party

Author: universechoi

src/main/java/com/ddobang/backend/domain/board/dto/response/AdminAttachmentResponse.java

@@ -12,7 +12,7 @@ public record AdminPostDetailResponse(
 	PostType type,
 	String title,
 	String content,
-	List<AdminAttachmentResponse> attachments,
+	List<AttachmentResponse> attachments,
 	List<PostReplyDto> replies,
 	LocalDateTime createdAt
 ) {
@@ -22,7 +22,7 @@ public static AdminPostDetailResponse from(Post post) {
 			post.getType(),
 			post.getTitle(),
 			post.getContent(),
-			post.getAttachments().stream().map(AdminAttachmentResponse::from).toList(),
+			post.getAttachments().stream().map(AttachmentResponse::from).toList(),
 			post.isAnswered() ? post.getReplies().stream().map(PostReplyDto::from).toList() : null,
 			post.getCreatedAt()
 		);

src/main/java/com/ddobang/backend/domain/board/dto/response/AdminPostDetailResponse.java

@@ -4,12 +4,14 @@
 
 public record AttachmentResponse(
 	Long id,
-	String fileName
+	String fileName,
+	String url
 ) {
 	public static AttachmentResponse from(Attachment attachment) {
 		return new AttachmentResponse(
 			attachment.getId(),
-			attachment.getFileName()
+			attachment.getFileName(),
+			attachment.getUrl()
 		);
 	}
 }

src/main/java/com/ddobang/backend/domain/board/dto/response/AttachmentResponse.java

@@ -17,17 +17,19 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ddobang.backend.domain.member.entity.Member;
 import com.ddobang.backend.domain.member.types.KeywordType;
 import com.ddobang.backend.domain.member.types.MemberReviewKeyword;
 import com.ddobang.backend.domain.party.dto.PartyDto;
 import com.ddobang.backend.domain.party.dto.request.PartyMemberReviewRequest;
 import com.ddobang.backend.domain.party.dto.request.PartyRequest;
 import com.ddobang.backend.domain.party.dto.request.PartySearchCondition;
+import com.ddobang.backend.domain.party.dto.response.MyJoinedPartySummaryResponse;
 import com.ddobang.backend.domain.party.dto.response.PartyDetailResponse;
 import com.ddobang.backend.domain.party.dto.response.PartyMainResponse;
 import com.ddobang.backend.domain.party.dto.response.PartySummaryResponse;
 import com.ddobang.backend.domain.party.service.PartyService;
+import com.ddobang.backend.domain.party.types.PartyMemberRole;
+import com.ddobang.backend.domain.party.types.PartyTodoFilter;
 import com.ddobang.backend.global.response.PageDto;
 import com.ddobang.backend.global.response.ResponseFactory;
 import com.ddobang.backend.global.response.SliceDto;
@@ -132,19 +134,25 @@ public ResponseEntity<Void> unexecuteParty(@PathVariable Long id) {
 	}
 
 	@GetMapping("/joins/{id}")
-	@Operation(summary = "참여한 모임 목록 조회")
-	public ResponseEntity<SuccessResponse<PageDto<PartySummaryResponse>>> getJoinedParties(
+	@Operation(summary = "다른 사람의 참여한 모임 목록 조회")
+	public ResponseEntity<SuccessResponse<PageDto<PartySummaryResponse>>> getOtherJoinedParties(
 		@RequestParam(defaultValue = "0") int page,
 		@RequestParam(defaultValue = "10") int size,
 		@PathVariable Long id
 	) {
-		Member actor = loginMemberProvider.getCurrentMember();
+		return ResponseFactory.ok(partyService.getOtherJoinedParties(id, page, size));
+	}
 
-		if (id.equals(actor.getId())) {
-			return ResponseFactory.ok(partyService.getMyJoinedParties(actor, page, size));
-		} else {
-			return ResponseFactory.ok(partyService.getOtherJoinedParties(id, page, size));
-		}
+	@GetMapping("/joins/me")
+	@Operation(summary = "내가 참여한 모임 목록 조회")
+	public ResponseEntity<SuccessResponse<PageDto<MyJoinedPartySummaryResponse>>> getMyJoinedParties(
+		@RequestParam(required = false) PartyMemberRole role,
+		@RequestParam(defaultValue = "NONE") PartyTodoFilter todoFilter,
+		@RequestParam(defaultValue = "0") int page,
+		@RequestParam(defaultValue = "10") int size
+	) {
+		return ResponseFactory.ok(
+			partyService.getMyJoinedParties(loginMemberProvider.getCurrentMember(), role, todoFilter, page, size));
 	}
 
 	// 모임원 평가

src/main/java/com/ddobang/backend/domain/party/controller/PartyController.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 public record PartyMemberReviewRequest(
-	Long targetId,
+	String targetNickname,
 	List<String> reviewKeywords,
 	boolean noShow
 ) {

src/main/java/com/ddobang/backend/domain/party/dto/request/PartyMemberReviewRequest.java

@@ -0,0 +1,55 @@
+package com.ddobang.backend.domain.party.dto.response;
+
+import java.time.LocalDateTime;
+
+import com.ddobang.backend.domain.member.entity.Member;
+import com.ddobang.backend.domain.party.entity.Party;
+import com.ddobang.backend.domain.party.types.PartyMemberRole;
+import com.ddobang.backend.domain.party.types.PartyStatus;
+import com.ddobang.backend.domain.store.entity.Store;
+import com.ddobang.backend.domain.theme.entity.Theme;
+
+public record MyJoinedPartySummaryResponse(
+	Long partyId,
+	String title,
+	LocalDateTime scheduledAt,
+	Integer acceptedParticipantsCount,
+	Integer totalParticipants,
+	Boolean rookieAvailable,
+	String storeName,
+	Long themeId,
+	String themeName,
+	String themeThumbnailUrl,
+	Long hostId,
+	String hostNickname,
+	String hostProfilePictureUrl,
+	PartyMemberRole role,
+	Boolean reviewed,
+	PartyStatus status
+) {
+	public static MyJoinedPartySummaryResponse from(Party party, Member actor, boolean reviewed) {
+		Theme theme = party.getTheme();
+		Member host = party.getHost();
+		Store store = theme.getStore();
+
+		return new MyJoinedPartySummaryResponse(
+			party.getId(),
+			party.getTitle(),
+			party.getScheduledAt(),
+			party.getTotalParticipants() - party.getParticipantsNeeded() + party.getAcceptedParticipantsCount(),
+			party.getTotalParticipants(),
+			party.getRookieAvailable(),
+			store.getName(),
+			theme.getId(),
+			theme.getName(),
+			theme.getThumbnailUrl(),
+			host.getId(),
+			host.getNickname(),
+			host.getProfilePictureUrl(),
+
+			party.getPartyMemberRole(actor),
+			reviewed,
+			party.getStatus()
+		);
+	}
+}

src/main/java/com/ddobang/backend/domain/party/dto/response/MyJoinedPartySummaryResponse.java

@@ -7,13 +7,19 @@
 
 import com.ddobang.backend.domain.member.entity.Member;
 import com.ddobang.backend.domain.party.dto.request.PartySearchCondition;
+import com.ddobang.backend.domain.party.dto.response.MyJoinedPartySummaryResponse;
 import com.ddobang.backend.domain.party.dto.response.PartySummaryResponse;
+import com.ddobang.backend.domain.party.types.PartyMemberRole;
+import com.ddobang.backend.domain.party.types.PartyTodoFilter;
 import com.ddobang.backend.domain.theme.entity.Theme;
 
 public interface PartyRepositoryCustom {
 	List<PartySummaryResponse> getParties(Long lastId, int size, PartySearchCondition partySearchCondition);
 
 	List<PartySummaryResponse> getPartiesByTheme(Theme theme, Long lastId, int size);
 
-	Page<PartySummaryResponse> findByMemberJoined(Member member, Pageable pageable, boolean myList);
+	Page<PartySummaryResponse> findOtherMemberJoinedParties(Member member, Pageable pageable);
+
+	Page<MyJoinedPartySummaryResponse> findMyPartyHistories(Member member, PartyMemberRole role,
+		PartyTodoFilter todoFilter, Pageable pageable);
 }