feat: 마음 기록 업로드 기능 구현 완료

Neibce · Neibce · commit c0587887b0fd · 2025-08-05T01:56:46.000+09:00
diff --git a/backend/ongi/build.gradle b/backend/ongi/build.gradle
@@ -24,6 +24,10 @@ repositories {
 }
 
 dependencies {
+    implementation platform("io.awspring.cloud:spring-cloud-aws-dependencies:${springCloudAwsVersion}")
+    implementation 'io.awspring.cloud:spring-cloud-aws-starter'
+    implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3'
+
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -33,6 +37,7 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'com.h2database:h2'
diff --git a/backend/ongi/gradle.properties b/backend/ongi/gradle.properties
@@ -0,0 +1 @@
+springCloudAwsVersion = 3.4.0
diff --git a/backend/ongi/src/main/java/ongi/common/AuditorAwareImpl.java b/backend/ongi/src/main/java/ongi/common/AuditorAwareImpl.java
@@ -0,0 +1,29 @@
+package ongi.common;
+
+import io.micrometer.common.lang.NonNull;
+import java.util.Optional;
+import ongi.security.CustomUserDetails;
+import ongi.user.entity.User;
+import org.springframework.data.domain.AuditorAware;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AuditorAwareImpl implements AuditorAware<User> {
+
+    @Override
+    @NonNull
+    public Optional<User> getCurrentAuditor() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null || !authentication.isAuthenticated()) {
+            return Optional.empty();
+        }
+
+        Object principal = authentication.getPrincipal();
+        if (principal instanceof CustomUserDetails customUserDetails) {
+            return Optional.of(customUserDetails.getUser());
+        }
+        return Optional.empty();
+    }
+}
diff --git a/backend/ongi/src/main/java/ongi/common/entity/BaseEntity.java b/backend/ongi/src/main/java/ongi/common/entity/BaseEntity.java
@@ -0,0 +1,36 @@
+package ongi.common.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import ongi.user.entity.User;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@Getter
+public class BaseEntity {
+    @CreatedDate
+    @Column(nullable = false, updatable = false)
+    protected LocalDateTime createdAt;
+
+    @LastModifiedDate
+    @Column(nullable = false)
+    protected LocalDateTime updatedAt;
+
+    @CreatedBy
+    @ManyToOne(fetch = FetchType.LAZY)
+    protected User createdBy;
+
+    @LastModifiedBy
+    @ManyToOne(fetch = FetchType.LAZY)
+    protected User updatedBy;
+}
diff --git a/backend/ongi/src/main/java/ongi/exception/GlobalExceptionHandler.java b/backend/ongi/src/main/java/ongi/exception/GlobalExceptionHandler.java
@@ -56,6 +56,13 @@ public ResponseEntity<ErrorResponse> handleValidationError(
                 .body(new ErrorResponse(ErrorStatus.VALIDATION_ERROR.getCode(), message));
     }
 
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<ErrorResponse> handleIllegalArgument() {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(new ErrorResponse(ErrorStatus.VALIDATION_ERROR.getCode(),
+                        ErrorStatus.VALIDATION_ERROR.getDefaultMessage()));
+    }
+
     @ExceptionHandler(HttpMessageNotReadableException.class)
     public ResponseEntity<ErrorResponse> handleBodyMissing() {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
diff --git a/backend/ongi/src/main/java/ongi/maum_log/controller/MaumLogController.java b/backend/ongi/src/main/java/ongi/maum_log/controller/MaumLogController.java
@@ -0,0 +1,38 @@
+package ongi.maum_log.controller;
+
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import ongi.maum_log.dto.MaumLogPresignedResponseDto;
+import ongi.maum_log.dto.MaumLogUploadRequestDto;
+import ongi.maum_log.service.MaumLogService;
+import ongi.security.CustomUserDetails;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import software.amazon.awssdk.http.HttpStatusCode;
+
+@RestController
+@RequestMapping("/maum-log")
+@AllArgsConstructor
+public class MaumLogController {
+
+    private final MaumLogService maumLogService;
+
+    @GetMapping("/presigned-url")
+    public ResponseEntity<MaumLogPresignedResponseDto> getPresignedUrl(
+            @AuthenticationPrincipal CustomUserDetails userDetails) {
+        return ResponseEntity.ok(maumLogService.getPresignedPutUrl(userDetails));
+    }
+
+    @PostMapping
+    public ResponseEntity<Void> createMaumLog(
+            @AuthenticationPrincipal CustomUserDetails userDetails,
+            @Valid @RequestBody MaumLogUploadRequestDto request) {
+        maumLogService.createMaumLog(userDetails, request);
+        return ResponseEntity.status(HttpStatusCode.CREATED).build();
+    }
+}
diff --git a/backend/ongi/src/main/java/ongi/maum_log/dto/MaumLogPresignedResponseDto.java b/backend/ongi/src/main/java/ongi/maum_log/dto/MaumLogPresignedResponseDto.java
@@ -0,0 +1,10 @@
+package ongi.maum_log.dto;
+
+public record MaumLogPresignedResponseDto(
+        String presignedUrl,
+        String fileName
+) {
+    public static MaumLogPresignedResponseDto from(String presignedUrl, String fileName) {
+        return new MaumLogPresignedResponseDto(presignedUrl, fileName);
+    }
+}
diff --git a/backend/ongi/src/main/java/ongi/maum_log/dto/MaumLogUploadRequestDto.java b/backend/ongi/src/main/java/ongi/maum_log/dto/MaumLogUploadRequestDto.java
@@ -0,0 +1,14 @@
+package ongi.maum_log.dto;
+
+import java.util.List;
+import ongi.maum_log.enums.Emotion;
+
+public record MaumLogUploadRequestDto(
+        String fileName,
+        String fileExtension,
+        String location,
+        String comment,
+        List<Emotion> emotions
+) {
+
+}
diff --git a/backend/ongi/src/main/java/ongi/maum_log/entity/MaumLog.java b/backend/ongi/src/main/java/ongi/maum_log/entity/MaumLog.java
@@ -0,0 +1,39 @@
+package ongi.maum_log.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+import ongi.common.entity.BaseEntity;
+import ongi.maum_log.enums.Emotion;
+
+@Entity
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MaumLog extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private String fileName;
+
+    @Column(nullable = false)
+    private String fileExtension;
+
+    private String location;
+
+    private String comment;
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private List<Emotion> emotions;
+}
diff --git a/backend/ongi/src/main/java/ongi/maum_log/enums/Emotion.java b/backend/ongi/src/main/java/ongi/maum_log/enums/Emotion.java
@@ -0,0 +1,30 @@
+package ongi.maum_log.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum Emotion {
+    JOYFUL("즐거움"),
+    EXCITED("설렘"),
+    RELIEVED("마음이 놓임"),
+    SMIRK("뿌듯함"),
+    SADNESS("서글픔"),
+    STIFLED("답답함"),
+    WARMHEARTED("마음이 따뜻"),
+    EMPTY("허전함"),
+    REFRESHING("시원섭섭함"),
+    THRILL("들뜸"),
+    ANNOYED("짜증남"),
+    SORROWFUL("서운함"),
+    WORRIED("걱정스러움"),
+    MISSING("그리움"),
+    DEPRESSED("울적함"),
+    RELAXED("여유로움"),
+    CONFUSED("마음이 복잡함"),
+    CHEERFUL("기운이 남"),
+    COZY("포근함");
+
+    private final String description;
+}
diff --git a/backend/ongi/src/main/java/ongi/maum_log/repository/MaumLogRepository.java b/backend/ongi/src/main/java/ongi/maum_log/repository/MaumLogRepository.java
@@ -0,0 +1,9 @@
+package ongi.maum_log.repository;
+
+import ongi.maum_log.entity.MaumLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MaumLogRepository extends JpaRepository<MaumLog, Long> {
+
+    boolean existsByFileName(String fileName);
+}
diff --git a/backend/ongi/src/main/java/ongi/maum_log/service/MaumLogService.java b/backend/ongi/src/main/java/ongi/maum_log/service/MaumLogService.java
@@ -0,0 +1,60 @@
+package ongi.maum_log.service;
+
+import java.net.URL;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import ongi.exception.EntityAlreadyExistException;
+import ongi.family.service.FamilyService;
+import ongi.maum_log.dto.MaumLogPresignedResponseDto;
+import ongi.maum_log.dto.MaumLogUploadRequestDto;
+import ongi.maum_log.entity.MaumLog;
+import ongi.maum_log.repository.MaumLogRepository;
+import ongi.security.CustomUserDetails;
+import ongi.temperature.service.TemperatureService;
+import ongi.user.entity.User;
+import ongi.util.S3FileService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@AllArgsConstructor
+public class MaumLogService {
+
+    private static final String DIR_NAME = "maum-log-photos";
+
+    private final S3FileService s3FileService;
+    private final MaumLogRepository maumLogRepository;
+    private final TemperatureService temperatureService;
+    private final FamilyService familyService;
+
+    @Transactional
+    public void createMaumLog(CustomUserDetails userDetails, MaumLogUploadRequestDto request) {
+        if (!s3FileService.objectExists(DIR_NAME, request.fileName())) {
+            throw new IllegalArgumentException("S3에 파일 존재하지 않음");
+        }
+        if(maumLogRepository.existsByFileName(request.fileName())) {
+            throw new EntityAlreadyExistException("이미 업로드된 항목입니다");
+        }
+
+        MaumLog maumLog = MaumLog.builder()
+                .fileName(request.fileName())
+                .fileExtension(request.fileExtension())
+                .emotions(request.emotions())
+                .comment(request.comment())
+                .location(request.location())
+                .build();
+
+        User user = userDetails.getUser();
+        temperatureService.increaseTemperatureForEmotionUpload(user.getUuid(),
+                familyService.getFamily(user).code());
+
+        maumLogRepository.save(maumLog);
+    }
+
+    public MaumLogPresignedResponseDto getPresignedPutUrl(CustomUserDetails userDetails) {
+        String fileName = UUID.randomUUID().toString();
+        URL presignedUrl = s3FileService.createSignedPutUrl(userDetails.getUser(), DIR_NAME,
+                fileName);
+        return MaumLogPresignedResponseDto.from(presignedUrl.toString(), fileName);
+    }
+}
diff --git a/backend/ongi/src/main/java/ongi/util/S3FileService.java b/backend/ongi/src/main/java/ongi/util/S3FileService.java
@@ -0,0 +1,34 @@
+package ongi.util;
+
+import io.awspring.cloud.s3.ObjectMetadata;
+import io.awspring.cloud.s3.S3Template;
+import java.net.URL;
+import java.time.Duration;
+import lombok.AllArgsConstructor;
+import ongi.user.entity.User;
+import org.springframework.stereotype.Component;
+
+@Component
+@AllArgsConstructor
+public class S3FileService {
+
+    private final S3Template s3Template;
+
+    public URL createSignedPutUrl(User uploader, String dir, String filename) {
+        ObjectMetadata metadata = ObjectMetadata.builder()
+                .metadata("uploader", uploader.getUuid().toString())
+                .build();
+
+        return s3Template.createSignedPutURL("ongi2025-bucket", dir + "/" + filename,
+                Duration.ofMinutes(3), metadata, null);
+    }
+
+    public URL createSignedGetUrl(String dir, String filename) {
+        return s3Template.createSignedGetURL("ongi2025-bucket", dir + "/" + filename,
+                Duration.ofMinutes(3));
+    }
+
+    public boolean objectExists(String dir, String filename) {
+        return s3Template.objectExists("ongi2025-bucket", dir + "/" + filename);
+    }
+}
diff --git a/backend/ongi/src/main/resources/application.properties b/backend/ongi/src/main/resources/application.properties
@@ -9,3 +9,7 @@ spring.jpa.hibernate.ddl-auto=update
 logging.level.root=INFO
 logging.level.org.springframework=DEBUG
 logging.level.ongi=DEBUG
+
+spring.cloud.aws.region.static=ap-northeast-2
+spring.cloud.aws.credentials.access-key=${AWS_ACCESS_KEY}
+spring.cloud.aws.credentials.secret-key=${AWS_SECRET_KEY}
