Merge pull request #71 from team-pofo/refactor/projectGraphQL

[REFACTOR] 프로젝트 관련 graphql 일부 리펙토링

pofo-api/src/main/kotlin/org/pofo/api/controller/ProjectController.kt

@@ -25,16 +25,17 @@ class ProjectController(
 
     @QueryMapping
     fun getAllProjectsByPagination(
-        @Argument cursor: Long,
+        @Argument cursor: Long?,
         @Argument size: Int,
-    ): ProjectList = projectService.getAllProjectsByPagination(size, cursor)
+    ): ProjectList = projectService.getAllProjectsByPagination(size, cursor ?: 0)
 
     @PreAuthorize("isAuthenticated()")
     @MutationMapping
     fun createProject(
         @Argument title: String,
         @Argument bio: String?,
         @Argument urls: List<String>?,
+        @Argument keyImageIndex: Int?,
         @Argument imageUrls: List<String>?,
         @Argument content: String,
         @Argument category: ProjectCategory,
@@ -46,6 +47,7 @@ class ProjectController(
                 title,
                 bio,
                 urls,
+                keyImageIndex,
                 imageUrls,
                 content,
                 category,
@@ -61,6 +63,7 @@ class ProjectController(
         @Argument title: String?,
         @Argument bio: String?,
         @Argument urls: List<String>?,
+        @Argument keyImageIndex: Int,
         @Argument imageUrls: List<String>?,
         @Argument content: String?,
         @Argument category: ProjectCategory?,
@@ -73,6 +76,7 @@ class ProjectController(
                 title,
                 bio,
                 urls,
+                keyImageIndex,
                 imageUrls,
                 content,
                 category,

pofo-api/src/main/kotlin/org/pofo/api/dto/CreateProjectRequest.kt

@@ -7,6 +7,7 @@ data class CreateProjectRequest(
     val title: String,
     val bio: String?,
     val urls: List<String>?,
+    val keyImageIndex: Int?,
     val imageUrls: List<String>?,
     val content: String,
     val category: ProjectCategory,

pofo-api/src/main/kotlin/org/pofo/api/dto/UpdateProjectRequest.kt

@@ -8,6 +8,7 @@ data class UpdateProjectRequest(
     val title: String?,
     val bio: String?,
     val urls: List<String>?,
+    val keyImageIndex: Int?,
     val imageUrls: List<String>?,
     val content: String?,
     val category: ProjectCategory?,

pofo-api/src/main/kotlin/org/pofo/api/service/ProjectService.kt

@@ -31,6 +31,19 @@ class ProjectService(
     @Transactional
     fun createProject(createProjectRequest: CreateProjectRequest): Project {
         val author = entityManager.getReference(User::class.java, createProjectRequest.authorId)
+
+        val imageUrls = createProjectRequest.imageUrls ?: emptyList()
+        val keyImageIndex =
+            when {
+                imageUrls.isEmpty() -> -1
+                createProjectRequest.keyImageIndex == null -> 0
+                else -> createProjectRequest.keyImageIndex
+            }
+
+        if (keyImageIndex >= imageUrls.size || (imageUrls.isNotEmpty() && keyImageIndex < 0)) {
+            throw CustomException(ErrorCode.PROJECT_IMAGE_INDEX_ERROR)
+        }
+
         val project =
             Project
                 .builder()
@@ -52,11 +65,25 @@ class ProjectService(
         var project =
             projectRepository.findById(updateProjectRequest.projectId)
                 ?: throw CustomException(ErrorCode.PROJECT_NOT_FOUND)
+
+        val imageUrls = updateProjectRequest.imageUrls ?: emptyList()
+        val keyImageIndex =
+            when {
+                imageUrls.isEmpty() -> -1
+                updateProjectRequest.keyImageIndex == null -> 0
+                else -> updateProjectRequest.keyImageIndex
+            }
+
+        if (keyImageIndex >= imageUrls.size || (imageUrls.isNotEmpty() && keyImageIndex <= 0)) {
+            throw CustomException(ErrorCode.PROJECT_IMAGE_INDEX_ERROR)
+        }
+
         project =
             project.update(
                 updateProjectRequest.title,
                 updateProjectRequest.bio,
                 updateProjectRequest.urls,
+                updateProjectRequest.keyImageIndex,
                 updateProjectRequest.imageUrls,
                 updateProjectRequest.content,
                 updateProjectRequest.category,

pofo-api/src/main/resources/graphql/project.graphqls

@@ -1,11 +1,13 @@
 type Project {
-    id: ID!
+    id: Int!
     title: String!
     bio: String
-    urls: [String]
+    urls: [String],
+    keyImageIndex: Int,
     imageUrls: [String]
     content: String!
-    isApproved: Boolean
+    isApproved: Boolean,
+    likes: Int,
     category: ProjectCategory
     stacks: [ProjectStack]
     author: User
@@ -27,13 +29,14 @@ type Query {
     # 특정 ID로 프로젝트를 조회
     projectById(projectId: ID!): Project
     # 프로젝트 리스트 페이지네이션
-    getAllProjectsByPagination(cursor: Int, size: Int!): ProjectList
+    getAllProjectsByPagination(cursor: Int = 0, size: Int!): ProjectList
 }
 
 type Mutation {
     createProject(
         title: String!,
         bio: String,
+        keyImageIndex: Int,
         urls: [String],
         imageUrls: [String],
         content: String!,
@@ -46,6 +49,7 @@ type Mutation {
         title: String,
         bio: String,
         urls: [String],
+        keyImageIndex: Int!,
         imageUrls: [String],
         content: String,
         category: ProjectCategory

pofo-api/src/main/resources/graphql/user.graphqls

@@ -1,5 +1,4 @@
 type User {
     id: ID!
-    name: String!
     email: String!
 }

pofo-api/src/test/kotlin/org/pofo/api/controller/ProjectControllerTest.kt

@@ -1,6 +1,7 @@
 package org.pofo.api.controller
 
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.pofo.api.dto.CreateProjectRequest
 import org.pofo.api.dto.RegisterRequest
@@ -102,6 +103,7 @@ internal class ProjectControllerTest
         }
 
         @Test
+        @DisplayName("페이지 네이션 적은 것 테스트")
         fun getAllProjectsByPagination() {
             // given
             val savedProjects = mutableListOf<Project>()
@@ -131,6 +133,40 @@ internal class ProjectControllerTest
                 .isEqualTo(false)
         }
 
+        @Test
+        @DisplayName("2번째 페이지 데이터 검증")
+        fun getSecondPageProjectsByPaginationTest() {
+            // given
+            val savedProjects = mutableListOf<Project>()
+            repeat(20) {
+                savedProjects.add(saveProject(createProject(), savedUser.id))
+            }
+
+            val graphQlTester =
+                HttpGraphQlTester
+                    .builder(client)
+                    .build()
+
+            val firstPageCursor = savedProjects[savedProjects.size - 5].id
+            val expectedSecondPageProjects = savedProjects.subList(10, 15).reversed()
+
+            // when & then
+            graphQlTester
+                .documentName("getAllProjectsByPagination")
+                .variable("cursor", firstPageCursor)
+                .variable("size", 5)
+                .execute()
+                .path("getAllProjectsByPagination.projectCount")
+                .entity(Int::class.java)
+                .isEqualTo(5)
+                .path("getAllProjectsByPagination.projects[*].title")
+                .entityList(String::class.java)
+                .containsExactly(*expectedSecondPageProjects.map { it.title }.toTypedArray())
+                .path("getAllProjectsByPagination.hasNext")
+                .entity(Boolean::class.java)
+                .isEqualTo(true)
+        }
+
         @Test
         fun updateProject() {
             // given
@@ -147,6 +183,7 @@ internal class ProjectControllerTest
                 .documentName("updateProject")
                 .variable("projectId", savedProject.id)
                 .variable("title", newTitle)
+                .variable("keyImageIndex", 0)
                 .execute()
                 .path("updateProject.title")
                 .entity(String::class.java)
@@ -163,6 +200,7 @@ internal class ProjectControllerTest
                     bio = project.bio,
                     content = project.content,
                     urls = project.urls,
+                    keyImageIndex = 0,
                     imageUrls = project.imageUrls,
                     category = project.category,
                     stacks = project.stacks,

pofo-api/src/test/resources/graphql-test/updateProject.graphql

@@ -3,6 +3,7 @@ mutation updateProject(
     $title: String,
     $bio: String,
     $urls: [String],
+    $keyImageIndex: Int!,
     $imageUrls: [String],
     $content: String,
     $category: ProjectCategory
@@ -12,6 +13,7 @@ mutation updateProject(
         title: $title,
         bio: $bio,
         urls: $urls,
+        keyImageIndex: $keyImageIndex,
         imageUrls: $imageUrls,
         content: $content,
         category: $category

pofo-common/src/main/kotlin/org/pofo/common/exception/ErrorCode.kt

@@ -20,4 +20,5 @@ enum class ErrorCode(
     // PROJECT
     PROJECT_NOT_FOUND(404, "프로젝트를 찾을 수 없습니다.", "PROJ-001"),
     PROJECT_STACK_NOT_FOUND(400, "프로젝트 스택을 찾을 수 없습니다.", "PROJ-002"),
+    PROJECT_IMAGE_INDEX_ERROR(400, "대표 이미지 인덱스가 잘못되었습니다.", "PROJ-003"),
 }

pofo-domain/src/main/java/org/pofo/domain/rds/domain/project/Project.java

@@ -26,6 +26,14 @@ public class Project {
     @Column
     private String Bio; // 한줄 소개
 
+    @Column
+    @Builder.Default
+    private Integer keyImageIndex = -1; // 대표 이미지 인덱스
+
+    @Column
+    @Builder.Default
+    private Long likes = 0L; //좋아요 수 (매번 집계 쿼리 사용을 피하기 위함)
+
     @Convert(converter = StringListConverter.class)
     @Column(columnDefinition = "TEXT")
     private List<String> urls; // 유저가 설정한 url list ex) github, npm 등등
@@ -53,7 +61,7 @@ public class Project {
     @JoinColumn(name = "user_id")
     private User author;
 
-    public Project update(String title, String bio, List<String> urls, List<String> imageUrls, String content, ProjectCategory category, List<ProjectStack> stacks) {
+    public Project update(String title, String bio, List<String> urls, Integer keyImageIndex, List<String> imageUrls, String content, ProjectCategory category, List<ProjectStack> stacks) {
         if (title != null) {
             this.title = title;
         }
@@ -63,6 +71,9 @@ public Project update(String title, String bio, List<String> urls, List<String>
         if (urls != null) {
             this.urls = urls;
         }
+        if (keyImageIndex != null) {
+            this.keyImageIndex = keyImageIndex;
+        }
         if (imageUrls != null) {
             this.imageUrls = imageUrls;
         }

pofo-domain/src/main/java/org/pofo/domain/rds/domain/project/repository/ProjectCustomRepositoryImpl.java

@@ -19,16 +19,14 @@ public class ProjectCustomRepositoryImpl implements ProjectCustomRepository {
     @Override
     public ProjectList searchProjectWithCursor(int size, Long cursor) {
         QProject project = QProject.project;
-        BooleanExpression predicate = null;
 
-        if (cursor != null) {
-            predicate = project.id.lt(cursor);
-        }
+        boolean isInitialRequest = (cursor == null);
 
+        // 초기 요청: ID가 가장 큰 데이터부터 시작
         List<Project> projects = queryFactory.selectFrom(project)
-                .where(predicate)
-                .orderBy(project.id.desc())
-                .limit(size + 1)
+                .where(isInitialRequest ? null : project.id.lt(cursor))
+                .orderBy(project.id.desc()) // 항상 ID 내림차순 정렬
+                .limit(size + 1) // 요청 크기 + 1로 가져와서 다음 페이지 확인
                 .fetch();
 
         boolean hasNext = projects.size() > size;