[refact] 프로젝트 페이지 정렬 수정, 프로젝트 이미지 관련 수정 (#145)

* [refact] 프로젝트 정렬 순서 변경, 이미지 없는 경우 필터링 (#144) * �[refact] 이미지 validation 빼기(#144) * [chore] spotless apply
CEOS-Developers · Aug 16, 2023 · 7f837b2 · 7f837b2
1 parent 6308e7c
commit 7f837b2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/ceos/backend/domain/project/repository/ProjectMapper.java b/src/main/java/ceos/backend/domain/project/repository/ProjectMapper.java
@@ -14,13 +14,12 @@
 import ceos.backend.domain.project.vo.ProjectUrlVo;
 import ceos.backend.global.common.dto.PageInfo;
 import java.util.List;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ProjectMapper {
 
-    public GetProjectsResponse toGetProjects(Page<Project> projectList, PageInfo pageInfo) {
+    public GetProjectsResponse toGetProjects(List<Project> projectList, PageInfo pageInfo) {
         List<ProjectBriefInfoVo> projectBriefInfoVos =
                 projectList.stream().map(ProjectBriefInfoVo::from).toList();
         return GetProjectsResponse.of(projectBriefInfoVos, pageInfo);

diff --git a/src/main/java/ceos/backend/domain/project/repository/ProjectRepository.java b/src/main/java/ceos/backend/domain/project/repository/ProjectRepository.java
@@ -10,7 +10,7 @@
 import org.springframework.data.jpa.repository.Query;
 
 public interface ProjectRepository extends JpaRepository<Project, Long> {
-    Page<Project> findAllByOrderByIdDesc(PageRequest pageRequest);
+    Page<Project> findAllByOrderByGenerationDesc(PageRequest pageRequest);
 
     Optional<Project> findByNameAndGeneration(String name, int generation);
 

diff --git a/src/main/java/ceos/backend/domain/project/service/ProjectService.java b/src/main/java/ceos/backend/domain/project/service/ProjectService.java
@@ -1,5 +1,6 @@
 package ceos.backend.domain.project.service;
 
+import static ceos.backend.domain.project.domain.ProjectImageCategory.THUMBNAIL;
 
 import ceos.backend.domain.project.domain.*;
 import ceos.backend.domain.project.dto.request.ProjectRequest;
@@ -37,14 +38,26 @@ public class ProjectService {
     @Transactional(readOnly = true)
     public GetProjectsResponse getProjects(int pageNum, int limit) {
         PageRequest pageRequest = PageRequest.of(pageNum, limit);
-        Page<Project> projectList = projectRepository.findAllByOrderByIdDesc(pageRequest);
+        Page<Project> projectList = projectRepository.findAllByOrderByGenerationDesc(pageRequest);
+        List<Project> filteredProjects =
+                projectList.getContent().stream()
+                        .filter(
+                                project ->
+                                        !project.getProjectImages().stream()
+                                                .filter(
+                                                        image ->
+                                                                image.getCategory()
+                                                                        .equals(THUMBNAIL))
+                                                .toList()
+                                                .isEmpty())
+                        .toList();
         PageInfo pageInfo =
                 PageInfo.of(
                         pageNum,
                         limit,
                         projectList.getTotalPages(),
                         projectList.getTotalElements());
-        return projectMapper.toGetProjects(projectList, pageInfo);
+        return projectMapper.toGetProjects(filteredProjects, pageInfo);
     }
 
     @Transactional(readOnly = true)

diff --git a/src/main/java/ceos/backend/domain/project/vo/ProjectImageVo.java b/src/main/java/ceos/backend/domain/project/vo/ProjectImageVo.java
@@ -5,7 +5,6 @@
 import ceos.backend.domain.project.domain.ProjectImageCategory;
 import ceos.backend.global.common.annotation.ValidEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -16,9 +15,7 @@ public class ProjectImageVo {
     @ValidEnum(target = ProjectImageCategory.class)
     private ProjectImageCategory category;
 
-    @Schema()
-    @NotEmpty(message = "Url을 입력해주세요.")
-    private String imageUrl;
+    @Schema() private String imageUrl;
 
     @Builder
     public ProjectImageVo(ProjectImageCategory category, String imageUrl) {