Skip to content

[DEPLOY] v1.23 #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjhwang0 merged 2 commits into from
Sep 26, 2025
Merged

[DEPLOY] v1.23 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
109d66a
[Refactor/#24]
sjhwang0 Sep 26, 2025
2346749
Merge pull request #167 from ASSU-org/feat/#24-map-api
sjhwang0 Sep 26, 2025
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
4 changes: 1 addition & 3 deletions src/main/java/com/assu/server/domain/partnership/controller/PartnershipController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -110,7 +108,7 @@ public BaseResponse<List<PartnershipResponseDTO.WritePartnershipResponseDTO>> li
description = "제휴 아이디λ₯Ό μž…λ ₯ν•˜μ„Έμš”."
)
@GetMapping("/{partnershipId}")
public BaseResponse<PartnershipResponseDTO.WritePartnershipResponseDTO> getPartnership(
public BaseResponse<PartnershipResponseDTO.GetPartnershipDetailResponseDTO> getPartnership(
@PathVariable Long partnershipId
) {
return BaseResponse.onSuccess(SuccessStatus._OK, partnershipService.getPartnership(partnershipId));
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/com/assu/server/domain/partnership/converter/PartnershipConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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<PaperContent> contents,
List<List<Goods>> goodsBatches
) {
PartnershipResponseDTO.WritePartnershipResponseDTO responseInfo =
writePartnershipResultDTO(paper, contents, goodsBatches);

return PartnershipResponseDTO.GetPartnershipDetailResponseDTO.builder()
.updatedAt(paper.getUpdatedAt()) // UpdatedAt κ°’ κ°€μ Έμ˜€κΈ°
.responseInfo(responseInfo) // 상세정보 DTO μ„€μ •
.build();
}
}
10 changes: 10 additions & 0 deletions src/main/java/com/assu/server/domain/partnership/dto/PartnershipResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
6 changes: 1 addition & 5 deletions src/main/java/com/assu/server/domain/partnership/service/PartnershipService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,7 +22,7 @@ PartnershipResponseDTO.WritePartnershipResponseDTO updatePartnership(
List<PartnershipResponseDTO.WritePartnershipResponseDTO> listPartnershipsForPartner(boolean all, Long adminId);

// 제휴 μ œμ•ˆμ„œ 쑰회
PartnershipResponseDTO.WritePartnershipResponseDTO getPartnership(Long partnershipId);
PartnershipResponseDTO.GetPartnershipDetailResponseDTO getPartnership(Long partnershipId);
List<PartnershipResponseDTO.SuspendedPaperDTO> getSuspendedPapers(Long adminId);

// 제휴 μƒνƒœ μ—…λ°μ΄νŠΈ
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -236,7 +235,7 @@ public List<PartnershipResponseDTO.WritePartnershipResponseDTO> 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));

Expand All @@ -246,7 +245,7 @@ public PartnershipResponseDTO.WritePartnershipResponseDTO getPartnership(Long pa
.map(pc -> pc.getGoods() == null ? Collections.<Goods>emptyList() : pc.getGoods())
.toList();

return PartnershipConverter.writePartnershipResultDTO(paper, contents, goodsBatches);
return PartnershipConverter.getPartnershipResultDTO(paper, contents, goodsBatches);
}

@Override
Expand Down