Merge pull request #429 from UPbrella/dev

v1.3.3 release
UPbrella · Dec 20, 2023 · eacf335 · eacf335
2 parents a85c6d5 + 7ecd8a2
commit eacf335
Showing 1 changed file with 58 additions and 33 deletions.
diff --git a/src/main/java/upbrella/be/umbrella/repository/UmbrellaRepositoryImpl.java b/src/main/java/upbrella/be/umbrella/repository/UmbrellaRepositoryImpl.java
@@ -1,14 +1,17 @@
 package upbrella.be.umbrella.repository;
 
+import com.querydsl.core.types.dsl.CaseBuilder;
+import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
+import upbrella.be.rent.entity.QHistory;
 import upbrella.be.umbrella.dto.response.QUmbrellaWithHistory;
 import upbrella.be.umbrella.dto.response.UmbrellaWithHistory;
 
 import java.util.List;
 
-import static upbrella.be.rent.entity.QHistory.history;
 import static upbrella.be.umbrella.entity.QUmbrella.umbrella;
 
 @RequiredArgsConstructor
@@ -94,24 +97,36 @@ public long countMissingUmbrellasByStore(long storeId) {
                 .fetchCount();
     }
 
-    // TODO : history와 연동
     @Override
     public List<UmbrellaWithHistory> findUmbrellaAndHistoryOrderedByUmbrellaId(Pageable pageable) {
 
-        QUmbrellaWithHistory umbrellaWithHistory = new QUmbrellaWithHistory(
-                umbrella.id,
-                umbrella.storeMeta,
-                umbrella.uuid,
-                umbrella.rentable,
-                umbrella.deleted,
-                umbrella.createdAt,
-                umbrella.etc,
-                umbrella.missed
-        );
-
-        return queryFactory.select(umbrellaWithHistory)
+        QHistory subHistory = new QHistory("subHistory");
+
+        JPAQuery<Long> subQuery = new JPAQuery<>();
+        subQuery.select(new CaseBuilder()
+                        .when(subHistory.returnedAt.isNull())
+                        .then(subHistory.id)
+                        .otherwise((Long) null))
+                .from(subHistory)
+                .where(subHistory.umbrella.id.eq(umbrella.id)
+                        .and(subHistory.id.eq(
+                                JPAExpressions.select(subHistory.id.max())
+                                        .from(subHistory)
+                                        .where(subHistory.umbrella.id.eq(umbrella.id)))))
+                .orderBy(subHistory.id.desc())
+                .limit(1);
+
+        return queryFactory.select(new QUmbrellaWithHistory(
+                        umbrella.id,
+                        umbrella.storeMeta,
+                        umbrella.uuid,
+                        umbrella.rentable,
+                        umbrella.deleted,
+                        umbrella.createdAt,
+                        umbrella.etc,
+                        umbrella.missed,
+                        subQuery))
                 .from(umbrella)
-                .join(umbrella.storeMeta)
                 .where(umbrella.deleted.eq(false))
                 .orderBy(umbrella.uuid.asc())
                 .offset(pageable.getOffset())
@@ -122,25 +137,35 @@ public List<UmbrellaWithHistory> findUmbrellaAndHistoryOrderedByUmbrellaId(Pagea
     @Override
     public List<UmbrellaWithHistory> findUmbrellaAndHistoryOrderedByUmbrellaIdByStoreId(long storeId, Pageable pageable) {
 
-        QUmbrellaWithHistory umbrellaWithHistory = new QUmbrellaWithHistory(
-                umbrella.id,
-                umbrella.storeMeta,
-                umbrella.uuid,
-                umbrella.rentable,
-                umbrella.deleted,
-                umbrella.createdAt,
-                umbrella.etc,
-                umbrella.missed,
-                history.id
-        );
-
-        return queryFactory.select(umbrellaWithHistory)
-                .from(history)
-                .rightJoin(history.umbrella, umbrella)
-                .join(umbrella.storeMeta)
+        QHistory subHistory = new QHistory("subHistory");
+
+        JPAQuery<Long> subQuery = new JPAQuery<>();
+        subQuery.select(new CaseBuilder()
+                        .when(subHistory.returnedAt.isNull())
+                        .then(subHistory.id)
+                        .otherwise((Long) null))
+                .from(subHistory)
+                .where(subHistory.umbrella.id.eq(umbrella.id)
+                        .and(subHistory.id.eq(
+                                JPAExpressions.select(subHistory.id.max())
+                                        .from(subHistory)
+                                        .where(subHistory.umbrella.id.eq(umbrella.id)))))
+                .orderBy(subHistory.id.desc())
+                .limit(1);
+
+        return queryFactory.select(new QUmbrellaWithHistory(
+                        umbrella.id,
+                        umbrella.storeMeta,
+                        umbrella.uuid,
+                        umbrella.rentable,
+                        umbrella.deleted,
+                        umbrella.createdAt,
+                        umbrella.etc,
+                        umbrella.missed,
+                        subQuery))
+                .from(umbrella)
                 .where(umbrella.deleted.eq(false)
-                        .and(umbrella.storeMeta.id.eq(storeId))
-                        .and(history.returnedAt.isNull()))
+                        .and(umbrella.storeMeta.id.eq(storeId)))
                 .orderBy(umbrella.uuid.asc())
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())