Skip to content

refactor: DTO 변환 중복 코드 제거 #342

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
yoon6yo merged 1 commit into from
Jul 12, 2026
Merged

refactor: DTO 변환 중복 코드 제거 #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 1 addition & 39 deletions src/main/java/DGU_AI_LAB/admin_be/domain/requests/dto/response/SaveRequestResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,45 +117,7 @@ public static AdminUserInfo fromEntity(User user) {
}

public static SaveRequestResponseDTO fromEntity(Request request) {

if (request.getResourceGroup() == null) {
throw new BusinessException(ErrorCode.RESOURCE_GROUP_NOT_FOUND);
}
if (request.getUser() == null) {
throw new BusinessException(ErrorCode.USER_NOT_FOUND);
}
if (request.getContainerImage() == null) {
throw new BusinessException(ErrorCode.RESOURCE_NOT_FOUND);
}

return SaveRequestResponseDTO.builder()
.requestId(request.getRequestId())
.resourceGroupId(request.getResourceGroup().getRsgroupId())
.resourceGroup(AdminResourceGroupInfo.fromEntity(request.getResourceGroup()))
.user(AdminUserInfo.fromEntity(request.getUser()))
.imageId(request.getContainerImage().getImageId())
.imageName(request.getContainerImage().getImageName())
.imageVersion(request.getContainerImage().getImageVersion())
.ubuntuUsername(request.getUbuntuUsername())
.ubuntuUid(request.getUbuntuUid())
.ubuntuGid(request.getUbuntuGid())
.ubuntuGids(
request.getRequestGroups().stream()
.map(rg -> rg.getGroup().getUbuntuGid())
.toList()
)
.volumeSizeGiB(request.getVolumeSizeGiB())
.usagePurpose(request.getUsagePurpose())
.formAnswers(request.getFormAnswers())
.expiresAt(request.getExpiresAt())
.status(request.getStatus())
.approvedAt(request.getApprovedAt())
.comment(request.getAdminComment())
.portMappings(List.of())
.podExternalPorts(List.of())
.createdAt(request.getCreatedAt())
.updatedAt(request.getUpdatedAt())
.build();
return fromEntityWithPorts(request, List.of(), List.of());
}

public static SaveRequestResponseDTO fromEntityWithPortMappings(Request request, List<PortMappingDTO> portMappings) {
Expand Down
44 changes: 3 additions & 41 deletions src/main/java/DGU_AI_LAB/admin_be/domain/requests/service/AdminRequestQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
package DGU_AI_LAB.admin_be.domain.requests.service;

import DGU_AI_LAB.admin_be.domain.pod.repository.PodExternalPortRepository;
import DGU_AI_LAB.admin_be.domain.portRequests.entity.PortRequests;
import DGU_AI_LAB.admin_be.domain.portRequests.repository.PortRequestRepository;
import DGU_AI_LAB.admin_be.domain.requests.dto.response.ChangeRequestResponseDTO;
import DGU_AI_LAB.admin_be.domain.requests.dto.response.ContainerInfoDTO;
import DGU_AI_LAB.admin_be.domain.requests.dto.response.PodExternalPortResponseDTO;
import DGU_AI_LAB.admin_be.domain.requests.dto.response.PortMappingDTO;
import DGU_AI_LAB.admin_be.domain.requests.dto.response.ResourceUsageDTO;
import DGU_AI_LAB.admin_be.domain.requests.dto.response.SaveRequestResponseDTO;
import DGU_AI_LAB.admin_be.domain.pod.entity.PodExternalPort;
import DGU_AI_LAB.admin_be.domain.requests.entity.Request;
import DGU_AI_LAB.admin_be.domain.requests.entity.Status;
import DGU_AI_LAB.admin_be.domain.requests.repository.ChangeRequestRepository;
Expand All @@ -19,7 +13,6 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
Expand All @@ -29,47 +22,16 @@ public class AdminRequestQueryService {

private final RequestRepository requestRepository;
private final ChangeRequestRepository changeRequestRepository;
private final PortRequestRepository portRequestRepository;
private final PodExternalPortRepository podExternalPortRepository;
private final RequestQueryService requestQueryService;

public List<SaveRequestResponseDTO> getAllRequests() {
List<Request> requests = requestRepository.findAll();
return buildResponseDTOs(requests);
return requestQueryService.toResponseDTOs(requests);
}

public List<SaveRequestResponseDTO> getNewRequests() {
List<Request> requests = requestRepository.findAllByStatus(Status.PENDING);
return buildResponseDTOs(requests);
}

private List<SaveRequestResponseDTO> buildResponseDTOs(List<Request> requests) {
if (requests.isEmpty()) return List.of();

List<Long> requestIds = requests.stream().map(Request::getRequestId).toList();

Map<Long, List<PortMappingDTO>> portMappingsByRequestId = portRequestRepository
.findByRequestRequestIdIn(requestIds)
.stream()
.collect(Collectors.groupingBy(
pr -> pr.getRequest().getRequestId(),
Collectors.mapping(PortMappingDTO::fromEntity, Collectors.toList())
));

Map<Long, List<PodExternalPortResponseDTO>> podPortsByRequestId = podExternalPortRepository
.findByRequestRequestIdIn(requestIds)
.stream()
.collect(Collectors.groupingBy(
pp -> pp.getRequest().getRequestId(),
Collectors.mapping(PodExternalPortResponseDTO::fromEntity, Collectors.toList())
));

return requests.stream()
.map(request -> SaveRequestResponseDTO.fromEntityWithPorts(
request,
portMappingsByRequestId.getOrDefault(request.getRequestId(), List.of()),
podPortsByRequestId.getOrDefault(request.getRequestId(), List.of())
))
.toList();
return requestQueryService.toResponseDTOs(requests);
}

public List<ResourceUsageDTO> getAllFulfilledResourceUsage() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/DGU_AI_LAB/admin_be/domain/requests/service/RequestQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public List<SaveRequestResponseDTO> getRequestsByUserId(Long userId) {
}

/** 목록 단위 배치 로딩으로 N+1 방지: portRequests, podExternalPorts를 IN절 1회씩 조회 */
private List<SaveRequestResponseDTO> toResponseDTOs(List<Request> requests) {
List<SaveRequestResponseDTO> toResponseDTOs(List<Request> requests) {
if (requests.isEmpty()) return List.of();

List<Long> ids = requests.stream().map(Request::getRequestId).toList();
Expand Down