[Fix]: 컴파일 에러 해결.

Team-TenTen · Mar 10, 2024 · 32060be · 32060be
1 parent 1411b5d
commit 32060be
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/src/main/java/com/tenten/linkhub/domain/space/repository/space/DefaultSpaceRepository.java b/src/main/java/com/tenten/linkhub/domain/space/repository/space/DefaultSpaceRepository.java
@@ -43,12 +43,6 @@ public Space getById(Long spaceId) {
                 .orElseThrow(() -> new DataNotFoundException("해당 spaceId를 가진 Space를 찾을 수 없습니다."));
     }
 
-    @Override
-    public Space getByIdWhitLock(Long spaceId) {
-        return spaceJpaRepository.findByIdWithLock(spaceId)
-                .orElseThrow(() -> new DataNotFoundException("해당 spaceId를 가진 Space를 찾을 수 없습니다."));
-    }
-
     @Override
     public Space getSpaceJoinSpaceMemberById(Long spaceId) {
         return spaceJpaRepository.findSpaceJoinSpaceMemberById(spaceId)
@@ -60,6 +54,11 @@ public Slice<SpaceAndSpaceImageOwnerNickName> findMemberSpacesJoinSpaceImageByQu
         return spaceQueryDslRepository.findMemberSpacesJoinSpaceImageByCondition(queryCondition);
     }
 
+    @Override
+    public Slice<SpaceAndSpaceImageOwnerNickName> findPublicSpacesJoinSpaceImageByLikeQuery(QueryCondition queryCondition) {
+        return spaceQueryDslRepository.findPublicSpacesJoinSpaceImageByConditionWithLikeQuery(queryCondition);
+    }
+
     @Override
     public void increaseScrapCount(Long spaceId) {
         spaceJpaRepository.increaseScrapCount(spaceId);

diff --git a/src/main/java/com/tenten/linkhub/domain/space/repository/space/SpaceRepository.java b/src/main/java/com/tenten/linkhub/domain/space/repository/space/SpaceRepository.java
@@ -22,6 +22,8 @@ public interface SpaceRepository {
 
     Slice<SpaceAndSpaceImageOwnerNickName> findMemberSpacesJoinSpaceImageByQuery(MemberSpacesQueryCondition queryCondition);
 
+    Slice<SpaceAndSpaceImageOwnerNickName> findPublicSpacesJoinSpaceImageByLikeQuery(QueryCondition queryCondition);
+
     void increaseScrapCount(Long spaceId);
 
     Space getByIdWithPessimisticLock(Long spaceId);

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
@@ -76,7 +76,7 @@ public Slice<SpaceAndSpaceImageOwnerNickName> searchPublicSpacesJoinSpaceImageBy
                 .leftJoin(member).on(space.memberId.eq(member.id))
                 .where(space.isDeleted.eq(false),
                         space.isVisible.eq(true),
-                        dynamicQueryFactory.eqSpaceNameWithPlus(condition.keyWord()),
+                        dynamicQueryFactory.eqSpaceName(condition.keyWord()),
                         dynamicQueryFactory.eqCategory(condition.filter())
                 )
                 .orderBy(dynamicQueryFactory.spaceSort(condition.pageable().getSort()))
@@ -110,7 +110,7 @@ public Slice<SpaceAndSpaceImageOwnerNickName> findMemberSpacesJoinSpaceImageByCo
                 .where(spaceMember.memberId.eq(condition.memberId()),
                         space.isDeleted.eq(false),
                         dynamicQueryFactory.eqIsVisible(condition.isMySpace()),
-                        dynamicQueryFactory.eqSpaceNameWithPlus(condition.keyWord()),
+                        dynamicQueryFactory.eqSpaceName(condition.keyWord()),
                         dynamicQueryFactory.eqCategory(condition.filter())
                 )
                 .orderBy(space.id.desc())
@@ -133,21 +133,6 @@ public Slice<SpaceAndSpaceImageOwnerNickName> findMemberSpacesJoinSpaceImageByCo
         return new SliceImpl<>(contents, condition.pageable(), hasNext);
     }
 
-    private List<SpaceImage> findSpaceImagesBySpaceIds(List<Long> spaceIds) {
-        return queryFactory
-                .selectFrom(spaceImage)
-                .where(spaceImage.space.id.in(spaceIds),
-                        spaceImage.isDeleted.eq(false))
-                .fetch();
-    }
-
-    private static List<Long> getSpaceIds(List<SpaceAndOwnerNickName> spaceAndOwnerNickNames) {
-        return spaceAndOwnerNickNames
-                .stream()
-                .map(s -> s.space().getId())
-                .toList();
-    }
-
     public Slice<SpaceAndSpaceImageOwnerNickName> findPublicSpacesJoinSpaceImageByConditionWithLikeQuery(QueryCondition condition) {
         List<SpaceAndOwnerNickName> spaceAndOwnerNickNames = queryFactory
                 .select(new QSpaceAndOwnerNickName(
@@ -161,18 +146,16 @@ public Slice<SpaceAndSpaceImageOwnerNickName> findPublicSpacesJoinSpaceImageByCo
                         dynamicQueryFactory.eqSpaceNameWithLikeQuery(condition.keyWord()),
                         dynamicQueryFactory.eqCategory(condition.filter())
                 )
-                .orderBy(dynamicQueryFactory.spaceSort(condition.pageable()))
+                .orderBy(space.createdAt.desc())
                 .offset(condition.pageable().getOffset())
                 .limit(condition.pageable().getPageSize() + 1)
                 .fetch();
 
         List<Long> spaceIds = getSpaceIds(spaceAndOwnerNickNames);
-
         List<SpaceImage> spaceImages = findSpaceImagesBySpaceIds(spaceIds);
 
-        SpaceAndSpaceImageOwnerNickNames spaceAndSpaceImageOwnerNickNames = SpaceAndSpaceImageOwnerNickNames.of(spaceAndOwnerNickNames, spaceImages);
-
-        List<SpaceAndSpaceImageOwnerNickName> contents = spaceAndSpaceImageOwnerNickNames.contents();
+        List<SpaceAndSpaceImageOwnerNickName> contents = mapper.toSpaceAndSpaceImageOwnerNickNames(spaceAndOwnerNickNames, spaceImages);
+        ;
         boolean hasNext = false;
 
         if (contents.size() > condition.pageable().getPageSize()) {
@@ -182,4 +165,20 @@ public Slice<SpaceAndSpaceImageOwnerNickName> findPublicSpacesJoinSpaceImageByCo
 
         return new SliceImpl<>(contents, condition.pageable(), hasNext);
     }
-}
+
+    private List<SpaceImage> findSpaceImagesBySpaceIds(List<Long> spaceIds) {
+        return queryFactory
+                .selectFrom(spaceImage)
+                .where(spaceImage.space.id.in(spaceIds),
+                        spaceImage.isDeleted.eq(false))
+                .fetch();
+    }
+
+    private static List<Long> getSpaceIds(List<SpaceAndOwnerNickName> spaceAndOwnerNickNames) {
+        return spaceAndOwnerNickNames
+                .stream()
+                .map(s -> s.space().getId())
+                .toList();
+    }
+
+}
diff --git a/src/main/java/com/tenten/linkhub/domain/space/service/FavoriteService.java b/src/main/java/com/tenten/linkhub/domain/space/service/FavoriteService.java
@@ -47,7 +47,7 @@ public SpaceRegisterInFavoriteResponse createFavorite(Long spaceId, Long memberI
 
     @Transactional
     public SpaceRegisterInFavoriteResponse createFavoriteWithLock(Long spaceId, Long memberId) {
-        Space space = spaceRepository.getByIdWhitLock(spaceId);
+        Space space = spaceRepository.getByIdWithPessimisticLock(spaceId);
 
         Favorite favorite = mapper.toFavorite(space, memberId);
         Favorite savedFavorite = favoriteRepository.save(favorite);