diff --git a/docker-compose.yml b/docker-compose.yml index 5d23b79..26b9ecb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,6 +48,8 @@ services: image: redis ports: - 6379:6379 + networks: + - reverseproxy khumon: container_name: khumon image: chy0310/khumon diff --git a/src/main/java/com/teamh/khumon/dto/LearningMaterialContent.java b/src/main/java/com/teamh/khumon/dto/LearningMaterialContent.java index ae4de3f..6b65c8b 100644 --- a/src/main/java/com/teamh/khumon/dto/LearningMaterialContent.java +++ b/src/main/java/com/teamh/khumon/dto/LearningMaterialContent.java @@ -15,6 +15,7 @@ public class LearningMaterialContent { private Long id; private String title; private String content; + private String type; private LocalDateTime createAt; private LocalDateTime modifiedAt; diff --git a/src/main/java/com/teamh/khumon/service/LearningMaterialService.java b/src/main/java/com/teamh/khumon/service/LearningMaterialService.java index 73c4f9a..3da3bda 100644 --- a/src/main/java/com/teamh/khumon/service/LearningMaterialService.java +++ b/src/main/java/com/teamh/khumon/service/LearningMaterialService.java @@ -135,6 +135,7 @@ public ResponseEntity getLearningMaterials(Principal principal, Pageable page .id(learningMaterial.getId()) .title(learningMaterial.getTitle()) .content(learningMaterial.getContent()) + .type(learningMaterial.getMediaFileType().getFileType()) .createAt(learningMaterial.getCreatedAt()) .modifiedAt(learningMaterial.getUpdateAt()) .build()).toList();