Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.ntropy.bff.dto.dashboard.response.DashboardHoursResponse;
import com.ntropy.bff.dto.dashboard.response.DashboardIncomeResponse;
import com.ntropy.bff.dto.dashboard.response.DashboardResponse;
import com.ntropy.bff.dto.dashboard.response.DashboardSettlementResponse;
import com.ntropy.bff.dto.dashboard.response.JobRecommendationsResponse;
import com.ntropy.bff.security.AuthenticatedUserIdResolver;
import com.ntropy.common.client.CalendarQueryClient;
Expand All @@ -34,12 +35,6 @@
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;

/**
* 홈 대시보드 조합 엔드포인트.
* realWage(실질 시급)는 계산 공식이 아직 없어서 뺐다.
* 잡별 추천 근무시간(ROI 계산)은 장아연님이 만든 계약(RecommendedWorkHoursQueryClient)을
* 가져다 /api/dashboard/recommendation-hours로 노출만 한다 — 계산 로직은 work-service에 있다.
*/
@Api(tags = "대시보드")
@RestController
@RequestMapping("/api/dashboard")
Expand Down Expand Up @@ -79,6 +74,7 @@ public ApiResponse<DashboardResponse> getDashboard(@ApiParam(hidden = true) Auth
user.name(),
new DashboardHoursResponse(hours.getActualHours(), hours.getPlannedHours()),
new DashboardIncomeResponse(incomeAnalysis.getTotalIncome(), hours.getTargetAmount()),
DashboardSettlementResponse.from(incomeAnalysis.getEarnedDepositComparisons()),
fatigueScore
);
return ApiResponse.success(response);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
import lombok.AllArgsConstructor;
import lombok.Getter;

/**
* 홈 대시보드 응답. realWage(실질 시급)는 계산 공식이 아직 정의되지 않아 제외한다.
* jobRecommendations(ROI 추천)는 AI-service의 별도 엔드포인트(/api/dashboard/recommendation-hours) 몫이라 여기 없다.
*/
@Getter
@AllArgsConstructor
public class DashboardResponse {

private String greetingName;
private DashboardHoursResponse goalHours;
private DashboardIncomeResponse goalIncome;
private DashboardSettlementResponse settlement;
private Integer fatigueScore;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.ntropy.bff.dto.dashboard.response;

import java.util.List;

import com.ntropy.common.dto.work.summary.EarnedDepositComparison;

import lombok.AllArgsConstructor;
import lombok.Getter;

/**
* 이번 달 발생소득 대비 실입금소득.
* earned는 확정 근무일지 기준 발생소득, deposited는 매칭된 입금 거래 기준 실입금소득이다.
*/
@Getter
@AllArgsConstructor
public class DashboardSettlementResponse {

private Long deposited;
private Long earned;

public static DashboardSettlementResponse from(List<EarnedDepositComparison> comparisons) {
if (comparisons == null || comparisons.isEmpty()) {
return new DashboardSettlementResponse(0L, 0L);
}
long deposited = comparisons.stream()
.mapToLong(comparison -> nullToZero(comparison.getDepositedIncome()))
.sum();
long earned = comparisons.stream()
.mapToLong(comparison -> nullToZero(comparison.getEarnedIncome()))
.sum();
return new DashboardSettlementResponse(deposited, earned);
}

private static long nullToZero(Long value) {
return value == null ? 0L : value;
}
}
Loading