Feature/photo s3

build.gradle

@@ -29,8 +29,8 @@ dependencies {
     // ==============================================================
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+//    implementation 'org.springframework.boot:spring-boot-starter-security'
+//    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
@@ -75,6 +75,12 @@ dependencies {
     // ==============================================================
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
+
+    // ==============================================================
+    // 🪣 S3
+    // ==============================================================
+    implementation(platform("software.amazon.awssdk:bom:2.40.11"))
+    implementation("software.amazon.awssdk:s3")
 }
 
 sourceSets {

src/main/java/com/example/pventure/domain/folder/docs/CreateFolderDocs.java

@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 import java.lang.annotation.*;
 
@@ -13,9 +12,7 @@
         summary = FolderSwaggerDocs.CREATE_SUMMARY,
         description = FolderSwaggerDocs.CREATE_DESCRIPTION
 )
-@ApiResponses({
-        @ApiResponse(responseCode = "201", description = "생성 성공", useReturnTypeSchema = true),
-        @ApiResponse(responseCode = "400", description = "잘못된 요청"),
-        @ApiResponse(responseCode = "409", description = "기본 폴더 중복")
-})
-public @interface CreateFolderDocs {}
+@ApiResponse(responseCode = "201", description = "생성 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "400", description = "잘못된 요청")
+@ApiResponse(responseCode = "409", description = "기본 폴더 중복")
+public @interface CreateFolderDocs {}

src/main/java/com/example/pventure/domain/folder/docs/DeleteFolderDocs.java

@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 import java.lang.annotation.*;
 
@@ -13,8 +12,6 @@
         summary = FolderSwaggerDocs.DELETE_SUMMARY,
         description = FolderSwaggerDocs.DELETE_DESCRIPTION
 )
-@ApiResponses({
-        @ApiResponse(responseCode = "204", description = "삭제 성공"),
-        @ApiResponse(responseCode = "404", description = "폴더 또는 사용자 없음")
-})
+@ApiResponse(responseCode = "204", description = "삭제 성공")
+@ApiResponse(responseCode = "404", description = "폴더 또는 사용자 없음")
 public @interface DeleteFolderDocs {}

src/main/java/com/example/pventure/domain/folder/docs/GetFolderDocs.java

@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 import java.lang.annotation.*;
 
@@ -13,8 +12,6 @@
         summary = FolderSwaggerDocs.DETAIL_SUMMARY,
         description = FolderSwaggerDocs.DETAIL_DESCRIPTION
 )
-@ApiResponses({
-        @ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true),
-        @ApiResponse(responseCode = "404", description = "폴더 또는 사용자 없음")
-})
+@ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "404", description = "폴더 또는 사용자 없음")
 public @interface GetFolderDocs {}

src/main/java/com/example/pventure/domain/folder/docs/GetFoldersDocs.java

@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 import java.lang.annotation.*;
 
@@ -13,8 +12,6 @@
         summary = FolderSwaggerDocs.GET_ALL_SUMMARY,
         description = FolderSwaggerDocs.GET_ALL_DESCRIPTION
 )
-@ApiResponses({
-        @ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true),
-        @ApiResponse(responseCode = "404", description = "사용자 없음")
-})
+@ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "404", description = "사용자 없음")
 public @interface GetFoldersDocs {}

src/main/java/com/example/pventure/domain/folder/docs/UpdateFolderDocs.java

@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 import java.lang.annotation.*;
 
@@ -13,8 +12,6 @@
         summary = FolderSwaggerDocs.UPDATE_SUMMARY,
         description = FolderSwaggerDocs.UPDATE_DESCRIPTION
 )
-@ApiResponses({
-        @ApiResponse(responseCode = "200", description = "수정 성공", useReturnTypeSchema = true),
-        @ApiResponse(responseCode = "404", description = "폴더 또는 사용자 없음")
-})
+@ApiResponse(responseCode = "200", description = "수정 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "404", description = "폴더 또는 사용자 없음")
 public @interface UpdateFolderDocs {}

src/main/java/com/example/pventure/domain/photo/controller/PhotoController.java

@@ -0,0 +1,113 @@
+package com.example.pventure.domain.photo.controller;
+
+import com.example.pventure.domain.photo.docs.CreatePhotosDocs;
+import com.example.pventure.domain.photo.docs.DeletePhotosDocs;
+import com.example.pventure.domain.photo.docs.GenerateUploadUrlsDocs;
+import com.example.pventure.domain.photo.docs.GetPhotoDocs;
+import com.example.pventure.domain.photo.docs.GetPhotosByAlbumDocs;
+import com.example.pventure.domain.photo.docs.GetUnassignedPhotosDocs;
+import com.example.pventure.domain.photo.docs.MovePhotosDocs;
+import com.example.pventure.domain.photo.dto.request.MovePhotoRequestDto;
+import com.example.pventure.domain.photo.dto.request.PhotoRequestDto;
+import com.example.pventure.domain.photo.dto.request.UploadUrlRequestDto;
+import com.example.pventure.domain.photo.dto.response.PhotoDetailResponseDto;
+import com.example.pventure.domain.photo.dto.response.PhotoResponseDto;
+import com.example.pventure.domain.photo.dto.response.UploadUrlResponseDto;
+import com.example.pventure.domain.photo.service.PhotoService;
+import com.example.pventure.global.response.CustomResponse;
+import com.example.pventure.global.response.CustomResponseHelper;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "Photo", description = "사진 관련 API")
+@RestController
+@RequestMapping("/trips/{tripId}")
+@RequiredArgsConstructor
+public class PhotoController {
+
+    private final PhotoService photoService;
+
+    @GenerateUploadUrlsDocs
+    @PostMapping("/photos/upload-urls")
+    public ResponseEntity<CustomResponse<List<UploadUrlResponseDto>>> generateUploadUrls(
+        @RequestParam Long userId,
+        @PathVariable Long tripId,
+        @Valid @RequestBody List<UploadUrlRequestDto> requestDtos
+    ) {
+        return CustomResponseHelper.ok(photoService.generateUploadUrls(userId, tripId, requestDtos));
+    }
+
+    @CreatePhotosDocs
+    @PostMapping("/photos")
+    public ResponseEntity<CustomResponse<List<PhotoResponseDto>>> createPhotos(
+        @RequestParam Long userId,
+        @PathVariable Long tripId,
+        @RequestParam(required = false) Long albumId,
+        @Valid @RequestBody List<PhotoRequestDto> requestDtos
+    ) {
+        return CustomResponseHelper.created(photoService.createPhotos(userId, tripId, albumId, requestDtos));
+    }
+
+    @GetPhotosByAlbumDocs
+    @GetMapping("/albums/{albumId}/photos")
+    public ResponseEntity<CustomResponse<List<PhotoResponseDto>>> getPhotosByAlbum(
+        @RequestParam Long userId,
+        @PathVariable Long tripId,
+        @PathVariable Long albumId
+    ) {
+        return CustomResponseHelper.ok(photoService.getPhotosByAlbum(userId, tripId, albumId));
+    }
+
+    @GetUnassignedPhotosDocs
+    @GetMapping("/photos/unassigned")
+    public ResponseEntity<CustomResponse<List<PhotoResponseDto>>> getUnassignedPhotos(
+        @RequestParam Long userId,
+        @PathVariable Long tripId
+    ) {
+        return CustomResponseHelper.ok(photoService.getUnassignedPhotos(userId, tripId));
+    }
+
+    @GetPhotoDocs
+    @GetMapping("/photos/{photoId}")
+    public ResponseEntity<CustomResponse<PhotoDetailResponseDto>> getPhoto(
+        @RequestParam Long userId,
+        @PathVariable Long tripId,
+        @PathVariable Long photoId
+    ) {
+        return CustomResponseHelper.ok(photoService.getPhoto(userId, tripId, photoId));
+    }
+
+    @MovePhotosDocs
+    @PutMapping("/photos/move")
+    public ResponseEntity<Void> movePhotos(
+        @RequestParam Long userId,
+        @PathVariable Long tripId,
+        @Valid @RequestBody MovePhotoRequestDto requestDto
+    ) {
+        photoService.movePhotos(userId, tripId, requestDto.getTargetAlbumId(), requestDto.getPhotoIds());
+        return CustomResponseHelper.noContent();
+    }
+
+    @DeletePhotosDocs
+    @DeleteMapping("/photos")
+    public ResponseEntity<Void> deletePhotos(
+        @RequestParam Long userId,
+        @PathVariable Long tripId,
+        @RequestParam List<Long> photoIds
+    ) {
+        photoService.deletePhotos(userId, tripId, photoIds);
+        return CustomResponseHelper.noContent();
+    }
+}

src/main/java/com/example/pventure/domain/photo/docs/CreatePhotosDocs.java

@@ -0,0 +1,22 @@
+package com.example.pventure.domain.photo.docs;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Operation(
+    summary = PhotoSwaggerDocs.CREATE_PHOTOS_SUMMARY,
+    description = PhotoSwaggerDocs.CREATE_PHOTOS_DESCRIPTION
+)
+@ApiResponse(responseCode = "201", description = "사진 생성 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "400", description = "잘못된 요청")
+@ApiResponse(responseCode = "403", description = "편집 권한 없음")
+@ApiResponse(responseCode = "404", description = "사용자 또는 여행 없음")
+public @interface CreatePhotosDocs {}

src/main/java/com/example/pventure/domain/photo/docs/DeletePhotosDocs.java

@@ -0,0 +1,21 @@
+package com.example.pventure.domain.photo.docs;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Operation(
+    summary = PhotoSwaggerDocs.DELETE_PHOTO_SUMMARY,
+    description = PhotoSwaggerDocs.DELETE_PHOTO_DESCRIPTION
+)
+@ApiResponse(responseCode = "204", description = "삭제 성공")
+@ApiResponse(responseCode = "403", description = "편집 권한 없음")
+@ApiResponse(responseCode = "404", description = "사용자 또는 여행 또는 사진 없음")
+public @interface DeletePhotosDocs {}

src/main/java/com/example/pventure/domain/photo/docs/GenerateUploadUrlsDocs.java

@@ -0,0 +1,22 @@
+package com.example.pventure.domain.photo.docs;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Operation(
+    summary = PhotoSwaggerDocs.GENERATE_UPLOAD_URLS_SUMMARY,
+    description = PhotoSwaggerDocs.GENERATE_UPLOAD_URLS_DESCRIPTION
+)
+@ApiResponse(responseCode = "200", description = "업로드 URL 생성 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "400", description = "잘못된 요청")
+@ApiResponse(responseCode = "403", description = "편집 권한 없음")
+@ApiResponse(responseCode = "404", description = "사용자 또는 여행 없음")
+public @interface GenerateUploadUrlsDocs {}

src/main/java/com/example/pventure/domain/photo/docs/GetPhotoDocs.java

@@ -0,0 +1,21 @@
+package com.example.pventure.domain.photo.docs;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Operation(
+    summary = PhotoSwaggerDocs.GET_PHOTO_SUMMARY,
+    description = PhotoSwaggerDocs.GET_PHOTO_DESCRIPTION
+)
+@ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "403", description = "보기 권한 없음")
+@ApiResponse(responseCode = "404", description = "사용자 또는 여행 또는 사진 없음")
+public @interface GetPhotoDocs {}

src/main/java/com/example/pventure/domain/photo/docs/GetPhotosByAlbumDocs.java

@@ -0,0 +1,21 @@
+package com.example.pventure.domain.photo.docs;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Operation(
+    summary = PhotoSwaggerDocs.GET_PHOTOS_BY_ALBUM_SUMMARY,
+    description = PhotoSwaggerDocs.GET_PHOTOS_BY_ALBUM_DESCRIPTION
+)
+@ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "403", description = "보기 권한 없음")
+@ApiResponse(responseCode = "404", description = "사용자 또는 여행 없음")
+public @interface GetPhotosByAlbumDocs {}

src/main/java/com/example/pventure/domain/photo/docs/GetUnassignedPhotosDocs.java

@@ -0,0 +1,21 @@
+package com.example.pventure.domain.photo.docs;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Operation(
+    summary = PhotoSwaggerDocs.GET_UNASSIGNED_PHOTOS_SUMMARY,
+    description = PhotoSwaggerDocs.GET_UNASSIGNED_PHOTOS_DESCRIPTION
+)
+@ApiResponse(responseCode = "200", description = "조회 성공", useReturnTypeSchema = true)
+@ApiResponse(responseCode = "403", description = "보기 권한 없음")
+@ApiResponse(responseCode = "404", description = "사용자 또는 여행 없음")
+public @interface GetUnassignedPhotosDocs {}