Merge pull request #217 from Team-TenTen/fix/space/pagination

Fix/space/pagination - 스페이스 필터 조회 API NPE 해결.
Team-TenTen · Jan 31, 2024 · 44066f3 · 44066f3
2 parents 4ffb84f + 5588b1f
commit 44066f3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/...enten/linkhub/domain/space/controller/dto/space/PublicSpacesFindWithFilterApiRequest.java b/...enten/linkhub/domain/space/controller/dto/space/PublicSpacesFindWithFilterApiRequest.java
@@ -4,10 +4,10 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 public record PublicSpacesFindWithFilterApiRequest(
-        @Schema(title = "마지막 favoriteCount", example = "1")
+        @Schema(title = "마지막 favoriteCount", example = "0")
         Long lastFavoriteCount,
 
-        @Schema(title = "마지막 spaceId", example = "1")
+        @Schema(title = "마지막 spaceId", example = "62")
         Long lastSpaceId,
 
         @Schema(title = "페이지 크기", example = "10")

diff --git a/...in/java/com/tenten/linkhub/domain/space/repository/common/mapper/RepositoryDtoMapper.java b/...in/java/com/tenten/linkhub/domain/space/repository/common/mapper/RepositoryDtoMapper.java
@@ -1,12 +1,16 @@
 package com.tenten.linkhub.domain.space.repository.common.mapper;
 
+import com.tenten.linkhub.domain.space.common.SpaceCursorPageRequest;
+import com.tenten.linkhub.domain.space.common.SpaceCursorSlice;
+import com.tenten.linkhub.domain.space.model.space.Space;
 import com.tenten.linkhub.domain.space.model.space.SpaceImage;
 import com.tenten.linkhub.domain.space.repository.common.dto.SpaceAndOwnerNickName;
 import com.tenten.linkhub.domain.space.repository.common.dto.SpaceAndSpaceImageOwnerNickName;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component
@@ -29,4 +33,16 @@ public List<SpaceAndSpaceImageOwnerNickName> toSpaceAndSpaceImageOwnerNickNames(
                 .collect(Collectors.toList());
     }
 
+    public SpaceCursorSlice<SpaceAndSpaceImageOwnerNickName> toSpaceCursorSlice(List<SpaceAndSpaceImageOwnerNickName> contents, SpaceCursorPageRequest pageable, boolean hasNext){
+        Space lastSpace = contents.isEmpty() ? null : contents.get(contents.size() - 1).space();
+
+        return SpaceCursorSlice.of(
+                Objects.isNull(lastSpace) ? null : lastSpace.getFavoriteCount(),
+                Objects.isNull(lastSpace) ? null : lastSpace.getId(),
+                pageable.pageSize(),
+                hasNext,
+                contents
+        );
+    }
+
 }
diff --git a/...va/com/tenten/linkhub/domain/space/repository/space/querydsl/SpaceQueryDslRepository.java b/...va/com/tenten/linkhub/domain/space/repository/space/querydsl/SpaceQueryDslRepository.java
@@ -18,6 +18,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.tenten.linkhub.domain.member.model.QMember.member;
 import static com.tenten.linkhub.domain.space.model.space.QSpace.space;
@@ -62,15 +63,7 @@ public SpaceCursorSlice<SpaceAndSpaceImageOwnerNickName> findPublicSpacesJoinSpa
             hasNext = true;
         }
 
-        Space lastSpace = contents.get(contents.size() - 1).space();
-
-        return SpaceCursorSlice.of(
-                lastSpace.getFavoriteCount(),
-                lastSpace.getId(),
-                pageable.pageSize(),
-                hasNext,
-                contents
-        );
+        return mapper.toSpaceCursorSlice(contents, pageable, hasNext);
     }
 
     public Slice<SpaceAndSpaceImageOwnerNickName> searchPublicSpacesJoinSpaceImageByCondition(QueryCondition condition) {

diff --git a/src/test/java/com/tenten/linkhub/domain/space/service/DefaultSpaceServiceTest.java b/src/test/java/com/tenten/linkhub/domain/space/service/DefaultSpaceServiceTest.java
@@ -157,9 +157,9 @@ void findMemberSpacesByQuery_emptyKeyWord_emptyFilter() {
         List<SpacesFindByQueryResponse> content = response.responses().getContent();
 
         assertThat(content.size()).isEqualTo(2);
-        assertThat(content.get(1).spaceName()).isEqualTo("세번째 스페이스");
-        assertThat(content.get(1).spaceImagePath()).isEqualTo("https://testimage3");
-        assertThat(content.get(1).ownerNickName()).isEqualTo("백둥이");
+        assertThat(content.get(0).spaceName()).isEqualTo("세번째 스페이스");
+        assertThat(content.get(0).spaceImagePath()).isEqualTo("https://testimage3");
+        assertThat(content.get(0).ownerNickName()).isEqualTo("백둥이");
     }
 
     @Test
@@ -176,12 +176,11 @@ void findMemberSpacesByQuery_emptyKeyWord_emptyFilter_findMySpaces() {
         List<SpacesFindByQueryResponse> content = response.responses().getContent();
 
         assertThat(content.size()).isEqualTo(2);
-        assertThat(content.get(0).spaceName()).isEqualTo("첫번째 스페이스");
-        assertThat(content.get(0).description()).isEqualTo("첫번째 스페이스 소개글");
-        assertThat(content.get(0).category()).isEqualTo(Category.KNOWLEDGE_ISSUE_CAREER);
-        assertThat(content.get(0).spaceImagePath()).isEqualTo("https://testimage1");
+        assertThat(content.get(0).spaceName()).isEqualTo("두번째 스페이스");
+        assertThat(content.get(0).spaceImagePath()).isEqualTo("https://testimage2");
         assertThat(content.get(0).ownerNickName()).isEqualTo("잠자는 사자의 콧털");
-        assertThat(content.get(1).spaceName()).isEqualTo("두번째 스페이스");
+        assertThat(content.get(1).spaceName()).isEqualTo("첫번째 스페이스");
+        assertThat(content.get(1).spaceImagePath()).isEqualTo("https://testimage1");
         assertThat(content.get(1).ownerNickName()).isEqualTo("잠자는 사자의 콧털");
     }