Skip to content

feat: 연차별 파일 구조 개선 및 파일 동기화 로직 리팩터링 #125

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
wngktjd13 merged 2 commits into from
Oct 16, 2025
Merged

feat: 연차별 파일 구조 개선 및 파일 동기화 로직 리팩터링 #125

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
71995ad
feat: 연차별 탭 파일 구조 개선 – 파일 유형 3가지로 분리
wngktjd13 Oct 16, 2025
f93aee5
refactor: 파일 동기화 로직 공통 메서드로 정리
wngktjd13 Oct 16, 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: 3 additions & 1 deletion src/main/java/com/bmilab/backend/domain/file/enums/FileDomainType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public enum FileDomainType {
TASK_DRAFT_PRESENTATION,
TASK_AGREEMENT_FINAL_PROPOSAL,
TASK_AGREEMENT_FINAL_SUBMISSION,
TASK_PERIOD,
TASK_PERIOD_FILES,
TASK_PERIOD_INTERIM_REPORT,
TASK_PERIOD_ANNUAL_REPORT,
TEMP
}
10 changes: 8 additions & 2 deletions src/main/java/com/bmilab/backend/domain/task/dto/request/TaskPeriodUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ public record TaskPeriodUpdateRequest(
@Schema(description = "과제 참여자 ID 목록")
List<Long> memberIds,

@Schema(description = "연차별 첨부파일 ID 목록")
List<UUID> fileIds
@Schema(description = "연차별 관련 파일 ID 목록")
List<UUID> periodFileIds,

@Schema(description = "중간보고 파일 ID 목록")
List<UUID> interimReportFileIds,

@Schema(description = "연차보고 파일 ID 목록")
List<UUID> annualReportFileIds
) {
}
23 changes: 19 additions & 4 deletions src/main/java/com/bmilab/backend/domain/task/dto/response/TaskPeriodResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@ public record TaskPeriodResponse(
@Schema(description = "과제 참여자 목록")
List<TaskMemberSummary> members,

@Schema(description = "연차별 첨부파일 목록")
List<FileSummary> files
@Schema(description = "연차별 관련 파일 목록")
List<FileSummary> periodFiles,

@Schema(description = "중간보고 파일 목록")
List<FileSummary> interimReportFiles,

@Schema(description = "연차보고 파일 목록")
List<FileSummary> annualReportFiles
) {
public static TaskPeriodResponse from(TaskPeriod period) {
List<TaskMemberSummary> members = period.getMembers().stream()
Expand All @@ -46,11 +52,18 @@ public static TaskPeriodResponse from(TaskPeriod period) {
period.getManager() != null ? period.getManager().getId() : null,
period.getManager() != null ? period.getManager().getName() : null,
members,
List.of(),
List.of(),
List.of()
);
}

public static TaskPeriodResponse from(TaskPeriod period, List<FileSummary> files) {
public static TaskPeriodResponse from(
TaskPeriod period,
List<FileSummary> periodFiles,
List<FileSummary> interimReportFiles,
List<FileSummary> annualReportFiles
) {
List<TaskMemberSummary> members = period.getMembers().stream()
.map(user -> new TaskMemberSummary(user.getId(), user.getName(), user.getEmail()))
.collect(Collectors.toList());
Expand All @@ -63,7 +76,9 @@ public static TaskPeriodResponse from(TaskPeriod period, List<FileSummary> files
period.getManager() != null ? period.getManager().getId() : null,
period.getManager() != null ? period.getManager().getName() : null,
members,
files
periodFiles,
interimReportFiles,
annualReportFiles
);
}
}
77 changes: 32 additions & 45 deletions src/main/java/com/bmilab/backend/domain/task/service/TaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,8 @@ public void updateBasicInfo(Long userId, Long taskId, TaskBasicInfoUpdateRequest

taskBasicInfoRepository.save(basicInfo);

if (request.rfpFileIds() != null) {
fileService.syncFiles(request.rfpFileIds(), FileDomainType.TASK_RFP, taskId);
}

if (request.announcementFileIds() != null) {
fileService.syncFiles(request.announcementFileIds(), FileDomainType.TASK_ANNOUNCEMENT, taskId);
}
syncFiles(taskId, request.rfpFileIds(), FileDomainType.TASK_RFP);
syncFiles(taskId, request.announcementFileIds(), FileDomainType.TASK_ANNOUNCEMENT);
}

@Transactional
Expand Down Expand Up @@ -315,25 +310,11 @@ public void updateProposal(Long userId, Long taskId, TaskProposalUpdateRequest r

taskProposalRepository.save(proposal);

if (request.finalProposalFileIds() != null) {
fileService.syncFiles(request.finalProposalFileIds(), FileDomainType.TASK_FINAL_PROPOSAL, taskId);
}

if (request.finalSubmissionFileIds() != null) {
fileService.syncFiles(request.finalSubmissionFileIds(), FileDomainType.TASK_FINAL_SUBMISSION, taskId);
}

if (request.relatedFileIds() != null) {
fileService.syncFiles(request.relatedFileIds(), FileDomainType.TASK_PROPOSAL_RELATED, taskId);
}

if (request.meetingNotesFileIds() != null) {
fileService.syncFiles(request.meetingNotesFileIds(), FileDomainType.TASK_PROPOSAL_MEETING_NOTES, taskId);
}

if (request.structureDiagramFileIds() != null) {
fileService.syncFiles(request.structureDiagramFileIds(), FileDomainType.TASK_STRUCTURE_DIAGRAM, taskId);
}
syncFiles(taskId, request.finalProposalFileIds(), FileDomainType.TASK_FINAL_PROPOSAL);
syncFiles(taskId, request.finalSubmissionFileIds(), FileDomainType.TASK_FINAL_SUBMISSION);
syncFiles(taskId, request.relatedFileIds(), FileDomainType.TASK_PROPOSAL_RELATED);
syncFiles(taskId, request.meetingNotesFileIds(), FileDomainType.TASK_PROPOSAL_MEETING_NOTES);
syncFiles(taskId, request.structureDiagramFileIds(), FileDomainType.TASK_STRUCTURE_DIAGRAM);

taskProposalWriterRepository.deleteByTaskProposal(proposal);

Expand Down Expand Up @@ -463,13 +444,8 @@ public void updatePresentation(Long userId, Long taskId, TaskPresentationUpdateR

taskPresentationRepository.save(presentation);

if (request.finalPresentationFileIds() != null) {
fileService.syncFiles(request.finalPresentationFileIds(), FileDomainType.TASK_FINAL_PRESENTATION, taskId);
}

if (request.draftPresentationFileIds() != null) {
fileService.syncFiles(request.draftPresentationFileIds(), FileDomainType.TASK_DRAFT_PRESENTATION, taskId);
}
syncFiles(taskId, request.finalPresentationFileIds(), FileDomainType.TASK_FINAL_PRESENTATION);
syncFiles(taskId, request.draftPresentationFileIds(), FileDomainType.TASK_DRAFT_PRESENTATION);

taskPresentationMakerRepository.deleteByTaskPresentation(presentation);

Expand Down Expand Up @@ -525,13 +501,8 @@ public void updateAgreement(Long userId, Long taskId, TaskAgreementUpdateRequest

taskAgreementRepository.save(agreement);

if (request.agreementFinalProposalFileIds() != null) {
fileService.syncFiles(request.agreementFinalProposalFileIds(), FileDomainType.TASK_AGREEMENT_FINAL_PROPOSAL, taskId);
}

if (request.agreementFinalSubmissionFileIds() != null) {
fileService.syncFiles(request.agreementFinalSubmissionFileIds(), FileDomainType.TASK_AGREEMENT_FINAL_SUBMISSION, taskId);
}
syncFiles(taskId, request.agreementFinalProposalFileIds(), FileDomainType.TASK_AGREEMENT_FINAL_PROPOSAL);
syncFiles(taskId, request.agreementFinalSubmissionFileIds(), FileDomainType.TASK_AGREEMENT_FINAL_SUBMISSION);
}

public TaskPeriodResponse getTaskPeriod(Long userId, Long taskId, Long periodId) {
Expand All @@ -541,12 +512,22 @@ public TaskPeriodResponse getTaskPeriod(Long userId, Long taskId, Long periodId)
TaskPeriod period = taskPeriodRepository.findById(periodId)
.orElseThrow(() -> new ApiException(TaskErrorCode.TASK_NOT_FOUND));

List<FileSummary> files = fileService.findAllByDomainTypeAndEntityId(FileDomainType.TASK_PERIOD, periodId)
List<FileSummary> periodFiles = fileService.findAllByDomainTypeAndEntityId(FileDomainType.TASK_PERIOD_FILES, periodId)
.stream()
.map(FileSummary::from)
.collect(Collectors.toList());

List<FileSummary> interimReportFiles = fileService.findAllByDomainTypeAndEntityId(FileDomainType.TASK_PERIOD_INTERIM_REPORT, periodId)
.stream()
.map(FileSummary::from)
.collect(Collectors.toList());

return TaskPeriodResponse.from(period, files);
List<FileSummary> annualReportFiles = fileService.findAllByDomainTypeAndEntityId(FileDomainType.TASK_PERIOD_ANNUAL_REPORT, periodId)
.stream()
.map(FileSummary::from)
.collect(Collectors.toList());

return TaskPeriodResponse.from(period, periodFiles, interimReportFiles, annualReportFiles);
}

@Transactional
Expand All @@ -571,9 +552,9 @@ public void updateTaskPeriod(Long userId, Long taskId, Long periodId, TaskPeriod

taskPeriodRepository.save(period);

if (request.fileIds() != null) {
fileService.syncFiles(request.fileIds(), FileDomainType.TASK_PERIOD, periodId);
}
syncFiles(periodId, request.periodFileIds(), FileDomainType.TASK_PERIOD_FILES);
syncFiles(periodId, request.interimReportFileIds(), FileDomainType.TASK_PERIOD_INTERIM_REPORT);
syncFiles(periodId, request.annualReportFileIds(), FileDomainType.TASK_PERIOD_ANNUAL_REPORT);
}

@Transactional
Expand Down Expand Up @@ -727,4 +708,10 @@ private Task getTaskById(Long taskId) {

return taskRepository.findById(taskId).orElseThrow(() -> new ApiException(TaskErrorCode.TASK_NOT_FOUND));
}

private void syncFiles(Long entityId, List<java.util.UUID> fileIds, FileDomainType domainType) {
if (fileIds != null && !fileIds.isEmpty()) {
fileService.syncFiles(fileIds, domainType, entityId);
}
}
}
Loading