Merge pull request #37 from GSC-2024-Hongik-Team-6/feature/education

feat{education}: Add images and thumburl property
GSC-2024-Hongik-Team-6 · Feb 24, 2024 · 0ac1697 · 0ac1697
2 parents 278730c + dbee906
commit 0ac1697
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/gsc/backend/controller/EducationController.java b/src/main/java/gsc/backend/controller/EducationController.java
@@ -42,7 +42,7 @@ public String test() {
 
     @GetMapping("/education")
     @Operation(summary = "Education API", description = "모든 교육 유형을 조회하는 API 입니다")
-    public ResponseEntity <HomeResponseDTO> getEducation(Principal principal) {
+    public ResponseEntity<HomeResponseDTO> getEducation(Principal principal) {
 
         // 사용자 uuid 조회
         String userUuid = principal.getName();
@@ -61,7 +61,7 @@ public ResponseEntity <HomeResponseDTO> getEducation(Principal principal) {
                 .data(educationDto)
                 .build();
 
-         return ResponseEntity.ok((HomeResponseDTO) Collections.singletonList(homeResponseDTO));
+         return ResponseEntity.ok(homeResponseDTO);
     }
 
     @GetMapping("/education/{educationId}")

diff --git a/src/main/java/gsc/backend/dto/response/home/HomeEducationDataDTO.java b/src/main/java/gsc/backend/dto/response/home/HomeEducationDataDTO.java
@@ -5,6 +5,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Builder
 @Getter
 @NoArgsConstructor
@@ -14,6 +16,8 @@ public class HomeEducationDataDTO {
     private String educationName;
     private String educationDescription;
     private String educationDetail;
+    private List<String> images;
+    private String thumbUrl;
     private int solvedQuizCount;
     private int totalQuizCount;
 }
diff --git a/src/main/java/gsc/backend/service/EducationService.java b/src/main/java/gsc/backend/service/EducationService.java
@@ -63,11 +63,18 @@ public List<HomeEducationDataDTO> getHomeData(String userUuid) {
 
                     UserEducation userEducation = userEducationRepository.findByUserAndEducation(nowUser, m);
 
+                    List<String> images =  educationImageRepository.findAllByEducation_Id(m.getId())
+                            .stream()
+                            .map(EducationImage::getEducationImageUrl)
+                            .collect(Collectors.toList());
+
                     return HomeEducationDataDTO.builder()
                             .educationId(m.getId())
                             .educationName(m.getName())
                             .educationDescription(m.getDescription())
                             .educationDetail(m.getDetail())
+                            .images(images) // detail 정보에 들어가는 images
+                            .thumbUrl(m.getImage()) // thumbUrl
                             .solvedQuizCount(userEducation.getUserSolvedQuizCount())
                             .totalQuizCount(m.getTotalQuizCount())
                             .build();