Skip to content

Commit

Permalink
🐛 fix: 현재 시간 의존성 삭제 (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
@synoti21
synoti21 committed Nov 16, 2023
1 parent d00676e commit 2997000
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions src/main/java/com/diareat/diareat/food/service/FoodService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ public ResponseNutritionSumByDateDto getNutritionSumByDate(Long userId, LocalDat

@Transactional(readOnly = true)
// 유저의 최근 7일간의 영양성분별 총합 조회 (섭취영양소/기준영양소 및 비율까지 계산해서 반환, dto 구체적 협의 필요)
public ResponseNutritionSumByDateDto getNutritionSumByWeek(Long userId) {
public ResponseNutritionSumByDateDto getNutritionSumByWeek(Long userId, int year, int month, int day) {
validateUser(userId);
LocalDate endDate = LocalDate.now();
LocalDate endDate = LocalDate.of(year, month, day);
Sort sort = Sort.by(Sort.Direction.DESC, MessageUtil.TIME_STAMP);
List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate, sort);

Expand All @@ -141,9 +141,9 @@ public ResponseNutritionSumByDateDto getNutritionSumByWeek(Long userId) {

@Transactional(readOnly = true)
// 유저의 최근 1개월간의 영양성분별 총합 조회 (섭취영양소/기준영양소 및 비율까지 계산해서 반환, dto 구체적 협의 필요)
public ResponseNutritionSumByDateDto getNutritionSumByMonth(Long userId) {
public ResponseNutritionSumByDateDto getNutritionSumByMonth(Long userId, int year, int month, int day) {
validateUser(userId);
LocalDate endDate = LocalDate.now();
LocalDate endDate = LocalDate.of(year, month, day);
Sort sort = Sort.by(Sort.Direction.DESC, MessageUtil.TIME_STAMP);
List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusMonths(1), endDate, sort);

Expand All @@ -152,9 +152,9 @@ public ResponseNutritionSumByDateDto getNutritionSumByMonth(Long userId) {

@Transactional(readOnly = true)
// 유저의 최근 7일간의 Best 3 음식 조회 (dto 구체적 협의 필요)
public ResponseFoodRankDto getBestFoodByWeek(Long userId) {
public ResponseFoodRankDto getBestFoodByWeek(Long userId, int year, int month, int day) {
validateUser(userId);
LocalDate endDate = LocalDate.now();
LocalDate endDate = LocalDate.of(year, month, day);
Sort sort = Sort.by(Sort.Direction.DESC, MessageUtil.TIME_STAMP);
List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate, sort);

Expand All @@ -175,9 +175,9 @@ public ResponseFoodRankDto getBestFoodByWeek(Long userId) {

@Transactional(readOnly = true)
// 유저의 최근 7일간의 Worst 3 음식 조회 (dto 구체적 협의 필요)
public ResponseFoodRankDto getWorstFoodByWeek(Long userId) {
public ResponseFoodRankDto getWorstFoodByWeek(Long userId, int year, int month, int day) {
validateUser(userId);
LocalDate endDate = LocalDate.now();
LocalDate endDate = LocalDate.of(year, month, day);
Sort sort = Sort.by(Sort.Direction.DESC, MessageUtil.TIME_STAMP);
List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate, sort);

Expand All @@ -202,7 +202,7 @@ public ResponseFoodRankDto getWorstFoodByWeek(Long userId) {

//유저의 식습관 점수 및 Best 3와 Worst 3 계산
@Transactional(readOnly = true)
public ResponseScoreBestWorstDto getScoreOfUserWithBestAndWorstFoods(Long userId){
public ResponseScoreBestWorstDto getScoreOfUserWithBestAndWorstFoods(Long userId, int year, int month, int day){
validateUser(userId); //유저 객체 검증
double totalScore = 0.0;
double kcalScore = 0.0;
Expand All @@ -212,7 +212,7 @@ public ResponseScoreBestWorstDto getScoreOfUserWithBestAndWorstFoods(Long userId

User targetUser = userRepository.getReferenceById(userId); //검증된 id로 유저 객체 불러오기

ResponseRankUserDto scoresOfUser = calculateUserScoreThisWeek(targetUser, LocalDate.now().with(DayOfWeek.MONDAY), LocalDate.now());
ResponseRankUserDto scoresOfUser = calculateUserScoreThisWeek(targetUser, LocalDate.of(year, month, day).with(DayOfWeek.MONDAY), LocalDate.of(year, month, day));

totalScore = Math.round((scoresOfUser.getTotalScore() * 100.0))/ 100.0;
kcalScore = Math.round((scoresOfUser.getCalorieScore() * 100.0)) / 100.0;
Expand All @@ -222,8 +222,8 @@ public ResponseScoreBestWorstDto getScoreOfUserWithBestAndWorstFoods(Long userId


//Dto의 형식에 맞게 Best3와 Worst3 음식 계산
List<ResponseSimpleFoodDto> simpleBestFoodList = getBestFoodByWeek(userId).getRankFoodList();
List<ResponseSimpleFoodDto> simpleWorstFoodList = getWorstFoodByWeek(userId).getRankFoodList();
List<ResponseSimpleFoodDto> simpleBestFoodList = getBestFoodByWeek(userId, year, month, day).getRankFoodList();
List<ResponseSimpleFoodDto> simpleWorstFoodList = getWorstFoodByWeek(userId, year, month, day).getRankFoodList();

return ResponseScoreBestWorstDto.of(kcalScore, carbohydrateScore, proteinScore, fatScore, totalScore, simpleBestFoodList, simpleWorstFoodList);
}
Expand All @@ -232,15 +232,15 @@ public ResponseScoreBestWorstDto getScoreOfUserWithBestAndWorstFoods(Long userId

// 유저의 일기 분석 그래프 데이터 및 식습관 totalScore 조회
@Transactional(readOnly = true)
public ResponseAnalysisDto getAnalysisOfUser(Long userId){
public ResponseAnalysisDto getAnalysisOfUser(Long userId, int year, int month, int day){
validateUser(userId);
User user = userRepository.getReferenceById(userId);

//최근 1주간 유저가 먹은 음식들의 날짜별 HashMap
HashMap<LocalDate, List<BaseNutrition>> nutritionSumOfUserByWeek = getNutritionSumByDateMap(userId, LocalDate.now().minusWeeks(1), LocalDate.now());
HashMap<LocalDate, List<BaseNutrition>> nutritionSumOfUserByMonth = getNutritionSumByDateMap(userId, LocalDate.now().minusWeeks(3).with(DayOfWeek.MONDAY), LocalDate.now());
HashMap<LocalDate, List<BaseNutrition>> nutritionSumOfUserByWeek = getNutritionSumByDateMap(userId, LocalDate.of(year,month,day).minusWeeks(1), LocalDate.of(year, month, day));
HashMap<LocalDate, List<BaseNutrition>> nutritionSumOfUserByMonth = getNutritionSumByDateMap(userId, LocalDate.of(year,month,day).minusWeeks(3).with(DayOfWeek.MONDAY), LocalDate.of(year, month ,day));

double totalWeekScore = calculateUserScoreThisWeek(user, LocalDate.now().with(DayOfWeek.MONDAY), LocalDate.now()).getTotalScore();
double totalWeekScore = calculateUserScoreThisWeek(user, LocalDate.of(year, month, day).with(DayOfWeek.MONDAY), LocalDate.of(year, month, day)).getTotalScore();


//날짜 기준으로 정렬 (가장 최근 날짜가 맨 앞으로 오도록)
Expand Down Expand Up @@ -299,17 +299,17 @@ public ResponseAnalysisDto getAnalysisOfUser(Long userId){
// @Cacheable(value = "ResponseRankUserDto", key = "#userId", cacheManager = "diareatCacheManager")
@Transactional(readOnly = true)
// 유저의 식습관 점수를 기반으로 한 주간 랭킹 조회
public List<ResponseRankUserDto> getUserRankByWeek(Long userId) {
public List<ResponseRankUserDto> getUserRankByWeek(Long userId, int year, int month, int day) {
List<ResponseRankUserDto> rankUserDtos = new ArrayList<>();
List<User> users = followRepository.findAllByFromUser(userId); // 유저의 팔로우 유저 명단
rankUserDtos.add(calculateUserScoreThisWeek(getUserById(userId), LocalDate.now().with(DayOfWeek.MONDAY), LocalDate.now()));
rankUserDtos.add(calculateUserScoreThisWeek(getUserById(userId), LocalDate.of(year, month, day).with(DayOfWeek.MONDAY), LocalDate.of(year, month ,day)));
if (users.isEmpty()) { // 팔로우한 유저가 없는 경우 본인의 점수 및 정보만 반환함
return rankUserDtos;
}

// 팔로우한 유저들의 점수를 계산하여 rankUserDtos에 추가
for (User user : users) {
ResponseRankUserDto userDto = calculateUserScoreThisWeek(user, LocalDate.now().with(DayOfWeek.MONDAY), LocalDate.now());
ResponseRankUserDto userDto = calculateUserScoreThisWeek(user, LocalDate.of(year, month, day).with(DayOfWeek.MONDAY), LocalDate.of(year, month, day));
rankUserDtos.add(userDto);
}

Expand Down

0 comments on commit 2997000

Please sign in to comment.