Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ public record TaskBasicInfoResponse(
List<FileSummary> rfpFiles,

@Schema(description = "공고서류 전체 정보 파일")
List<FileSummary> announcementFiles
List<FileSummary> announcementFiles,

@Schema(description = "연차별 목록")
List<TaskPeriodResponse> periods
) {
public static TaskBasicInfoResponse from(TaskBasicInfo basicInfo, LocalDate announcementStartDate, LocalDate announcementEndDate, Boolean threeFiveRule, List<FileSummary> rfpFiles, List<FileSummary> announcementFiles) {
public static TaskBasicInfoResponse from(TaskBasicInfo basicInfo, LocalDate announcementStartDate, LocalDate announcementEndDate, Boolean threeFiveRule, List<FileSummary> rfpFiles, List<FileSummary> announcementFiles, List<TaskPeriodResponse> periods) {
return new TaskBasicInfoResponse(
basicInfo != null ? basicInfo.getMinistry() : null,
basicInfo != null ? basicInfo.getSpecializedAgency() : null,
Expand All @@ -61,7 +64,8 @@ public static TaskBasicInfoResponse from(TaskBasicInfo basicInfo, LocalDate anno
basicInfo != null ? basicInfo.getAnnouncementLink() : null,
threeFiveRule,
rfpFiles,
announcementFiles
announcementFiles,
periods
);
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.bmilab.backend.domain.task.repository;

import com.bmilab.backend.domain.task.entity.Task;
import com.bmilab.backend.domain.task.entity.TaskPeriod;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;

public interface TaskPeriodRepository extends JpaRepository<TaskPeriod, Long> {
List<TaskPeriod> findByTaskOrderByYearNumberAsc(Task task);
}
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,19 @@ public TaskBasicInfoResponse getTaskBasicInfo(Long userId, Long taskId) {
taskId
).stream().map(FileSummary::from).collect(Collectors.toList());

List<TaskPeriodResponse> periods = taskPeriodRepository.findByTaskOrderByYearNumberAsc(task)
.stream()
.map(TaskPeriodResponse::from)
.collect(Collectors.toList());

return TaskBasicInfoResponse.from(
basicInfo,
task.getStartDate(),
task.getEndDate(),
task.getThreeFiveRule(),
rfpFiles,
announcementFiles
announcementFiles,
periods
);
}

Expand Down
Loading