feat: 약 사진 등록 기능 추가 (Neibce/OnGi#144)

Author: Neibce

backend/ongi/src/main/java/ongi/pill/controller/PillController.java

@@ -8,6 +8,7 @@
 import ongi.pill.dto.PillInfo;
 import ongi.pill.dto.PillInfoWithIntakeStatus;
 import ongi.pill.dto.PillIntakeRecordRequest;
+import ongi.pill.dto.PillPresignedResponseDto;
 import ongi.pill.service.PillService;
 import ongi.security.CustomUserDetails;
 import org.springframework.http.HttpStatus;
@@ -37,6 +38,14 @@ public class PillController {
     private final FamilyService familyService;
     private final TemperatureService temperatureService;
 
+    @GetMapping("/presigned-url")
+    public ResponseEntity<PillPresignedResponseDto> getPillPresignedUrl(
+            @AuthenticationPrincipal CustomUserDetails userDetails) {
+        PillPresignedResponseDto presignedResponse =
+                pillService.getPresignedPutUrl(userDetails.getUser());
+        return ResponseEntity.ok(presignedResponse);
+    }
+
     @PostMapping
     public ResponseEntity<PillInfo> createPill(
             @AuthenticationPrincipal CustomUserDetails userDetails,

backend/ongi/src/main/java/ongi/pill/dto/PillCreateRequest.java

@@ -16,6 +16,7 @@ public record PillCreateRequest(
         @NotNull IntakeDetail intakeDetail,
         @NotNull List<LocalTime> intakeTimes,
         @NotNull Set<DayOfWeek> intakeDays,
-        @NotNull UUID parentUuid
+        @NotNull UUID parentUuid,
+        String fileName
 ) {
 } 

backend/ongi/src/main/java/ongi/pill/dto/PillInfoWithIntakeStatus.java

@@ -1,5 +1,6 @@
 package ongi.pill.dto;
 
+import java.net.URL;
 import java.time.temporal.ChronoUnit;
 import ongi.pill.entity.IntakeDetail;
 import ongi.pill.entity.Pill;
@@ -16,6 +17,7 @@
 public record PillInfoWithIntakeStatus(
         Long id,
         String name,
+        URL imageUrl,
         Integer times,
         IntakeDetail intakeDetail,
         List<LocalTime> intakeTimes,
@@ -24,10 +26,11 @@ public record PillInfoWithIntakeStatus(
         Map<LocalTime, LocalTime> dayIntakeStatus
 ) {
 
-    public PillInfoWithIntakeStatus(Pill pill, List<PillIntakeRecord> intakeRecords) {
+    public PillInfoWithIntakeStatus(Pill pill, URL imageUrl, List<PillIntakeRecord> intakeRecords) {
         this(
                 pill.getId(),
                 pill.getName(),
+                imageUrl,
                 pill.getTimes(),
                 pill.getIntakeDetail(),
                 pill.getIntakeTimes(),

backend/ongi/src/main/java/ongi/pill/dto/PillPresignedResponseDto.java

@@ -0,0 +1,10 @@
+package ongi.pill.dto;
+
+import java.net.URL;
+
+public record PillPresignedResponseDto(
+        URL presignedUrl,
+        String fileName
+) {
+
+}

backend/ongi/src/main/java/ongi/pill/entity/Pill.java

@@ -44,6 +44,8 @@ public class Pill extends BaseEntity {
     @Column(nullable = false)
     private Set<DayOfWeek> intakeDays;
 
+    private String fileName;
+
     @ManyToOne(fetch = FetchType.LAZY)
     private User owner;
 }

backend/ongi/src/main/java/ongi/pill/service/PillService.java

@@ -1,5 +1,6 @@
 package ongi.pill.service;
 
+import java.net.URL;
 import java.time.LocalDate;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -10,12 +11,14 @@
 import ongi.pill.dto.PillInfo;
 import ongi.pill.dto.PillInfoWithIntakeStatus;
 import ongi.pill.dto.PillIntakeRecordRequest;
+import ongi.pill.dto.PillPresignedResponseDto;
 import ongi.pill.entity.Pill;
 import ongi.pill.entity.PillIntakeRecord;
 import ongi.pill.repository.PillIntakeRecordRepository;
 import ongi.pill.repository.PillRepository;
 import ongi.user.entity.User;
 import ongi.user.repository.UserRepository;
+import ongi.util.S3FileService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,6 +35,9 @@ public class PillService {
     private final UserRepository userRepository;
     private final FamilyRepository familyRepository;
     private final PillIntakeRecordRepository pillIntakeRecordRepository;
+    private final S3FileService s3FileService;
+
+    private static final String DIR_NAME = "pill-photos";
 
     @Transactional
     public PillInfo createPill(User child, PillCreateRequest request) {
@@ -49,13 +55,20 @@ public PillInfo createPill(User child, PillCreateRequest request) {
             throw new IllegalArgumentException("가족에 속하지 않은 사용자입니다.");
         }
 
+        if(request.fileName() != null) {
+            if (!s3FileService.objectExists(DIR_NAME, request.fileName())) {
+                throw new IllegalArgumentException("S3에 파일이 존재하지 않습니다.");
+            }
+        }
+
         Pill pill = Pill.builder()
                 .name(request.name())
                 .times(request.times())
                 .intakeDetail(request.intakeDetail())
                 .intakeTimes(request.intakeTimes())
                 .intakeDays(request.intakeDays())
                 .owner(parent)
+                .fileName(request.fileName())
                 .build();
 
         Pill savedPill = pillRepository.save(pill);
@@ -143,8 +156,15 @@ public List<PillInfoWithIntakeStatus> getFamilyPills(User user, UUID parentUuid,
                 .collect(Collectors.groupingBy(record -> record.getPill().getId()));
 
         return pills.stream()
-                .map(pill -> new PillInfoWithIntakeStatus(pill,
+                .map(pill -> new PillInfoWithIntakeStatus(pill, s3FileService.createSignedGetUrl(DIR_NAME, pill.getFileName()),
                         intakeRecordsMap.getOrDefault(pill.getId(), List.of())))
                 .toList();
     }
+
+    public PillPresignedResponseDto getPresignedPutUrl(User user) {
+        String fileName = UUID.randomUUID().toString();
+        URL signedGetUrl = s3FileService.createSignedPutUrl(user, DIR_NAME, fileName);
+
+        return new PillPresignedResponseDto(signedGetUrl, fileName);
+    }
 }