Merge branch 'feat/convert_to_querydsl' into dev-check

Team-NumberOne · Mar 15, 2024 · 64feb7d · 64feb7d
2 parents 1591fc8 + 605a5e4
commit 64feb7d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/...re/src/main/java/com/numberone/backend/domain/disaster/repository/DisasterRepository.java b/...re/src/main/java/com/numberone/backend/domain/disaster/repository/DisasterRepository.java
@@ -1,9 +1,10 @@
 package com.numberone.backend.domain.disaster.repository;
 
 import com.numberone.backend.domain.disaster.entity.Disaster;
+import com.numberone.backend.domain.disaster.repository.custom.DisasterRepositoryCustom;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
-public interface DisasterRepository extends JpaRepository<Disaster, Long>, com.numberone.backend.domain.disaster.repository.custom.DisasterRepositoryCustom {
+public interface DisasterRepository extends JpaRepository<Disaster, Long>, DisasterRepositoryCustom {
 }
diff --git a/...com/numberone/backend/domain/disaster/repository/custom/DisasterRepositoryCustomImpl.java b/...com/numberone/backend/domain/disaster/repository/custom/DisasterRepositoryCustomImpl.java
@@ -1,25 +1,31 @@
 package com.numberone.backend.domain.disaster.repository.custom;
 
 import com.numberone.backend.domain.disaster.entity.Disaster;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringTemplate;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 import static com.numberone.backend.domain.disaster.entity.QDisaster.disaster;
+import static com.querydsl.core.types.dsl.Expressions.stringTemplate;
 
 @RequiredArgsConstructor
 public class DisasterRepositoryCustomImpl implements DisasterRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     @Override
     public List<Disaster> findDisastersInAddressAfterTime(String address, LocalDateTime time) {
+        BooleanExpression condition = stringTemplate("{0}", Expressions.constant(address))
+                .like(stringTemplate("concat({1}, '%')", disaster.location));
+
         return queryFactory
                 .select(disaster)
                 .from(disaster)
-                .where(disaster.location.startsWith(address)
-                        .and(disaster.generatedAt.after(time)))
+                .where(condition)
                 .orderBy(disaster.generatedAt.desc())
                 .fetch();
     }

diff --git a/...core/src/main/java/com/numberone/backend/domain/support/repository/SupportRepository.java b/...core/src/main/java/com/numberone/backend/domain/support/repository/SupportRepository.java
@@ -1,7 +1,8 @@
 package com.numberone.backend.domain.support.repository;
 
 import com.numberone.backend.domain.support.entity.Support;
+import com.numberone.backend.domain.support.repository.custom.SupportRepositoryCustom;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface SupportRepository extends JpaRepository<Support, Long>, com.numberone.backend.domain.support.repository.custom.SupportRepositoryCustom {
+public interface SupportRepository extends JpaRepository<Support, Long>, SupportRepositoryCustom {
 }