Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

건강차트 데이터 조회 로직 개선 #96

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

건강차트 데이터 조회 로직 개선 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ...in/java/com/coniverse/dangjang/domain/healthmetric/repository/HealthMetricRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,17 @@ public interface HealthMetricRepository extends JpaRepository<HealthMetric, Heal
*/
@Query("SELECT count(h) FROM HealthMetric h WHERE h.healthMetricId.oauthId = ?1 AND h.groupCode = ?2 AND h.healthMetricId.createdAt = ?3")
int findHealthMetricCountByGroupCode(String oauthId, GroupCode groupCode, LocalDate createdAt);

/**
* 기간 내 사용자의 모든 건강지표 조회
*
* @param oauthId 사용자 ID
* @param startDate 시작일
* @param endDate 종료일
* @return HealthMetric
* @since 1.0.0
*/
@Query("SELECT h FROM HealthMetric h WHERE h.healthMetricId.oauthId = ?1 AND h.healthMetricId.createdAt between ?2 and ?3")
List<HealthMetric> findAllHealthMetricByDate(String oauthId, LocalDate startDate, LocalDate endDate);

}
59 changes: 25 additions & 34 deletions ...va/com/coniverse/dangjang/domain/healthmetric/service/HealthMetricChartSearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,33 +46,30 @@ public class HealthMetricChartSearchService {
*/

public HealthMetricChartResponse findHealthMetricChart(String oauthId, LocalDate startDate, LocalDate endDate) {
List<BloodSugarMinMax> bloodSugarMinMaxes = findBloodSugarMinMaxes(oauthId, startDate, endDate);
List<HealthMetricChartData> weights = findWeights(oauthId, startDate, endDate);
List<HealthMetricChartData> stepCounts = findStepCounts(oauthId, startDate, endDate);
List<HealthMetric> healthMetrics = healthMetricSearchService.findAllHealthMetricByDate(oauthId, startDate, endDate);
List<BloodSugarMinMax> bloodSugarMinMaxes = findBloodSugarMinMaxes(healthMetrics);
List<HealthMetricChartData> weights = findWeights(healthMetrics);
List<HealthMetricChartData> stepCounts = findStepCounts(healthMetrics);
List<HealthMetricChartData> exerciseCalories = findExerciseCalories(oauthId, startDate, endDate);

return new HealthMetricChartResponse(startDate, endDate, bloodSugarMinMaxes, weights, stepCounts, exerciseCalories);
}

/**
* 기한 내의 혈당 최저,최고 값을 조회한다.
* 일정 기간 내의 혈당 최저,최고 값을 조회한다.
*
* @param startDate 조회 시작 날짜
* @param endDate 조회 종료 날짜
* @param oauthId 유저 아이디
* @param healthMetrics 일정 기간 내, 유저의 모든 건강지표
* @return List<BloodSugarMinMax> 혈당 최저,최고 값 리스트
* @since 1.0.0
*/

private List<BloodSugarMinMax> findBloodSugarMinMaxes(String oauthId, LocalDate startDate, LocalDate endDate) {
private List<BloodSugarMinMax> findBloodSugarMinMaxes(List<HealthMetric> healthMetrics) {
List<BloodSugarMinMax> bloodSugarMinMaxes = new ArrayList<>();
List<HealthMetric> bloodSugarHealthMetric = healthMetricSearchService.findWeeklyHealthMetricByGroupCode(oauthId, GroupCode.BLOOD_SUGAR,
startDate, endDate);
Map<LocalDate, List<HealthMetric>> bloodSugarMapByDate = bloodSugarHealthMetric.stream().collect(Collectors.groupingBy(HealthMetric::getCreatedAt));
bloodSugarMapByDate.forEach((date, healthMetrics) -> {
int minBloodSugar = healthMetrics.stream().mapToInt(healthMetric -> Integer.parseInt(healthMetric.getUnit())).min().orElseThrow(
healthMetrics = healthMetrics.stream().filter(healthMetric -> GroupCode.BLOOD_SUGAR.equals(healthMetric.getGroupCode())).toList();
Map<LocalDate, List<HealthMetric>> bloodSugarMapByDate = healthMetrics.stream().collect(Collectors.groupingBy(HealthMetric::getCreatedAt));
bloodSugarMapByDate.forEach((date, dailyHealthMetrics) -> {
int minBloodSugar = dailyHealthMetrics.stream().mapToInt(healthMetric -> Integer.parseInt(healthMetric.getUnit())).min().orElseThrow(
HealthMetricNotFoundException::new);
int maxBloodSugar = healthMetrics.stream().mapToInt(healthMetric -> Integer.parseInt(healthMetric.getUnit())).max().orElseThrow(
int maxBloodSugar = dailyHealthMetrics.stream().mapToInt(healthMetric -> Integer.parseInt(healthMetric.getUnit())).max().orElseThrow(
HealthMetricNotFoundException::new);
bloodSugarMinMaxes.add(new BloodSugarMinMax(date, minBloodSugar, maxBloodSugar));

Expand All @@ -81,39 +78,33 @@ private List<BloodSugarMinMax> findBloodSugarMinMaxes(String oauthId, LocalDate
}

/**
* 기한 내의 체중 값을 조회한다.
* 일정 기간 내의 체중 값을 조회한다.
*
* @param startDate 조회 시작 날짜
* @param endDate 조회 종료 날짜
* @param oauthId 유저 아이디
* @param healthMetrics 일정 기간 내, 유저의 모든 건강지표
* @return List<HealthMetricChartData> 체중 값 리스트
* @since 1.0.0
*/
private List<HealthMetricChartData> findWeights(String oauthId, LocalDate startDate, LocalDate endDate) {
private List<HealthMetricChartData> findWeights(List<HealthMetric> healthMetrics) {
List<HealthMetricChartData> weights = new ArrayList<>();
List<HealthMetric> healthMetrics = healthMetricSearchService.findWeeklyHealthMetricByGroupCode(oauthId, GroupCode.WEIGHT, startDate, endDate);
healthMetrics.forEach(healthMetric ->
weights.add(new HealthMetricChartData(healthMetric.getCreatedAt(), Integer.parseInt(healthMetric.getUnit())))
);
healthMetrics.stream().filter(healthMetric -> CommonCode.MEASUREMENT.equals(healthMetric.getType()))
.forEach(healthMetric -> weights.add(new HealthMetricChartData(healthMetric.getCreatedAt(), Integer.parseInt(healthMetric.getUnit()))));

return weights;
}

/**
* 기한 내의 걸음수를 조회한다.
* 일정 기간 내의 걸음수를 조회한다.
*
* @param startDate 조회 시작 날짜
* @param endDate 조회 종료 날짜
* @param oauthId 유저 아이디
* @param healthMetrics 일정 기간 내, 유저의 모든 건강지표
* @return List<HealthMetricChartData> 걸음수 리스트
* @since 1.0.0
*/
private List<HealthMetricChartData> findStepCounts(String oauthId, LocalDate startDate, LocalDate endDate) {
private List<HealthMetricChartData> findStepCounts(List<HealthMetric> healthMetrics) {
List<HealthMetricChartData> stepCounts = new ArrayList<>();

List<HealthMetric> healthMetrics = healthMetricSearchService.findWeeklyHealthMetricById(oauthId, CommonCode.STEP_COUNT, startDate, endDate);
healthMetrics.forEach(healthMetric ->
stepCounts.add(new HealthMetricChartData(healthMetric.getCreatedAt(), Integer.parseInt(healthMetric.getUnit())))
);
healthMetrics.stream().filter(healthMetric -> CommonCode.STEP_COUNT.equals(healthMetric.getType()))
.forEach(healthMetric ->
stepCounts.add(new HealthMetricChartData(healthMetric.getCreatedAt(), Integer.parseInt(healthMetric.getUnit())))
);
return stepCounts;
}

Expand Down
12 changes: 12 additions & 0 deletions ...in/java/com/coniverse/dangjang/domain/healthmetric/service/HealthMetricSearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,16 @@ public HealthMetricLastDateResponse findHealthMetricLastDate(String oauthId) {
public int findByGroupCode(String oauthId, GroupCode groupCode, LocalDate createdAt) {
return healthMetricRepository.findHealthMetricCountByGroupCode(oauthId, groupCode, createdAt);
}

/**
* 일정 기간 내 유저의 모든 건강 지표를 조회한다.
*
* @param oauthId 유저 PK
* @return HealthMetric 건강 지표
* @since 1.0.0
*/
public List<HealthMetric> findAllHealthMetricByDate(String oauthId, LocalDate startDate, LocalDate endDate) {
return healthMetricRepository.findAllHealthMetricByDate(oauthId, startDate, endDate);
}

}
Loading