From 737b6ae23c329f41ed38617c25a55c308ad3633d Mon Sep 17 00:00:00 2001 From: dunowljj Date: Thu, 23 Nov 2023 23:25:33 +0900 Subject: [PATCH] =?UTF-8?q?Feat=20:=20DIG-111=20=EC=9D=B8=EB=B0=94?= =?UTF-8?q?=EB=94=94=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20=20routine=20id?= =?UTF-8?q?=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ogjg/daitgym/domain/Inbody.java | 4 ++++ src/main/java/com/ogjg/daitgym/user/service/UserService.java | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ogjg/daitgym/domain/Inbody.java b/src/main/java/com/ogjg/daitgym/domain/Inbody.java index c7939dae..11c3ba87 100644 --- a/src/main/java/com/ogjg/daitgym/domain/Inbody.java +++ b/src/main/java/com/ogjg/daitgym/domain/Inbody.java @@ -52,4 +52,8 @@ public Inbody(Long id, User user, int score, double skeletalMuscleMass, double b this.measureAt = measureAt; this.routine = routine; } + + public void addRoutineId(Routine routine) { + this.routine = routine; + } } diff --git a/src/main/java/com/ogjg/daitgym/user/service/UserService.java b/src/main/java/com/ogjg/daitgym/user/service/UserService.java index f754fb28..588104c8 100644 --- a/src/main/java/com/ogjg/daitgym/user/service/UserService.java +++ b/src/main/java/com/ogjg/daitgym/user/service/UserService.java @@ -4,7 +4,6 @@ import com.ogjg.daitgym.approval.repository.AwardRepository; import com.ogjg.daitgym.approval.repository.CertificationRepository; import com.ogjg.daitgym.comment.feedExerciseJournal.exception.WrongApproach; -import com.ogjg.daitgym.comment.routine.exception.NotFoundRoutine; import com.ogjg.daitgym.common.exception.user.AlreadyExistNickname; import com.ogjg.daitgym.common.exception.user.AlreadyProceedingApproval; import com.ogjg.daitgym.common.exception.user.EmptyTrainerApplyException; @@ -219,7 +218,7 @@ private boolean isFilesListNull(List imgFiles) { public void registerInbody(String loginEmail, RegisterInbodyRequest request) { User user = userHelper.findUserByEmail(loginEmail); Routine routine = routineRepository.findById(request.getRoutineId()) - .orElseThrow(NotFoundRoutine::new); + .orElse(null); Inbody inbody = Inbody.builder() .user(user) @@ -229,9 +228,9 @@ public void registerInbody(String loginEmail, RegisterInbodyRequest request) { .bodyFatRatio(request.getBodyFatRatio()) .weight(request.getWeight()) .basalMetabolicRate(request.getBasalMetabolicRate()) - .routine(routine) .build(); + if (routine != null) inbody.addRoutineId(routine); inbodyRepository.save(inbody); }