Merge pull request #30 from Ong-gi-Jong-gi/feature/TSK-36/Recap

CORS domain update & S3 directory for FileType

src/main/java/ongjong/namanmoo/domain/Lucky.java

@@ -2,14 +2,15 @@
 
 
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import ongjong.namanmoo.domain.answer.FaceTimeAnswer;
 import java.util.List;
 
 @Entity
-@Getter
-@Setter
+@Getter @Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class Lucky {
 
     @Id
@@ -27,10 +28,10 @@ public class Lucky {
 
     private boolean running;
 
+    @Builder.Default
     @Enumerated(EnumType.STRING)
     private ChallengeLength lifetime = ChallengeLength.THIRTY_DAYS; // 행운이 기본 수명 ( 30일 단위 챌린지 )
 
     @OneToMany(mappedBy = "lucky")
     private List<FaceTimeAnswer> faceTimeAnswers;
-
-}
+}

src/main/java/ongjong/namanmoo/domain/VoiceMessage.java

@@ -7,8 +7,7 @@
 import java.sql.Timestamp;
 
 @Entity
-@Getter
-@Setter
+@Getter @Setter
 public class VoiceMessage {
 
     @Id

src/main/java/ongjong/namanmoo/domain/answer/Answer.java

@@ -9,8 +9,7 @@
 
 
 @Entity
-@Getter
-@Setter
+@Getter @Setter
 @RequiredArgsConstructor
 public class Answer {
 

src/main/java/ongjong/namanmoo/domain/answer/FaceTimeAnswer.java

@@ -6,8 +6,7 @@
 import ongjong.namanmoo.domain.Lucky;
 
 @Entity
-@Getter
-@Setter
+@Getter @Setter
 public class FaceTimeAnswer {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/ongjong/namanmoo/global/security/config/CorsConfig.java

@@ -14,7 +14,7 @@ public class CorsConfig {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(List.of("http://localhost:5173")); // 요청을 허용할 출처
+        configuration.setAllowedOrigins(List.of("http://localhost:5173", "https://www.mooluck.site")); // 요청을 허용할 출처
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); // 허용할 HTTP 메서드
         configuration.setAllowedHeaders(List.of("*")); // 허용할 헤더
         configuration.setExposedHeaders(List.of("Authorization", "Authorization-refresh")); // 클라이언트에게 노출할 헤더 명시

src/main/java/ongjong/namanmoo/service/AwsS3Service.java

@@ -70,7 +70,8 @@ public String uploadFile(MultipartFile multipartFile) throws IOException {
         File uploadFile = convertFile(multipartFile)
                 .orElseThrow(() -> new IllegalArgumentException("MultipartFile -> File convert fail"));
 
-        String fileName = generateFileName(uploadFile);
+        String fileType = determineFileType(multipartFile);
+        String fileName = generateFileName(uploadFile, fileType);
 
         log.debug("Uploading file to S3: {}", fileName);
         String uploadImageUrl = uploadFileToS3(uploadFile, fileName);
@@ -80,6 +81,24 @@ public String uploadFile(MultipartFile multipartFile) throws IOException {
         return uploadImageUrl;
     }
 
+    /**
+     * 파일 타입을 결정하는 메소드.
+     *
+     * @param multipartFile 파일
+     * @return 파일 타입 (image/audio/video)
+     */
+    private String determineFileType(MultipartFile multipartFile) {
+        String contentType = multipartFile.getContentType();
+        if (contentType != null && contentType.startsWith("image")) {
+            return "image";
+        } else if (contentType != null && contentType.startsWith("audio")) {
+            return "audio";
+        } else if (contentType != null && contentType.startsWith("video")) {
+            return "video";
+        }
+        throw new IllegalArgumentException("Unsupported file type: " + contentType);
+    }
+
     /**
      * MultipartFile을 File 객체로 변환하는 메소드.
      *
@@ -105,10 +124,11 @@ private Optional<File> convertFile(MultipartFile file) throws IOException {
      * 업로드될 파일의 고유한 파일 이름을 생성하는 메소드.
      *
      * @param uploadFile 업로드할 파일
+     * @param fileType   파일 타입 (image/audio/video)
      * @return String 고유한 파일 이름
      */
-    private String generateFileName(File uploadFile) {
-        return UUID.randomUUID() + "_" + uploadFile.getName();
+    private String generateFileName(File uploadFile, String fileType) {
+        return fileType + "/" + UUID.randomUUID() + "_" + uploadFile.getName();
     }
 
     /**