Skip to content

Commit 70b6985

Browse files
authored
Merge pull request #87 from Move-Log/develop
[FIX] 기록 생성 시 이미지 Optional 불가 문제 해결
2 parents a561dbb + 9e7c517 commit 70b6985

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

src/main/java/com/movelog/domain/record/application/RecordService.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,14 @@ public void createRecord(UserPrincipal userPrincipal, CreateRecordReq createReco
4747
// User user = userRepository.findById(5L).orElseThrow(UserNotFoundException::new);
4848
validateCreateRecordReq(createRecordReq);
4949

50-
String recordImgUrl = s3Util.uploadToRecordFolder(img);
51-
log.info("recordImgUrl: {}", recordImgUrl);
50+
String recordImgUrl;
51+
if(img != null){
52+
recordImgUrl = s3Util.uploadToRecordFolder(img);
53+
log.info("recordImgUrl: {}", recordImgUrl);
54+
}
55+
else{
56+
recordImgUrl = null;
57+
}
5258

5359
String verb = createRecordReq.getVerbType();
5460
try {

src/main/java/com/movelog/domain/record/presentation/RecordController.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.swagger.v3.oas.annotations.responses.ApiResponse;
1414
import io.swagger.v3.oas.annotations.responses.ApiResponses;
1515
import lombok.RequiredArgsConstructor;
16+
import lombok.extern.slf4j.Slf4j;
1617
import org.springframework.data.domain.Page;
1718
import org.springframework.http.ResponseEntity;
1819
import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -25,6 +26,7 @@
2526
@RestController
2627
@RequestMapping("api/v1/record")
2728
@RequiredArgsConstructor
29+
@Slf4j
2830
public class RecordController {
2931
private final RecordService recordService;
3032
@Operation(summary = "기록 추가 API", description = "기록을 추가하는 API입니다.")
@@ -42,6 +44,11 @@ public ResponseEntity<?> createRecord(
4244
@Parameter(description = "Schemas의 CreateRecordReq를 참고해주세요.", required = true) @RequestPart CreateRecordReq createRecordReq,
4345
@RequestPart(value = "img", required = false) MultipartFile img
4446
) {
47+
// 이미지 null 체크
48+
log.info("img: {}", img.isEmpty());
49+
if(img.isEmpty()) {
50+
img = null;
51+
}
4552
recordService.createRecord(userPrincipal, createRecordReq, img);
4653
return ResponseEntity.ok(ApiResponseUtil.success(Message.builder().message("기록이 생성되었습니다.").build()));
4754
}

0 commit comments

Comments
 (0)