From f01c6a4acb5ba98165d39fe6e7464c21dec97ce7 Mon Sep 17 00:00:00 2001 From: JongKyeong Kim Date: Thu, 30 Nov 2023 18:07:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/project/Glog/dto/response/category/SidebarDto.java | 4 +--- .../com/project/Glog/dto/response/category/SidebarDtos.java | 5 +++++ .../main/java/com/project/Glog/service/CategoryService.java | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/com/project/Glog/dto/response/category/SidebarDto.java b/server/src/main/java/com/project/Glog/dto/response/category/SidebarDto.java index 0a8d8152..78f10060 100644 --- a/server/src/main/java/com/project/Glog/dto/response/category/SidebarDto.java +++ b/server/src/main/java/com/project/Glog/dto/response/category/SidebarDto.java @@ -14,14 +14,12 @@ public class SidebarDto { private Long categoryId; private String categoryName; private Boolean isPrCategory; - private Boolean isMyPage; private List postTitleDtos = new ArrayList<>(); //TODO 일급 컬렉션으로 수정 - public SidebarDto(Category category, List posts, Boolean isMyPages){ + public SidebarDto(Category category, List posts){ categoryId = category.getId(); categoryName = category.getCategoryName(); isPrCategory = category.getIsPrcategory(); - isMyPage = isMyPages; for(Post post : posts){ postTitleDtos.add(PostTitleDto.of(post)); } diff --git a/server/src/main/java/com/project/Glog/dto/response/category/SidebarDtos.java b/server/src/main/java/com/project/Glog/dto/response/category/SidebarDtos.java index 28f89c03..e8f61da2 100644 --- a/server/src/main/java/com/project/Glog/dto/response/category/SidebarDtos.java +++ b/server/src/main/java/com/project/Glog/dto/response/category/SidebarDtos.java @@ -1,14 +1,19 @@ package com.project.Glog.dto.response.category; +import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.util.ArrayList; import java.util.List; @Getter @Setter +@AllArgsConstructor +@NoArgsConstructor public class SidebarDtos { private List sidebarDtos = new ArrayList<>(); + private Boolean isMyPage; public SidebarDtos(List sidebarDtoList){ for(SidebarDto sidebarDto : sidebarDtoList){ diff --git a/server/src/main/java/com/project/Glog/service/CategoryService.java b/server/src/main/java/com/project/Glog/service/CategoryService.java index c56fc616..01506c07 100644 --- a/server/src/main/java/com/project/Glog/service/CategoryService.java +++ b/server/src/main/java/com/project/Glog/service/CategoryService.java @@ -61,10 +61,11 @@ public SidebarDtos getSideBarByBlog(UserPrincipal userPrincipal, Long blogId) { List sidebarDtos = new ArrayList<>(); for(Category category : categories){ List posts = postRepository.findAllByCategoryId(category.getId()); - sidebarDtos.add(new SidebarDto(category, posts,isMyPage)); + sidebarDtos.add(new SidebarDto(category, posts)); } - return new SidebarDtos(sidebarDtos); + + return new SidebarDtos(sidebarDtos,isMyPage); } public void deletePosts(Long id, List postsIds) throws Exception{