Merge pull request #23 from Central-MakeUs/feature/apple-login-split

Feature/apple login split

Author: huggywuggy1289

src/main/java/com/nitrogen/domain/expense/controller/ExpenseReportController.java

@@ -7,7 +7,6 @@
 import com.nitrogen.domain.expense.dto.report.summary.WeeklyReportResponse;
 import com.nitrogen.domain.expense.repository.ExpenseRepository;
 import com.nitrogen.domain.expense.service.inquiry.ExpenseInquiryService;
-import com.nitrogen.domain.expense.service.record.ExpenseRecordService;
 import com.nitrogen.domain.expense.service.report.DailyRetrospectReportService;
 import com.nitrogen.domain.expense.service.report.WeeklyRecordService;
 import com.nitrogen.domain.expense.service.report.WeeklyDetailRecordService;
@@ -56,8 +55,9 @@ public ApiResponse<SummaryRecordResponse> getSummaryRecord(@AuthenticationPrinci
 
         // 월별 리포트는 다음달 1일에 오픈
         boolean isOpened = false;
+        String yearTitle = String.valueOf(nowDate.getYear());
         String monthTitle = String.format("%d년 %d월 소비 현황", nowDate.getYear(), nowDate.getMonthValue());
-        MonthlyReportSummaryResponse monthlyReport = new MonthlyReportSummaryResponse(monthTitle, monthlyTotalAmount, isOpened);
+        MonthlyReportSummaryResponse monthlyReport = new MonthlyReportSummaryResponse(yearTitle, monthTitle, monthlyTotalAmount, isOpened);
 
         List<WeeklyReportResponse> weeklyReports = new ArrayList<>();
 

src/main/java/com/nitrogen/domain/expense/dto/report/summary/MonthlyReportArrivalResponse.java

@@ -3,6 +3,5 @@
 public record MonthlyReportArrivalResponse(
         int year,
         int month,
-        long totalAmount,
         boolean isChecked
 ) {}

src/main/java/com/nitrogen/domain/expense/dto/report/summary/MonthlyReportSummaryResponse.java

@@ -1,6 +1,7 @@
 package com.nitrogen.domain.expense.dto.report.summary;
 
 public record MonthlyReportSummaryResponse(
+        String year,
         String month,
         long totalAmount,
         boolean isOpened // 월별 리포트 오픈 여부

src/main/java/com/nitrogen/domain/expense/service/inquiry/ExpenseInquiryService.java

@@ -132,6 +132,7 @@ public List<MonthlyReportSummaryResponse> getMonthlyTotalList(Long userId) {
                     boolean isOpened = !now.isBefore(reportOpenDate); // now.isAfter(reportOpenDate) || now.isEqual(reportOpenDate);
 
                     return new MonthlyReportSummaryResponse(
+                            String.valueOf(startOfMonth.getYear() % 100), // 2026 -> 26 변환
                             String.valueOf(startOfMonth.getMonthValue()),
                             totalAmount,
                             isOpened

src/main/java/com/nitrogen/domain/expense/service/report/WeeklyRecordService.java

@@ -58,7 +58,6 @@ public List<MonthlyReportArrivalResponse> getMonthlyReportArrivals(Long userId)
                     return new MonthlyReportArrivalResponse(
                             startOfMonth.getYear(),
                             startOfMonth.getMonthValue(),
-                            totalAmount,
                             isChecked
                     );
                 })