From de4fb434728a0e016bb1dbdbf0ff55eb9c9ecaf5 Mon Sep 17 00:00:00 2001 From: shinmj Date: Thu, 30 Dec 2021 14:28:46 +0900 Subject: [PATCH] refactor: reformat code(attachment) --- .../dto/AttachmentFileResponseDto.java | 16 ++++ .../dto/AttachmentTempSaveRequestDto.java | 16 ++++ .../service/attachment/AttachmentService.java | 82 ++++++------------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentFileResponseDto.java b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentFileResponseDto.java index 29fe854..a8b874b 100644 --- a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentFileResponseDto.java +++ b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentFileResponseDto.java @@ -1,9 +1,12 @@ package org.egovframe.cloud.portalservice.api.attachment.dto; +import java.util.UUID; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; +import org.egovframe.cloud.portalservice.domain.attachment.Attachment; +import org.egovframe.cloud.portalservice.domain.attachment.AttachmentId; /** * org.egovframe.cloud.portalservice.api.attachment.dto.AttachmentFileResponseDto @@ -36,4 +39,17 @@ public class AttachmentFileResponseDto extends AttachmentUploadResponseDto { this.size = size; this.physicalFileName = physicalFileName; } + + public Attachment toEntity(AttachmentId attachmentId, AttachmentUploadRequestDto uploadRequestDto) { + return Attachment.builder() + .attachmentId(attachmentId) + .uniqueId(UUID.randomUUID().toString()) + .physicalFileName(this.physicalFileName) + .originalFileName(this.originalFileName) + .size(this.size) + .fileType(this.fileType) + .entityName(uploadRequestDto.getEntityName()) + .entityId(uploadRequestDto.getEntityId()) + .build(); + } } diff --git a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentTempSaveRequestDto.java b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentTempSaveRequestDto.java index e0472fb..1ddcf1e 100644 --- a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentTempSaveRequestDto.java +++ b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/attachment/dto/AttachmentTempSaveRequestDto.java @@ -1,10 +1,13 @@ package org.egovframe.cloud.portalservice.api.attachment.dto; import java.util.Objects; +import java.util.UUID; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; +import org.egovframe.cloud.portalservice.domain.attachment.Attachment; +import org.egovframe.cloud.portalservice.domain.attachment.AttachmentId; import org.springframework.util.StringUtils; /** @@ -55,4 +58,17 @@ public class AttachmentTempSaveRequestDto { public boolean hasUniqueId() { return Objects.nonNull(uniqueId) || StringUtils.hasText(uniqueId); } + + public Attachment toEntity(AttachmentId attachmentId, String physicalFileName) { + return Attachment.builder() + .attachmentId(attachmentId) + .uniqueId(UUID.randomUUID().toString()) + .physicalFileName(physicalFileName) + .originalFileName(this.originalName) + .size(this.size) + .fileType(this.fileType) + .entityName(this.entityName) + .entityId(this.entityId) + .build(); + } } diff --git a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/attachment/AttachmentService.java b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/attachment/AttachmentService.java index 4d09664..8a765a9 100644 --- a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/attachment/AttachmentService.java +++ b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/attachment/AttachmentService.java @@ -242,18 +242,7 @@ public class AttachmentService extends AbstractService { // 첨부파일 .temp 제거 String renameTemp = storageUtils.renameTemp(requestDto.getPhysicalFileName()); - attachmentRepository.save( - Attachment.builder() - .attachmentId(attachmentId) - .uniqueId(UUID.randomUUID().toString()) - .physicalFileName(renameTemp) - .originalFileName(requestDto.getOriginalName()) - .size(requestDto.getSize()) - .fileType(requestDto.getFileType()) - .entityName(requestDto.getEntityName()) - .entityId(requestDto.getEntityId()) - .build() - ); + attachmentRepository.save(requestDto.toEntity(attachmentId, renameTemp)); } return attachmentCode; } @@ -282,18 +271,8 @@ public class AttachmentService extends AbstractService { AttachmentId attachmentId = attachmentRepository.getId(attachmentCode); //새로운 첨부파일 저장 (물리적 파일 .temp 제거) String renameTemp = storageUtils.renameTemp(saveRequestDto.getPhysicalFileName()); - attachmentRepository.save( - Attachment.builder() - .attachmentId(attachmentId) - .uniqueId(UUID.randomUUID().toString()) - .originalFileName(saveRequestDto.getOriginalName()) - .physicalFileName(renameTemp) - .size(saveRequestDto.getSize()) - .fileType(saveRequestDto.getFileType()) - .entityName(saveRequestDto.getEntityName()) - .entityId(saveRequestDto.getEntityId()) - .build() - ); + + attachmentRepository.save(saveRequestDto.toEntity(attachmentId, renameTemp)); } } @@ -353,18 +332,7 @@ public class AttachmentService extends AbstractService { // 물리적 파일 생성 AttachmentFileResponseDto fileResponseDto = upload(files.get(i), BASE_PATH, false); - attachmentRepository.save( - Attachment.builder() - .attachmentId(attachmentId) - .uniqueId(UUID.randomUUID().toString()) - .physicalFileName(fileResponseDto.getPhysicalFileName()) - .originalFileName(fileResponseDto.getOriginalFileName()) - .size(fileResponseDto.getSize()) - .fileType(fileResponseDto.getFileType()) - .entityName(uploadRequestDto.getEntityName()) - .entityId(uploadRequestDto.getEntityId()) - .build() - ); + attachmentRepository.save(fileResponseDto.toEntity(attachmentId, uploadRequestDto)); } return attachmentCode; @@ -388,16 +356,9 @@ public class AttachmentService extends AbstractService { List updateRequestDtoList) throws EntityNotFoundException { // 기존 파일 삭제 처리 - if (updateRequestDtoList != null) { - for (AttachmentUpdateRequestDto saveRequestDto : updateRequestDtoList) { - if (saveRequestDto.getIsDelete()) { - Attachment attachment = findAttachmentByUniqueId(saveRequestDto.getUniqueId()); - attachment.updateIsDelete(saveRequestDto.getIsDelete()); - } - } - } + deleteExistingFile(updateRequestDtoList); - if (files != null) { + if (Objects.nonNull(files)) { //새로운 파일 저장 처리 for (int i = 0; i < files.size(); i++) { // 해당 attachment에 seq 조회해서 attachmentid 생성 @@ -406,18 +367,7 @@ public class AttachmentService extends AbstractService { // 물리적 파일 생성 AttachmentFileResponseDto fileResponseDto = upload(files.get(i), BASE_PATH, false); - attachmentRepository.save( - Attachment.builder() - .attachmentId(attachmentId) - .uniqueId(UUID.randomUUID().toString()) - .physicalFileName(fileResponseDto.getPhysicalFileName()) - .originalFileName(fileResponseDto.getOriginalFileName()) - .size(fileResponseDto.getSize()) - .fileType(fileResponseDto.getFileType()) - .entityName(uploadRequestDto.getEntityName()) - .entityId(uploadRequestDto.getEntityId()) - .build() - ); + attachmentRepository.save(fileResponseDto.toEntity(attachmentId, uploadRequestDto)); } } @@ -425,6 +375,7 @@ public class AttachmentService extends AbstractService { return attachmentCode; } + /** * entity 정보 update * @@ -491,4 +442,21 @@ public class AttachmentService extends AbstractService { .orElseThrow(() -> new EntityNotFoundException(getMessage("valid.file.not_found") + " ID= " + uniqueId)); } + /** + * 기존 첨부파일 삭제 처리 + * + * @param updateRequestDtoList + */ + private void deleteExistingFile(List updateRequestDtoList) { + if (Objects.isNull(updateRequestDtoList)) { + return; + } + for (AttachmentUpdateRequestDto saveRequestDto : updateRequestDtoList) { + if (saveRequestDto.getIsDelete()) { + Attachment attachment = findAttachmentByUniqueId(saveRequestDto.getUniqueId()); + attachment.updateIsDelete(saveRequestDto.getIsDelete()); + } + } + } + }