Merge pull request #42 from Link-MIND/feature/#41

[#41] fix : toastListDto추가

linkmind/src/main/java/com/app/toaster/controller/response/category/CategoriesReponse.java

@@ -3,6 +3,6 @@
 import lombok.Builder;
 
 @Builder
-public record CategoriesReponse(Long CategoryId, String categoryTitle, int toastNum) {
+public record CategoriesReponse(Long categoryId, String categoryTitle, int toastNum) {
 
 }

linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java

@@ -1,12 +1,13 @@
 package com.app.toaster.controller.response.main;
 
 import com.app.toaster.controller.response.category.CategoriesReponse;
+import com.app.toaster.controller.response.toast.MainToastDto;
 import com.app.toaster.domain.RecommendSite;
 import lombok.Builder;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Builder
-public record MainPageResponseDto(String nickname, int readToastNum, int allToastNum, List<CategoriesReponse> mainCategoryListDto, List<RecommendSite> recommendedSiteListDto) {
+public record MainPageResponseDto(String nickname, int readToastNum, int allToastNum, List<CategoriesReponse> mainCategoryListDto, List<MainToastDto> toastListDto, List<RecommendSite> recommendedSiteListDto) {
 }

linkmind/src/main/java/com/app/toaster/controller/response/toast/MainToastDto.java

@@ -0,0 +1,9 @@
+package com.app.toaster.controller.response.toast;
+
+import com.app.toaster.domain.Toast;
+
+public record MainToastDto(Long toastId, String toastTitle, String toastImg, String toastLink) {
+    public static MainToastDto of(Toast toast){
+        return new MainToastDto(toast.getId(), toast.getTitle(), toast.getThumbnailUrl(), toast.getLinkUrl());
+    }
+}

linkmind/src/main/java/com/app/toaster/infrastructure/ToastRepository.java

@@ -39,4 +39,5 @@ public interface ToastRepository extends JpaRepository<Toast, Long> {
 	Long countALLByUserAndIsReadTrue(User user);
 
 	Long countAllByUserAndIsReadFalse(User user);
+
 }

linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java

@@ -78,7 +78,7 @@ public List<CategoriesReponse> getCategories(Long userId){
         return categoryRepository.findAllByUserOrderByPriority(presentUser)
                 .stream()
                 .map(category -> CategoriesReponse.builder()
-                        .CategoryId(category.getCategoryId())
+                        .categoryId(category.getCategoryId())
                         .categoryTitle(category.getTitle())
                         .toastNum(toastRepository.getAllByCategory(category).size()).build()
                 ).collect(Collectors.toList());

linkmind/src/main/java/com/app/toaster/service/main/MainService.java

@@ -2,6 +2,7 @@
 
 import com.app.toaster.controller.response.category.CategoriesReponse;
 import com.app.toaster.controller.response.main.MainPageResponseDto;
+import com.app.toaster.controller.response.toast.MainToastDto;
 import com.app.toaster.domain.Category;
 import com.app.toaster.domain.User;
 import com.app.toaster.exception.Error;
@@ -37,10 +38,12 @@ public MainPageResponseDto getMainPage(Long userId) {
         MainPageResponseDto mainPageResponseDto = MainPageResponseDto.builder().nickname(user.getNickname())
                 .allToastNum(allToastNum)
                 .readToastNum(readToastNum)
+                .toastListDto(toastRepository.findAll().subList(0,Math.min(3,toastRepository.findAll().size()))
+                        .stream().map(MainToastDto::of).toList())
                 .recommendedSiteListDto(recommedSiteRepository.findAll().subList(0, Math.min(9, recommedSiteRepository.findAll().size())))
                 .mainCategoryListDto(getCategory(user).stream()
                 .map(category -> CategoriesReponse.builder()
-                        .CategoryId(category.getCategoryId())
+                        .categoryId(category.getCategoryId())
                         .categoryTitle(category.getTitle())
                         .toastNum(toastRepository.getAllByCategory(category).size()).build()
                 ).collect(Collectors.toList())).build();