From b79293712b3f79269815991aad7d0bdade9668ca Mon Sep 17 00:00:00 2001
From: shin-mallang <huipulci1@naver.com>
Date: Fri, 1 Dec 2023 06:41:58 +0900
Subject: [PATCH] [#119] chore: update boot version to 3.2

---
 build.gradle                                              | 5 ++---
 .../com/mallang/category/domain/CategoryRepository.java   | 2 +-
 .../query/repository/CategoryQueryRepository.java         | 2 +-
 .../api/query/repository/PostViewStatisticDao.java        | 8 +++-----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index e0596c98..ec052ca4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.0-M1'
-    id 'io.spring.dependency-management' version '1.1.2'
+    id 'org.springframework.boot' version '3.2.0'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'jacoco'
     id 'org.sonarqube' version '4.2.1.3168'
 }
@@ -26,7 +26,6 @@ configurations {
 
 repositories {
     mavenCentral()
-    maven { url 'https://repo.spring.io/milestone' }
 }
 
 dependencies {
diff --git a/src/main/java/com/mallang/category/domain/CategoryRepository.java b/src/main/java/com/mallang/category/domain/CategoryRepository.java
index 1ec870fb..1ce042b9 100644
--- a/src/main/java/com/mallang/category/domain/CategoryRepository.java
+++ b/src/main/java/com/mallang/category/domain/CategoryRepository.java
@@ -14,7 +14,7 @@ default Category getById(Long id) {
         return findById(id).orElseThrow(NotFoundCategoryException::new);
     }
 
-    @Query("SELECT c FROM Category c WHERE c.owner.id = :memberId AND c.parent = null")
+    @Query("SELECT c FROM Category c WHERE c.owner.id = :memberId AND c.parent IS NULL")
     List<Category> findAllRootByMemberId(@Param("memberId") Long memberId);
 
     @Nullable
diff --git a/src/main/java/com/mallang/category/query/repository/CategoryQueryRepository.java b/src/main/java/com/mallang/category/query/repository/CategoryQueryRepository.java
index 8101c09e..26b54267 100644
--- a/src/main/java/com/mallang/category/query/repository/CategoryQueryRepository.java
+++ b/src/main/java/com/mallang/category/query/repository/CategoryQueryRepository.java
@@ -24,6 +24,6 @@ default Category getById(Long id) {
         return findById(id).orElseThrow(NotFoundCategoryException::new);
     }
 
-    @Query("SELECT c FROM Category c WHERE c.blog.name.value = :blogName AND c.parent = null")
+    @Query("SELECT c FROM Category c WHERE c.blog.name.value = :blogName AND c.parent IS NULL")
     List<Category> findAllRootByBlogName(@Param("blogName") String blogName);
 }
diff --git a/src/main/java/com/mallang/statistics/api/query/repository/PostViewStatisticDao.java b/src/main/java/com/mallang/statistics/api/query/repository/PostViewStatisticDao.java
index 21397920..09c75480 100644
--- a/src/main/java/com/mallang/statistics/api/query/repository/PostViewStatisticDao.java
+++ b/src/main/java/com/mallang/statistics/api/query/repository/PostViewStatisticDao.java
@@ -12,10 +12,7 @@
 
 public interface PostViewStatisticDao {
 
-    List<PostViewStatistic> findByPost(
-            Post post,
-            StatisticQueryCondition condition
-    );
+    List<PostViewStatistic> findByPost(Post post, StatisticQueryCondition condition);
 
     @RequiredArgsConstructor
     @Component
@@ -27,7 +24,8 @@ class PostViewStatisticDaoImpl implements PostViewStatisticDao {
         public List<PostViewStatistic> findByPost(Post post, StatisticQueryCondition condition) {
             return query.selectFrom(postViewStatistic)
                     .where(
-                            postViewStatistic.postId.eq(post.getPostId()),
+                            postViewStatistic.postId.id.eq(post.getPostId().getId()),
+                            postViewStatistic.postId.blogId.eq(post.getPostId().getBlogId()),
                             postViewStatistic.statisticDate.between(
                                     condition.startDayInclude(),
                                     condition.lastDayInclude()