운동/식단 API 수정

src/main/java/com/tobe/healthy/common/CustomPaging.java

@@ -1,10 +1,12 @@
 package com.tobe.healthy.common;
 
 import lombok.Data;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@ToString
 public class CustomPaging<T> {
 
     private List<T> content;

src/main/java/com/tobe/healthy/config/OAuthProperties.java

@@ -1,18 +1,21 @@
 package com.tobe.healthy.config;
 
 import lombok.Data;
+import lombok.ToString;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @Component
 @ConfigurationProperties("oauth")
 @Data
+@ToString
 public class OAuthProperties {
 	private OAuthServiceProperties kakao;
 	private OAuthServiceProperties naver;
 	private OAuthServiceProperties google;
 
 	@Data
+	@ToString
 	public static class OAuthServiceProperties {
 		private String grantType;
 		private String clientId;

src/main/java/com/tobe/healthy/config/error/OAuthError.java

@@ -2,11 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 public class OAuthError {
 
 	@Data
+    @ToString
 	public static class KakaoError {
 		@JsonProperty("error")
 		private String error;
@@ -19,12 +22,14 @@ public static class KakaoError {
 	}
 
 	@Data
+    @ToString
 	public static class NaverError {
 		private String resultcode;
 		private String message;
 	}
 
 	@Data
+    @ToString
 	public static class GoogleError {
 		@JsonProperty("error")
 		private String error;

src/main/java/com/tobe/healthy/config/security/CustomMemberDetails.java

@@ -3,6 +3,7 @@
 import com.tobe.healthy.member.domain.entity.Member;
 import com.tobe.healthy.member.domain.entity.MemberType;
 import lombok.Data;
+import lombok.ToString;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -15,6 +16,7 @@
 import static com.tobe.healthy.member.domain.entity.MemberType.TRAINER;
 
 @Data
+@ToString
 public class CustomMemberDetails implements UserDetails {
 
 	private Member member;

src/main/java/com/tobe/healthy/course/domain/dto/CourseDto.java

@@ -1,15 +1,13 @@
 package com.tobe.healthy.course.domain.dto;
 
 import com.tobe.healthy.course.domain.entity.Course;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
 
 @Data
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/tobe/healthy/course/domain/dto/CourseHistoryDto.java

@@ -5,11 +5,13 @@
 import com.tobe.healthy.point.domain.entity.Calculation;
 import lombok.Builder;
 import lombok.Data;
+import lombok.ToString;
 
 import java.time.LocalDateTime;
 
 
 @Data
+@ToString
 @Builder
 public class CourseHistoryDto {
 

src/main/java/com/tobe/healthy/course/domain/dto/in/CourseAddCommand.java

@@ -5,8 +5,10 @@
 import jakarta.validation.constraints.Positive;
 import lombok.Builder;
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 @Builder
 public class CourseAddCommand {
 

src/main/java/com/tobe/healthy/course/domain/dto/in/CourseUpdateCommand.java

@@ -8,8 +8,10 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 @Builder
 @AllArgsConstructor
 public class CourseUpdateCommand {

src/main/java/com/tobe/healthy/course/domain/dto/out/CourseGetResult.java

@@ -4,10 +4,12 @@
 import com.tobe.healthy.course.domain.dto.CourseHistoryDto;
 import lombok.Builder;
 import lombok.Data;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@ToString
 @Builder
 public class CourseGetResult {
 

src/main/java/com/tobe/healthy/diet/application/DietService.java

@@ -3,9 +3,10 @@
 import com.tobe.healthy.common.CustomPaging;
 import com.tobe.healthy.common.redis.RedisService;
 import com.tobe.healthy.config.error.CustomException;
+import com.tobe.healthy.diet.domain.dto.DietDetailDto;
 import com.tobe.healthy.diet.domain.dto.DietDto;
 import com.tobe.healthy.diet.domain.dto.DietFileDto;
-import com.tobe.healthy.diet.domain.dto.in.DietAddCommand;
+import com.tobe.healthy.diet.domain.dto.in.DietAddCommandAtHome;
 import com.tobe.healthy.diet.domain.dto.in.DietUpdateCommand;
 import com.tobe.healthy.diet.domain.entity.*;
 import com.tobe.healthy.diet.repository.DietFileRepository;
@@ -23,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.Set;
@@ -49,8 +49,8 @@ public class DietService {
     private final MemberRepository memberRepository;
     private final RedisService redisService;
 
-    public DietDto getDietCreatedAtToday(Long memberId) {
-        Diet diet = dietRepository.getDietCreatedAtToday(memberId);
+    public DietDto getTodayDiet(Long memberId) {
+        Diet diet = dietRepository.getTodayDiet(memberId);
         if (diet == null) return new DietDto();
         List<Long> ids = List.of(diet.getDietId());
         return setDietFile(DietDto.from(diet), ids);
@@ -83,12 +83,12 @@ public void deleteLikeDiet(Member member, Long dietId) {
         diet.updateLikeCnt(dietLikeRepository.getLikeCnt(diet.getDietId()));
     }
 
-    public DietDto addDiet(Member member, DietAddCommand command) {
+    public DietDto addDietAtHome(Member member, DietAddCommandAtHome command) {
         Long memberId = member.getId();
         DietType requestType = command.getType();
         String requestFileUrl = command.getFile();
 
-        Diet diet = dietRepository.findTop1ByCreateAtToday(memberId);
+        Diet diet = dietRepository.getTodayDiet(memberId);
 
         TrainerMemberMapping mapping = mappingRepository.findTop1ByMemberIdOrderByCreatedAtDesc(memberId).orElse(null);
         Member trainer = mapping == null ? null : mapping.getTrainer();
@@ -106,8 +106,20 @@ public DietDto addDiet(Member member, DietAddCommand command) {
             redisService.deleteValues(TEMP_FILE_URI.getDescription() + requestFileUrl);
         }
 
+        diet.changeEatDate(command.getEatDate());
         diet.changeFast(command.getType(), command.isFast());
-        return setDietFile(DietDto.from(diet), List.of(diet.getDietId()));
+        DietDto dietDto = setDietFile(DietDto.from(diet), List.of(diet.getDietId()));
+        if(isClean(dietDto)) diet.deleteDiet();
+        return dietDto;
+    }
+
+    private boolean isClean(DietDto dietDto) {
+        DietDetailDto breakfast = dietDto.getBreakfast();
+        DietDetailDto lunch = dietDto.getLunch();
+        DietDetailDto dinner = dietDto.getDinner();
+        return (!breakfast.getFast() && breakfast.getDietFile()==null)
+                && (!lunch.getFast() && lunch.getDietFile()==null)
+                && (!dinner.getFast() && dinner.getDietFile()==null);
     }
 
     public DietDto getDietDetail(Long dietId) {
@@ -141,13 +153,27 @@ public void deleteDiet(Member member, Long dietId) {
         diet.getDietFiles().forEach(file -> fileService.deleteDietFile(getFileName(file.getFileUrl())));
     }
 
+    public DietDto addDiet(Member member, DietUpdateCommand command) {
+        TrainerMemberMapping mapping = mappingRepository.findTop1ByMemberIdOrderByCreatedAtDesc(member.getId()).orElse(null);
+        Member trainer = mapping == null ? null : mapping.getTrainer();
+        Diet diet = dietRepository.save(Diet.create(member, trainer, command));
+        uploadDietFiles(diet, command);
+        return setDietFile(DietDto.from(diet), List.of(diet.getDietId()));
+    }
+
     public DietDto updateDiet(Member member, Long dietId, DietUpdateCommand command) {
         Diet diet = dietRepository.findByDietIdAndMemberIdAndDelYnFalse(dietId, member.getId())
                 .orElseThrow(() -> new CustomException(DIET_NOT_FOUND));
 
+        diet.changeEatDate(command.getEatDate());
         diet.changeFast(command);
         deleteOldFiles(diet, command);
+        uploadDietFiles(diet, command);
 
+        return setDietFile(DietDto.from(diet), List.of(diet.getDietId()));
+    }
+
+    private void uploadDietFiles(Diet diet, DietUpdateCommand command) {
         //아침 파일
         if (!command.isBreakfastFast() && !ObjectUtils.isEmpty(command.getBreakfastFile())){
             dietFileRepository.save(DietFiles.create(diet, command.getBreakfastFile(), BREAKFAST));
@@ -174,8 +200,6 @@ public DietDto updateDiet(Member member, Long dietId, DietUpdateCommand command)
             List<DietFiles> files = diet.getDietFiles().stream().filter(f -> DINNER.equals(f.getType())).toList();
             if(!ObjectUtils.isEmpty(files)) fileService.deleteDietFile(getFileName(files.get(0).getFileUrl()));
         }
-
-        return setDietFile(DietDto.from(diet), List.of(diet.getDietId()));
     }
 
     private void deleteOldFiles(Diet diet, DietUpdateCommand command) {
@@ -218,4 +242,9 @@ private String getFileName(String url) {
         return arr[arr.length - 1];
     }
 
+    public List<String> getDietUploadDays(Long memberId, String searchDate) {
+        List<String> days = dietRepository.getDietUploadDays(memberId, searchDate);
+        return ObjectUtils.isEmpty(days) ? null : days;
+    }
+
 }

src/main/java/com/tobe/healthy/diet/domain/dto/DietCommentDto.java

@@ -3,16 +3,14 @@
 import com.tobe.healthy.diet.domain.entity.DietComment;
 import com.tobe.healthy.member.domain.entity.MemberProfile;
 import com.tobe.healthy.workout.domain.dto.CommentMemberDto;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 
 @Data
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/tobe/healthy/diet/domain/dto/DietDetailDto.java

@@ -1,11 +1,9 @@
 package com.tobe.healthy.diet.domain.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Data
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/tobe/healthy/diet/domain/dto/DietDto.java

@@ -2,17 +2,15 @@
 
 import com.tobe.healthy.diet.domain.entity.Diet;
 import com.tobe.healthy.member.domain.dto.MemberDto;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import static com.tobe.healthy.diet.domain.entity.DietType.BREAKFAST;
 
 @Data
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -24,6 +22,7 @@ public class DietDto {
     private Long commentCnt;
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
+    private LocalDate eatDate;
 
     @Builder.Default
     private DietDetailDto breakfast = new DietDetailDto();
@@ -41,6 +40,7 @@ public static DietDto from(Diet diet) {
                 .commentCnt(diet.getCommentCnt())
                 .createdAt(diet.getCreatedAt())
                 .updatedAt(diet.getUpdatedAt())
+                .eatDate(diet.getEatDate())
                 .build();
         dto.breakfast.setFast(diet.getFastBreakfast());
         dto.lunch.setFast(diet.getFastLunch());

src/main/java/com/tobe/healthy/diet/domain/dto/DietFileDto.java

@@ -4,8 +4,10 @@
 import com.tobe.healthy.diet.domain.entity.DietType;
 import lombok.Builder;
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 @Builder
 public class DietFileDto {
 

src/main/java/com/tobe/healthy/diet/domain/dto/in/DietAddCommand.java → src/main/java/com/tobe/healthy/diet/domain/dto/in/DietAddCommandAtHome.java

@@ -2,14 +2,16 @@
 
 import com.tobe.healthy.diet.domain.entity.DietType;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
+import lombok.ToString;
 
 
 @Data
-public class DietAddCommand {
+@ToString
+public class DietAddCommandAtHome {
 
     private DietType type;
     private String file;
     private boolean fast;
+    private String eatDate;
 
 }

src/main/java/com/tobe/healthy/diet/domain/dto/in/DietCommentAddCommand.java

@@ -5,8 +5,10 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
+@ToString
 @AllArgsConstructor
 @NoArgsConstructor
 public class DietCommentAddCommand {