fix: 나의 성장 조회시 발생하는 오류

src/main/java/com/example/wini/domain/log/dto/response/ActionChange.java

@@ -2,4 +2,4 @@
 
 import com.example.wini.domain.template.domain.Action;
 
-public record ActionChange(Action action, Long change) {}
+public record ActionChange(Action action, long monthlyChange) {}

src/main/java/com/example/wini/domain/log/dto/response/SimpleActionChange.java

@@ -1,7 +1,7 @@
 package com.example.wini.domain.log.dto.response;
 
-public record SimpleActionChange(String text, long change) {
+public record SimpleActionChange(String text, long monthlyChange) {
     public static SimpleActionChange from(ActionChange actionChange) {
-        return new SimpleActionChange(actionChange.action().getText(), actionChange.change());
+        return new SimpleActionChange(actionChange.action().getText(), actionChange.monthlyChange());
     }
 }

src/main/java/com/example/wini/domain/note/repository/NoteCustomRepositoryImpl.java

@@ -15,13 +15,15 @@
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
+import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -73,41 +75,55 @@ public List<Note> findSavedNotesSortedByCreatedAt(Long memberId, Long roomId, So
     @Override
     public ActionChange findMostIncreasedPositiveActionChange(Long memberId, Long roomId) {
         LocalDate today = LocalDate.now();
-        NumberExpression<Long> thisMonthNotes = countThisMonthNotes(today);
-        NumberExpression<Long> lastMonthNotes = countLastMonthNotes(today);
-        NumberExpression<Long> increaseCount = thisMonthNotes.subtract(lastMonthNotes);
+        NumberExpression<Long> monthlyChange = new CaseBuilder()
+                .when(isCreatedThisMonth(today))
+                .then(1L)
+                .when(isCreatedLastMonth(today))
+                .then(-1L)
+                .otherwise(0L);
 
-        return queryFactory
-                .select(Projections.constructor(ActionChange.class, action, increaseCount))
+        List<ActionChange> results = queryFactory
+                .select(Projections.constructor(
+                        ActionChange.class, action, Expressions.numberTemplate(Long.class, "sum({0})", monthlyChange)))
                 .from(note)
                 .join(note.action, action)
                 .join(action.actionCategory, actionCategory)
                 .where(isThisRoom(roomId)
                         .and(isReceiver(memberId))
                         .and(actionCategory.emotionType.eq(EmotionType.POSITIVE)))
-                .groupBy(action)
-                .orderBy(increaseCount.desc())
-                .fetchFirst();
+                .groupBy(action.id)
+                .fetch();
+
+        return results.stream()
+                .max(Comparator.comparing(ActionChange::monthlyChange))
+                .orElse(null);
     }
 
     @Override
     public ActionChange findMostDecreasedNegativeActionChange(Long memberId, Long roomId) {
         LocalDate today = LocalDate.now();
-        NumberExpression<Long> thisMonthNotes = countThisMonthNotes(today);
-        NumberExpression<Long> lastMonthNotes = countLastMonthNotes(today);
-        NumberExpression<Long> decreaseCount = thisMonthNotes.subtract(lastMonthNotes);
+        NumberExpression<Long> monthlyChange = new CaseBuilder()
+                .when(isCreatedThisMonth(today))
+                .then(1L)
+                .when(isCreatedLastMonth(today))
+                .then(-1L)
+                .otherwise(0L);
 
-        return queryFactory
-                .select(Projections.constructor(ActionChange.class, action, decreaseCount))
+        List<ActionChange> results = queryFactory
+                .select(Projections.constructor(
+                        ActionChange.class, action, Expressions.numberTemplate(Long.class, "sum({0})", monthlyChange)))
                 .from(note)
                 .join(note.action, action)
                 .join(action.actionCategory, actionCategory)
                 .where(isThisRoom(roomId)
                         .and(isReceiver(memberId))
                         .and(actionCategory.emotionType.eq(EmotionType.NEGATIVE)))
-                .groupBy(action)
-                .orderBy(decreaseCount.asc())
-                .fetchFirst();
+                .groupBy(action.id)
+                .fetch();
+
+        return results.stream()
+                .min(Comparator.comparing(ActionChange::monthlyChange))
+                .orElse(null);
     }
 
     @Override
@@ -190,32 +206,23 @@ public Long countTotalNotesExchanged(Long roomId) {
                 .fetchFirst();
     }
 
-    private NumberExpression<Long> countThisMonthNotes(LocalDate today) {
-        LocalDateTime startOfThisMonth = today.withDayOfMonth(1).atStartOfDay();
-        LocalDateTime endOfThisMonth = today.plusDays(1).atStartOfDay();
+    private BooleanExpression isCreatedThisMonth(LocalDate today) {
+        LocalDate firstDayOfThisMonth = today.withDayOfMonth(1);
 
-        return new CaseBuilder()
-                .when(note.createdAt.goe(startOfThisMonth).and(note.createdAt.lt(endOfThisMonth)))
-                .then(1L)
-                .otherwise(0L)
-                .sum();
+        LocalDateTime startOfThisMonth = firstDayOfThisMonth.atStartOfDay();
+        LocalDateTime endOfThisMonth = firstDayOfThisMonth.plusMonths(1).atStartOfDay();
+
+        return note.createdAt.goe(startOfThisMonth).and(note.createdAt.lt(endOfThisMonth));
     }
 
-    private NumberExpression<Long> countLastMonthNotes(LocalDate today) {
-        LocalDate lastMonthOfToday = today.minusMonths(1);
+    private BooleanExpression isCreatedLastMonth(LocalDate today) {
+        LocalDate firstDayOfThisMonth = today.withDayOfMonth(1);
+        LocalDate firstDayOfLastMonth = firstDayOfThisMonth.minusMonths(1);
 
-        LocalDateTime startOfLastMonth = lastMonthOfToday.withDayOfMonth(1).atStartOfDay();
-        LocalDateTime endOfLastMonth = lastMonthOfToday.plusDays(1).atStartOfDay();
-        if (today.getDayOfMonth() == today.lengthOfMonth()) {
-            endOfLastMonth =
-                    lastMonthOfToday.with(TemporalAdjusters.lastDayOfMonth()).atStartOfDay();
-        }
+        LocalDateTime startOfLastMonth = firstDayOfLastMonth.atStartOfDay();
+        LocalDateTime endOfLastMonth = firstDayOfThisMonth.atStartOfDay();
 
-        return new CaseBuilder()
-                .when(note.createdAt.goe(startOfLastMonth).and(note.createdAt.lt(endOfLastMonth)))
-                .then(1L)
-                .otherwise(0L)
-                .sum();
+        return note.createdAt.goe(startOfLastMonth).and(note.createdAt.lt(endOfLastMonth));
     }
 
     private BooleanExpression isCreatedLatest() {