refactor: QueryDSL 사용 하여 코드 가독성 개선

Author: dnzp75

src/main/java/com/example/log4u/domain/map/dto/response/AreaClusterProjection.java

@@ -1,19 +1,17 @@
 package com.example.log4u.domain.map.dto.response;
 
+import com.querydsl.core.annotations.QueryProjection;
+
 public record DiaryClusterResponseDto(
 	String areaName,
 	Long areaId,
 	Double lat,
 	Double lon,
 	Long diaryCount
 ) {
-	public static DiaryClusterResponseDto of(AreaClusterProjection proj) {
-		return new DiaryClusterResponseDto(
-			proj.getName(),
-			proj.getId(),
-			proj.getLat(),
-			proj.getLon(),
-			proj.getDiaryCount()
-		);
+
+	@QueryProjection
+	public DiaryClusterResponseDto {
 	}
+
 }

src/main/java/com/example/log4u/domain/map/dto/response/DiaryClusterResponseDto.java

@@ -1,41 +1,20 @@
 package com.example.log4u.domain.map.repository;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.example.log4u.domain.map.dto.response.AreaClusterProjection;
 import com.example.log4u.domain.map.entity.SidoAreas;
 
 @Repository
-public interface SidoAreasRepository extends JpaRepository<SidoAreas, Long> {
-
-	@Query(value = """
-			SELECT s.id AS id,
-			       s.name AS name,
-			       s.lat AS lat,
-			       s.lon AS lon,
-			       COALESCE(c.diary_count, 0) AS diaryCount
-			FROM sido_areas s
-			LEFT JOIN sido_areas_diary_count c ON s.id = c.id
-			WHERE s.lat BETWEEN :south AND :north
-			  AND s.lon BETWEEN :west AND :east
-		""", nativeQuery = true)
-	List<AreaClusterProjection> findSidoAreaClusters(
-		@Param("south") double south,
-		@Param("north") double north,
-		@Param("west") double west,
-		@Param("east") double east
-	);
+public interface SidoAreasRepository extends JpaRepository<SidoAreas, Long>,SidoAreasRepositoryCustom {
 
 	@Query("""
 		    SELECT s FROM SidoAreas s
 		    WHERE ST_Contains(s.geom, ST_SetSRID(ST_Point(:lon, :lat), 4326)) = true
 		""")
 	Optional<SidoAreas> findRegionByLatLon(@Param("lat") Double lat, @Param("lon") Double lon);
-
 }

src/main/java/com/example/log4u/domain/map/repository/SidoAreasRepository.java

@@ -0,0 +1,9 @@
+package com.example.log4u.domain.map.repository;
+
+import java.util.List;
+
+import com.example.log4u.domain.map.dto.response.DiaryClusterResponseDto;
+
+public interface SidoAreasRepositoryCustom {
+	List<DiaryClusterResponseDto> findSidoAreaClusters(double south, double north, double west, double east);
+}

src/main/java/com/example/log4u/domain/map/repository/SidoAreasRepositoryCustom.java

@@ -0,0 +1,44 @@
+package com.example.log4u.domain.map.repository;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.example.log4u.domain.map.dto.response.DiaryClusterResponseDto;
+import com.example.log4u.domain.map.dto.response.QDiaryClusterResponseDto;
+import com.example.log4u.domain.map.entity.QSidoAreas;
+import com.example.log4u.domain.map.entity.QSidoAreasDiaryCount;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+@Repository
+public class SidoAreasRepositoryImpl implements SidoAreasRepositoryCustom {
+
+	private final JPAQueryFactory queryFactory;
+
+	public SidoAreasRepositoryImpl(@Qualifier("postgresJPAQueryFactory") JPAQueryFactory queryFactory) {
+		this.queryFactory = queryFactory;
+	}
+
+	@Override
+	public List<DiaryClusterResponseDto> findSidoAreaClusters(double south, double north, double west, double east) {
+		QSidoAreas s = QSidoAreas.sidoAreas;
+		QSidoAreasDiaryCount c = QSidoAreasDiaryCount.sidoAreasDiaryCount;
+
+		return queryFactory
+			.select(new QDiaryClusterResponseDto(
+				s.name,
+				s.id,
+				s.lat,
+				s.lon,
+				c.diaryCount.coalesce(0L)
+			))
+			.from(s)
+			.leftJoin(c).on(s.id.eq(c.id))
+			.where(
+				s.lat.between(south, north),
+				s.lon.between(west, east)
+			)
+			.fetch();
+	}
+}

src/main/java/com/example/log4u/domain/map/repository/SidoAreasRepositoryImpl.java

@@ -1,36 +1,16 @@
 package com.example.log4u.domain.map.repository;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.example.log4u.domain.map.dto.response.AreaClusterProjection;
 import com.example.log4u.domain.map.entity.SiggAreas;
 
 @Repository
-public interface SiggAreasRepository extends JpaRepository<SiggAreas, Long> {
-
-	@Query(value = """
-			SELECT s.gid AS id,
-			       s.sgg_nm AS name,
-			       s.lat AS lat,
-			       s.lon AS lon,
-			       COALESCE(c.diary_count, 0) AS diaryCount
-			FROM sigg_areas s
-			LEFT JOIN sigg_areas_diary_count c ON s.gid = c.id
-			WHERE s.lat BETWEEN :south AND :north
-			  AND s.lon BETWEEN :west AND :east
-		""", nativeQuery = true)
-	List<AreaClusterProjection> findSiggAreaClusters(
-		@Param("south") double south,
-		@Param("north") double north,
-		@Param("west") double west,
-		@Param("east") double east
-	);
+public interface SiggAreasRepository extends JpaRepository<SiggAreas, Long>, SiggAreasRepositoryCustom {
 
 	@Query("""
 		    SELECT r FROM SiggAreas r

src/main/java/com/example/log4u/domain/map/repository/SiggAreasRepository.java

@@ -0,0 +1,9 @@
+package com.example.log4u.domain.map.repository;
+
+import java.util.List;
+
+import com.example.log4u.domain.map.dto.response.DiaryClusterResponseDto;
+
+public interface SiggAreasRepositoryCustom {
+	List<DiaryClusterResponseDto> findSiggAreaClusters(double south, double north, double west, double east);
+}

src/main/java/com/example/log4u/domain/map/repository/SiggAreasRepositoryCustom.java

@@ -0,0 +1,44 @@
+package com.example.log4u.domain.map.repository;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.example.log4u.domain.map.dto.response.DiaryClusterResponseDto;
+import com.example.log4u.domain.map.dto.response.QDiaryClusterResponseDto;
+import com.example.log4u.domain.map.entity.QSiggAreas;
+import com.example.log4u.domain.map.entity.QSiggAreasDiaryCount;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+@Repository
+public class SiggAreasRepositoryImpl implements SiggAreasRepositoryCustom {
+
+	private final JPAQueryFactory queryFactory;
+
+	public SiggAreasRepositoryImpl(@Qualifier("postgresJPAQueryFactory") JPAQueryFactory queryFactory) {
+		this.queryFactory = queryFactory;
+	}
+
+	@Override
+	public List<DiaryClusterResponseDto> findSiggAreaClusters(double south, double north, double west, double east) {
+		QSiggAreas s = QSiggAreas.siggAreas;
+		QSiggAreasDiaryCount c = QSiggAreasDiaryCount.siggAreasDiaryCount;
+
+		return queryFactory
+			.select(new QDiaryClusterResponseDto(
+				s.sggName,
+				s.gid,
+				s.lat,
+				s.lon,
+				c.diaryCount.coalesce(0L)
+			))
+			.from(s)
+			.leftJoin(c).on(s.gid.eq(c.id))
+			.where(
+				s.lat.between(south, north),
+				s.lon.between(west, east)
+			)
+			.fetch();
+	}
+}

src/main/java/com/example/log4u/domain/map/repository/SiggAreasRepositoryImpl.java

@@ -34,15 +34,11 @@ public List<DiaryClusterResponseDto> getDiaryClusters(double south, double north
 	}
 
 	private List<DiaryClusterResponseDto> getSidoAreasClusters(double south, double north, double west, double east) {
-		return sidoAreasRepository.findSidoAreaClusters(south, north, west, east).stream()
-			.map(DiaryClusterResponseDto::of)
-			.toList();
+		return sidoAreasRepository.findSidoAreaClusters(south, north, west, east);
 	}
 
 	private List<DiaryClusterResponseDto> getSiggAreasClusters(double south, double north, double west, double east) {
-		return siggAreasRepository.findSiggAreaClusters(south, north, west, east).stream()
-			.map(DiaryClusterResponseDto::of)
-			.toList();
+		return siggAreasRepository.findSiggAreaClusters(south, north, west, east);
 	}
 
 	public void increaseRegionDiaryCount(Double lat, Double lon) {