Skip to content

Commit 627a551

Browse files
authored
Merge pull request #264 from prgrms-web-devcourse-final-project/develop
[Chore] 운영 환경 직업 로드맵 데이터 추가 (#263)
2 parents 90daaf5 + c350994 commit 627a551

File tree

5 files changed

+1438
-3
lines changed

5 files changed

+1438
-3
lines changed

back/src/main/java/com/back/domain/roadmap/roadmap/controller/JobRoadmapController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public RsData<JobRoadmapPagingResponse> getJobRoadmaps(
7979
### 반환 정보
8080
8181
**로드맵 기본 정보:**
82-
- id, jobId, jobName: 직업 정보
82+
- id, jobId, jobName, jobDescription: 직업 정보
8383
- totalNodeCount: 전체 노드 개수
8484
- createdDate, modifiedDate: 생성/수정일
8585

back/src/main/java/com/back/domain/roadmap/roadmap/dto/response/JobRoadmapResponse.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ public record JobRoadmapResponse(
1414
Long id,
1515
Long jobId,
1616
String jobName,
17+
String jobDescription,
1718
List<JobRoadmapNodeResponse> nodes,
1819
int totalNodeCount,
1920
LocalDateTime createdDate,
2021
LocalDateTime modifiedDate
2122
) {
2223

2324
// 정적 팩터리 메서드 - JobRoadmap과 Job 정보, 통계 정보로부터 Response DTO 생성
24-
public static JobRoadmapResponse from(JobRoadmap jobRoadmap, String jobName, Map<Long, JobRoadmapNodeStat> statMap) {
25+
public static JobRoadmapResponse from(JobRoadmap jobRoadmap, String jobName, String jobDescription, Map<Long, JobRoadmapNodeStat> statMap) {
2526
// 부모-자식 관계 맵 생성
2627
Map<Long, List<RoadmapNode>> childrenMap = jobRoadmap.getNodes().stream()
2728
.filter(node -> node.getParent() != null)
@@ -47,6 +48,7 @@ public static JobRoadmapResponse from(JobRoadmap jobRoadmap, String jobName, Map
4748
jobRoadmap.getId(),
4849
jobRoadmap.getJob().getId(),
4950
jobName,
51+
jobDescription,
5052
nodes,
5153
jobRoadmap.getNodes().size(),
5254
jobRoadmap.getCreateDate(),

back/src/main/java/com/back/domain/roadmap/roadmap/service/JobRoadmapService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public JobRoadmapResponse getJobRoadmapById(Long id) {
5050
Map<Long, JobRoadmapNodeStat> statMap = stats.stream()
5151
.collect(Collectors.toMap(stat -> stat.getNode().getId(), stat -> stat));
5252

53-
return JobRoadmapResponse.from(jobRoadmap, jobRoadmap.getJob().getName(), statMap);
53+
return JobRoadmapResponse.from(jobRoadmap, jobRoadmap.getJob().getName(),jobRoadmap.getJob().getDescription(), statMap);
5454
}
5555

5656
private JobRoadmapListResponse toListResponse(JobRoadmap jobRoadmap) {

back/src/main/java/com/back/global/initData/RoadmapInitData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.boot.ApplicationRunner;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
29+
import org.springframework.context.annotation.Profile;
2930
import org.springframework.transaction.annotation.Transactional;
3031

3132
import java.util.Comparator;
@@ -36,6 +37,7 @@
3637
@Configuration
3738
@RequiredArgsConstructor
3839
@Transactional
40+
@Profile("!prod")
3941
public class RoadmapInitData {
4042
private final JobService jobService;
4143
private final JobRepository jobRepository;

0 commit comments

Comments
 (0)