Skip to content

Commit c179d70

Browse files
committed
fix: 식단 등록 시 이미지 업로드 로직 수정
1 parent 8c2bab7 commit c179d70

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/main/java/com/tnt/application/pt/PtService.java

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.tnt.application.pt;
22

3+
import static com.tnt.common.error.model.ErrorMessage.DIET_DUPLICATE_TIME;
34
import static com.tnt.common.error.model.ErrorMessage.PT_LESSON_DUPLICATE_TIME;
45
import static com.tnt.common.error.model.ErrorMessage.PT_LESSON_MORE_THAN_ONE_A_DAY;
56
import static com.tnt.common.error.model.ErrorMessage.PT_LESSON_NOT_FOUND;
@@ -293,6 +294,16 @@ public GetTraineeDailyRecordsResponse getDailyRecords(Long memberId, LocalDate d
293294
return new GetTraineeDailyRecordsResponse(date, ptInfo, dietRecords);
294295
}
295296

297+
public Long validateDuplicationDiet(Long memberId, LocalDateTime date) {
298+
Trainee trainee = traineeService.getTraineeWithMemberId(memberId);
299+
300+
if (dietService.isDietExistWithTraineeIdAndDate(trainee.getId(), date)) {
301+
throw new ConflictException(DIET_DUPLICATE_TIME);
302+
}
303+
304+
return trainee.getId();
305+
}
306+
296307
public boolean isPtTrainerTraineeExistWithTrainerId(Long trainerId) {
297308
return ptTrainerTraineeRepository.existsByTrainerIdAndDeletedAtIsNull(trainerId);
298309
}

src/main/java/com/tnt/presentation/trainee/TraineeController.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.tnt.presentation.trainee;
22

33
import static com.tnt.common.constant.ImageConstant.DIET_S3_IMAGE_PATH;
4-
import static com.tnt.common.error.model.ErrorMessage.DIET_DUPLICATE_TIME;
54
import static org.springframework.http.HttpStatus.CREATED;
65
import static org.springframework.http.HttpStatus.OK;
76
import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
@@ -24,8 +23,6 @@
2423
import com.tnt.application.s3.S3Service;
2524
import com.tnt.application.trainee.DietService;
2625
import com.tnt.application.trainee.TraineeService;
27-
import com.tnt.common.error.exception.ConflictException;
28-
import com.tnt.domain.trainee.Trainee;
2926
import com.tnt.dto.trainee.request.ConnectWithTrainerRequest;
3027
import com.tnt.dto.trainee.request.CreateDietRequest;
3128
import com.tnt.dto.trainee.response.ConnectWithTrainerResponse;
@@ -72,15 +69,11 @@ public ConnectWithTrainerResponse connectWithTrainer(@AuthMember Long memberId,
7269
public CreateDietResponse createDiet(@AuthMember Long memberId,
7370
@RequestPart("request") @Valid CreateDietRequest request,
7471
@RequestPart(value = "dietImage", required = false) MultipartFile dietImage) {
75-
Trainee trainee = traineeService.getTraineeWithMemberId(memberId);
76-
77-
if (dietService.isDietExistWithTraineeIdAndDate(trainee.getId(), request.date())) {
78-
throw new ConflictException(DIET_DUPLICATE_TIME);
79-
}
72+
Long traineeId = ptService.validateDuplicationDiet(memberId, request.date());
8073

8174
String dietImageUrl = s3Service.uploadImage(null, DIET_S3_IMAGE_PATH, dietImage);
8275

83-
return ptService.createDiet(memberId, request, dietImageUrl);
76+
return ptService.createDiet(traineeId, request, dietImageUrl);
8477
}
8578

8679
@Operation(summary = "특정 식단 조회 API")

0 commit comments

Comments
 (0)