feat: 받은 제안 목록 조회 기능 개발 (#341)

Author: xxoznge

api/src/main/java/com/sponus/sponusbe/domain/propose/controller/ProposeController.java

@@ -16,7 +16,8 @@
 import com.sponus.sponusbe.domain.organization.dto.response.PageResponse;
 import com.sponus.sponusbe.domain.propose.dto.request.ProposeCreateRequest;
 import com.sponus.sponusbe.domain.propose.dto.response.ProposeCreateResponse;
-import com.sponus.sponusbe.domain.propose.dto.response.ProposeGetResponse;
+import com.sponus.sponusbe.domain.propose.dto.response.ReceiveProposeGetResponse;
+import com.sponus.sponusbe.domain.propose.dto.response.SendProposeGetResponse;
 import com.sponus.sponusbe.domain.propose.service.ProposeQueryService;
 import com.sponus.sponusbe.domain.propose.service.ProposeService;
 
@@ -42,10 +43,18 @@ public ApiResponse<ProposeCreateResponse> createPropose(
 	}
 
 	@GetMapping("/send")
-	public ApiResponse<PageResponse<ProposeGetResponse>> getSendPropose(
+	public ApiResponse<PageResponse<SendProposeGetResponse>> getSendPropose(
 		@AuthOrganization Organization authOrganization,
 		@ModelAttribute @Valid PageCondition pageCondition
 	) {
 		return ApiResponse.onSuccess(proposequeryService.getSendPropose(authOrganization, pageCondition));
 	}
+
+	@GetMapping("/receive")
+	public ApiResponse<PageResponse<ReceiveProposeGetResponse>> getReceivedPropose(
+		@AuthOrganization Organization authOrganization,
+		@ModelAttribute @Valid PageCondition pageCondition
+	) {
+		return ApiResponse.onSuccess(proposequeryService.getReceivedPropose(authOrganization, pageCondition));
+	}
 }

api/src/main/java/com/sponus/sponusbe/domain/propose/dto/response/ReceiveProposeGetResponse.java

@@ -0,0 +1,32 @@
+package com.sponus.sponusbe.domain.propose.dto.response;
+
+import java.time.LocalDate;
+
+import com.sponus.coredomain.domain.propose.Propose;
+import com.sponus.coredomain.domain.propose.ProposeStatus;
+
+import lombok.Builder;
+
+@Builder
+public record ReceiveProposeGetResponse(
+	Long id,
+	Long organizationId,
+	Long target,
+	String organizationName,
+	String organizationImageUrl,
+	ProposeStatus status,
+	LocalDate createdAt
+) {
+
+	public static ReceiveProposeGetResponse from(Propose propose) {
+		return ReceiveProposeGetResponse.builder()
+			.id(propose.getId())
+			.organizationId(propose.getOrganization().getId())
+			.target(propose.getTarget().getId())
+			.organizationName(propose.getOrganization().getName())
+			.organizationImageUrl(propose.getOrganization().getImageUrl())
+			.status(propose.getStatus())
+			.createdAt(propose.getCreatedAt().toLocalDate())
+			.build();
+	}
+}

api/src/main/java/com/sponus/sponusbe/domain/propose/dto/response/ProposeGetResponse.java api/src/main/java/com/sponus/sponusbe/domain/propose/dto/response/SendProposeGetResponse.java

@@ -8,7 +8,7 @@
 import lombok.Builder;
 
 @Builder
-public record ProposeGetResponse(
+public record SendProposeGetResponse(
 	Long id,
 	Long organizationId,
 	Long target,
@@ -18,8 +18,8 @@ public record ProposeGetResponse(
 	LocalDate createdAt
 ) {
 
-	public static ProposeGetResponse from(Propose propose) {
-		return ProposeGetResponse.builder()
+	public static SendProposeGetResponse from(Propose propose) {
+		return SendProposeGetResponse.builder()
 			.id(propose.getId())
 			.organizationId(propose.getOrganization().getId())
 			.target(propose.getTarget().getId())

api/src/main/java/com/sponus/sponusbe/domain/propose/service/ProposeQueryService.java

@@ -12,7 +12,8 @@
 import com.sponus.coredomain.domain.propose.repository.ProposeRepository;
 import com.sponus.sponusbe.domain.organization.dto.request.PageCondition;
 import com.sponus.sponusbe.domain.organization.dto.response.PageResponse;
-import com.sponus.sponusbe.domain.propose.dto.response.ProposeGetResponse;
+import com.sponus.sponusbe.domain.propose.dto.response.ReceiveProposeGetResponse;
+import com.sponus.sponusbe.domain.propose.dto.response.SendProposeGetResponse;
 
 import lombok.RequiredArgsConstructor;
 
@@ -23,16 +24,30 @@ public class ProposeQueryService {
 
 	private final ProposeRepository proposeRepository;
 
-	public PageResponse<ProposeGetResponse> getSendPropose(Organization organization, PageCondition pageCondition) {
+	public PageResponse<SendProposeGetResponse> getSendPropose(Organization organization, PageCondition pageCondition) {
 		Pageable pageable = PageRequest.of(pageCondition.getPage() - 1, pageCondition.getSize());
-		List<ProposeGetResponse> organizations = proposeRepository.findByOrganizationOrderByCreatedAtDesc(
+		List<SendProposeGetResponse> organizations = proposeRepository.findByOrganizationOrderByCreatedAtDesc(
 				organization, pageable)
 			.stream()
-			.map(ProposeGetResponse::from)
+			.map(SendProposeGetResponse::from)
 			.toList();
 
 		return PageResponse.of(
 			PageableExecutionUtils.getPage(organizations, pageable,
 				() -> proposeRepository.countByOrganization(organization)));
 	}
+
+	public PageResponse<ReceiveProposeGetResponse> getReceivedPropose(Organization organization,
+		PageCondition pageCondition) {
+		Pageable pageable = PageRequest.of(pageCondition.getPage() - 1, pageCondition.getSize());
+		List<ReceiveProposeGetResponse> receivedProposes = proposeRepository.findByTargetOrderByCreatedAtDesc(
+				organization, pageable)
+			.stream()
+			.map(ReceiveProposeGetResponse::from)
+			.toList();
+
+		return PageResponse.of(
+			PageableExecutionUtils.getPage(receivedProposes, pageable,
+				() -> proposeRepository.countByTarget(organization)));
+	}
 }

api/src/main/java/com/sponus/sponusbe/domain/propose/service/ProposeService.java

@@ -38,10 +38,7 @@ public ProposeCreateResponse createPropose(Organization organization, ProposeCre
 
 		if (organization.getImageUrl() == null || organization.getImageUrl().isEmpty())
 			throw new ProposeException(ProposeErrorCode.PROFILE_NOT_COMPLETED);
-
-		if (proposeRepository.existsByOrganization(target))
-			throw new ProposeException(ProposeErrorCode.PROPOSE_ERROR);
-
+		
 		final Long count = proposeRepository.countProposesByOrganizationToday(organization,
 			LocalDateTime.now().toLocalDate().atStartOfDay());
 

core/core-domain/src/main/java/com/sponus/coredomain/domain/propose/repository/ProposeRepository.java

@@ -24,4 +24,8 @@ Long countProposesByOrganizationToday(@Param("organization") Organization organi
 	Page<Propose> findByOrganizationOrderByCreatedAtDesc(Organization organization, Pageable pageable);
 
 	Long countByOrganization(Organization organization);
+
+	Page<Propose> findByTargetOrderByCreatedAtDesc(Organization target, Pageable pageable);
+
+	Long countByTarget(Organization target);
 }