diff --git a/src/main/java/com/assu/server/domain/partnership/controller/PartnershipController.java b/src/main/java/com/assu/server/domain/partnership/controller/PartnershipController.java index 0863097..c8dbd95 100644 --- a/src/main/java/com/assu/server/domain/partnership/controller/PartnershipController.java +++ b/src/main/java/com/assu/server/domain/partnership/controller/PartnershipController.java @@ -8,11 +8,9 @@ import com.assu.server.domain.member.entity.Member; import com.assu.server.domain.notification.service.NotificationCommandService; -import com.assu.server.domain.partnership.dto.PaperResponseDTO; import com.assu.server.domain.partnership.dto.PartnershipRequestDTO; import com.assu.server.domain.partnership.dto.PartnershipResponseDTO; import com.assu.server.domain.partnership.service.PartnershipService; -import com.assu.server.domain.store.entity.Store; import com.assu.server.domain.store.repository.StoreRepository; import com.assu.server.global.apiPayload.BaseResponse; import com.assu.server.global.apiPayload.code.status.SuccessStatus; @@ -110,7 +108,7 @@ public BaseResponse> li description = "제휴 아이디를 입력하세요." ) @GetMapping("/{partnershipId}") - public BaseResponse getPartnership( + public BaseResponse getPartnership( @PathVariable Long partnershipId ) { return BaseResponse.onSuccess(SuccessStatus._OK, partnershipService.getPartnership(partnershipId)); diff --git a/src/main/java/com/assu/server/domain/partnership/converter/PartnershipConverter.java b/src/main/java/com/assu/server/domain/partnership/converter/PartnershipConverter.java index 7823df4..011bfd8 100644 --- a/src/main/java/com/assu/server/domain/partnership/converter/PartnershipConverter.java +++ b/src/main/java/com/assu/server/domain/partnership/converter/PartnershipConverter.java @@ -18,11 +18,8 @@ import com.assu.server.domain.user.entity.Student; import com.assu.server.domain.store.entity.Store; -import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; public class PartnershipConverter { @@ -292,4 +289,18 @@ public static void updatePaperFromDto(Paper paper, PartnershipRequestDTO.WritePa paper.setPartnershipPeriodEnd(dto.getPartnershipPeriodEnd()); paper.setIsActivated(ActivationStatus.SUSPEND); } + + public static PartnershipResponseDTO.GetPartnershipDetailResponseDTO getPartnershipResultDTO( + Paper paper, + List contents, + List> goodsBatches + ) { + PartnershipResponseDTO.WritePartnershipResponseDTO responseInfo = + writePartnershipResultDTO(paper, contents, goodsBatches); + + return PartnershipResponseDTO.GetPartnershipDetailResponseDTO.builder() + .updatedAt(paper.getUpdatedAt()) // UpdatedAt 값 가져오기 + .responseInfo(responseInfo) // 상세정보 DTO 설정 + .build(); + } } diff --git a/src/main/java/com/assu/server/domain/partnership/dto/PartnershipResponseDTO.java b/src/main/java/com/assu/server/domain/partnership/dto/PartnershipResponseDTO.java index 2229ca2..4e34933 100644 --- a/src/main/java/com/assu/server/domain/partnership/dto/PartnershipResponseDTO.java +++ b/src/main/java/com/assu/server/domain/partnership/dto/PartnershipResponseDTO.java @@ -128,4 +128,14 @@ public static class PartnerPartnershipWithAdminResponseDTO { private String adminName; private String adminAddress; } + + @Getter + @Setter + @NoArgsConstructor + @AllArgsConstructor + @Builder + public static class GetPartnershipDetailResponseDTO { + private LocalDateTime updatedAt; + private WritePartnershipResponseDTO responseInfo; + } } diff --git a/src/main/java/com/assu/server/domain/partnership/service/PartnershipService.java b/src/main/java/com/assu/server/domain/partnership/service/PartnershipService.java index 2e58750..783a57a 100644 --- a/src/main/java/com/assu/server/domain/partnership/service/PartnershipService.java +++ b/src/main/java/com/assu/server/domain/partnership/service/PartnershipService.java @@ -2,11 +2,7 @@ import com.assu.server.domain.member.entity.Member; import com.assu.server.domain.partnership.dto.PartnershipRequestDTO; -import com.assu.server.domain.partnership.dto.PartnershipRequestDTO; import com.assu.server.domain.partnership.dto.PartnershipResponseDTO; -import com.assu.server.global.util.PrincipalDetails; -import io.swagger.v3.oas.annotations.parameters.RequestBody; -import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -26,7 +22,7 @@ PartnershipResponseDTO.WritePartnershipResponseDTO updatePartnership( List listPartnershipsForPartner(boolean all, Long adminId); // 제휴 제안서 조회 - PartnershipResponseDTO.WritePartnershipResponseDTO getPartnership(Long partnershipId); + PartnershipResponseDTO.GetPartnershipDetailResponseDTO getPartnership(Long partnershipId); List getSuspendedPapers(Long adminId); // 제휴 상태 업데이트 diff --git a/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java b/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java index d2bbdaa..aa3306a 100644 --- a/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java +++ b/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java @@ -8,7 +8,6 @@ import org.springframework.stereotype.Service; import com.assu.server.domain.member.entity.Member; -import com.assu.server.domain.notification.repository.NotificationRepository; import com.assu.server.domain.notification.service.NotificationCommandService; import com.assu.server.domain.partnership.converter.PartnershipConverter; import com.assu.server.domain.partnership.dto.PartnershipRequestDTO; @@ -236,7 +235,7 @@ public List listPartnerships @Override @Transactional - public PartnershipResponseDTO.WritePartnershipResponseDTO getPartnership(Long partnershipId) { + public PartnershipResponseDTO.GetPartnershipDetailResponseDTO getPartnership(Long partnershipId) { Paper paper = paperRepository.findById(partnershipId) .orElseThrow(() -> new DatabaseException(ErrorStatus.NO_SUCH_PAPER)); @@ -246,7 +245,7 @@ public PartnershipResponseDTO.WritePartnershipResponseDTO getPartnership(Long pa .map(pc -> pc.getGoods() == null ? Collections.emptyList() : pc.getGoods()) .toList(); - return PartnershipConverter.writePartnershipResultDTO(paper, contents, goodsBatches); + return PartnershipConverter.getPartnershipResultDTO(paper, contents, goodsBatches); } @Override