feat(S3PreSignedUrl): S3 파일 업로드 방식을 PreSigned URL로 구현

src/main/generated/ussum/homepage/infra/jpa/post/entity/QPostEntity.java

@@ -39,6 +39,8 @@ public class QPostEntity extends EntityPathBase<PostEntity> {
 
     public final EnumPath<Status> status = createEnum("status", Status.class);
 
+    public final EnumPath<SuggestionTarget> suggestionTarget = createEnum("suggestionTarget", SuggestionTarget.class);
+
     public final StringPath thumbnailImage = createString("thumbnailImage");
 
     public final StringPath title = createString("title");

src/main/generated/ussum/homepage/infra/jpa/post/entity/QRightsDetailEntity.java

@@ -0,0 +1,61 @@
+package ussum.homepage.infra.jpa.post.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QRightsDetailEntity is a Querydsl query type for RightsDetailEntity
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QRightsDetailEntity extends EntityPathBase<RightsDetailEntity> {
+
+    private static final long serialVersionUID = 30014936L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QRightsDetailEntity rightsDetailEntity = new QRightsDetailEntity("rightsDetailEntity");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath major = createString("major");
+
+    public final StringPath name = createString("name");
+
+    public final EnumPath<RightsDetailEntity.PersonType> personType = createEnum("personType", RightsDetailEntity.PersonType.class);
+
+    public final StringPath phoneNumber = createString("phoneNumber");
+
+    public final QPostEntity postEntity;
+
+    public final StringPath studentId = createString("studentId");
+
+    public QRightsDetailEntity(String variable) {
+        this(RightsDetailEntity.class, forVariable(variable), INITS);
+    }
+
+    public QRightsDetailEntity(Path<? extends RightsDetailEntity> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QRightsDetailEntity(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QRightsDetailEntity(PathMetadata metadata, PathInits inits) {
+        this(RightsDetailEntity.class, metadata, inits);
+    }
+
+    public QRightsDetailEntity(Class<? extends RightsDetailEntity> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.postEntity = inits.isInitialized("postEntity") ? new QPostEntity(forProperty("postEntity"), inits.get("postEntity")) : null;
+    }
+
+}
+

src/main/java/ussum/homepage/application/image/controller/ImageController.java

@@ -0,0 +1,47 @@
+package ussum.homepage.application.image.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ussum.homepage.application.image.controller.dto.request.FileUploadConfirmRequest;
+import ussum.homepage.application.image.controller.dto.request.FileUploadRequest;
+import ussum.homepage.application.image.controller.dto.response.PreSignedUrlResponse;
+import ussum.homepage.application.image.service.ImageService;
+import ussum.homepage.application.post.service.dto.response.postSave.PostFileListResponse;
+import ussum.homepage.global.ApiResponse;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/image")
+public class ImageController {
+
+    private final ImageService imageService;
+
+    @PostMapping("/presigned-url")
+    public ResponseEntity<ApiResponse<?>> getPreSignedUrls(
+            @RequestParam(value = "userId") Long userId,
+            @RequestParam(value = "boardCode") String boardCode,
+            @RequestBody FileUploadRequest request
+    ) {
+        return ApiResponse.success(
+                imageService.createPreSignedUrls(
+                        userId,
+                        boardCode,
+                        request.files(),
+                        request.images()
+                )
+        );
+    }
+
+    @PostMapping("/confirm")
+    public ResponseEntity<ApiResponse<?>> confirmUpload(
+            @RequestParam(value = "userId") Long userId,
+            @RequestBody List<FileUploadConfirmRequest> confirmRequests
+    ) {
+        return ApiResponse.success(
+                imageService.confirmUpload(userId, confirmRequests)
+        );
+    }
+}

src/main/java/ussum/homepage/application/image/controller/dto/request/FileRequest.java

@@ -0,0 +1,7 @@
+package ussum.homepage.application.image.controller.dto.request;
+
+public record FileRequest(
+        String fileName,
+        String contentType
+) {
+}

src/main/java/ussum/homepage/application/image/controller/dto/request/FileUploadConfirmRequest.java

@@ -0,0 +1,8 @@
+package ussum.homepage.application.image.controller.dto.request;
+
+public record FileUploadConfirmRequest(
+        String fileUrl,
+        String fileType,
+        String originalFileName
+) {
+}

src/main/java/ussum/homepage/application/image/controller/dto/request/FileUploadRequest.java

@@ -0,0 +1,22 @@
+package ussum.homepage.application.image.controller.dto.request;
+
+import java.util.Collections;
+import java.util.List;
+
+public record FileUploadRequest(
+        List<FileRequest> files,
+        List<FileRequest> images
+) {
+    public static FileUploadRequest of(List<FileRequest> files, List<FileRequest> images) {
+        return new FileUploadRequest(
+                files != null ? files : Collections.emptyList(),
+                images != null ? images : Collections.emptyList()
+        );
+    }
+
+    // null check를 위한 기본 생성자
+    public FileUploadRequest {
+        files = files != null ? files : Collections.emptyList();
+        images = images != null ? images : Collections.emptyList();
+    }
+}

src/main/java/ussum/homepage/application/image/controller/dto/response/PreSignedUrlResponse.java

@@ -0,0 +1,13 @@
+package ussum.homepage.application.image.controller.dto.response;
+
+import java.util.List;
+import java.util.Map;
+
+public record PreSignedUrlResponse(
+        List<Map<String, String>> preSignedUrls,
+        List<String> originalFileNames
+) {
+    public static PreSignedUrlResponse of(List<Map<String, String>> preSignedUrls, List<String> originalFileNames) {
+        return new PreSignedUrlResponse(preSignedUrls, originalFileNames);
+    }
+}

src/main/java/ussum/homepage/application/image/service/ImageService.java

@@ -0,0 +1,98 @@
+package ussum.homepage.application.image.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ussum.homepage.application.image.controller.dto.request.FileRequest;
+import ussum.homepage.application.image.controller.dto.request.FileUploadConfirmRequest;
+import ussum.homepage.application.image.controller.dto.response.PreSignedUrlResponse;
+import ussum.homepage.application.post.service.dto.response.postSave.PostFileListResponse;
+import ussum.homepage.application.post.service.dto.response.postSave.PostFileResponse;
+import ussum.homepage.domain.post.PostFile;
+import ussum.homepage.domain.post.service.PostFileAppender;
+import ussum.homepage.infra.utils.S3PreSignedUrlUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class ImageService {
+    private final S3PreSignedUrlUtils s3PreSignedUrlUtils;
+    private final PostFileAppender postFileAppender;
+
+    public PreSignedUrlResponse createPreSignedUrls(
+            Long userId,
+            String boardCode,
+            List<FileRequest> files,
+            List<FileRequest> images
+    ) {
+        List<Map<String, String>> preSignedUrls = new ArrayList<>();
+        List<String> originalFileNames = new ArrayList<>();
+
+        // 이미지 파일 처리
+        if (images != null && !images.isEmpty()) {
+            List<Map<String, String>> imageUrls = s3PreSignedUrlUtils.generatePreSignedUrlWithPath(
+                    userId,
+                    boardCode,
+                    images.stream().map(FileRequest::fileName).collect(Collectors.toList()),
+                    images.stream().map(FileRequest::contentType).collect(Collectors.toList()),
+                    "images"
+            );
+            preSignedUrls.addAll(imageUrls);
+            originalFileNames.addAll(images.stream().map(FileRequest::fileName).collect(Collectors.toList()));
+        }
+
+        // 일반 파일 처리
+        if (files != null && !files.isEmpty()) {
+            List<Map<String, String>> fileUrls = s3PreSignedUrlUtils.generatePreSignedUrlWithPath(
+                    userId,
+                    boardCode,
+                    files.stream().map(FileRequest::fileName).collect(Collectors.toList()),
+                    files.stream().map(FileRequest::contentType).collect(Collectors.toList()),
+                    "files"
+            );
+            preSignedUrls.addAll(fileUrls);
+            originalFileNames.addAll(files.stream().map(FileRequest::fileName).collect(Collectors.toList()));
+        }
+
+        return PreSignedUrlResponse.of(preSignedUrls, originalFileNames);
+    }
+
+    @Transactional
+    public PostFileListResponse confirmUpload(Long userId, List<FileUploadConfirmRequest> confirmRequests) {
+        List<PostFile> postFiles = confirmRequests.stream()
+                .map(request -> PostFile.builder()
+                        .url(request.fileUrl())
+                        .typeName(request.fileType())
+                        .build())
+                .collect(Collectors.toList());
+
+        List<PostFile> afterSaveList = postFileAppender.saveAllPostFile(postFiles);
+
+        String thumbnailUrl = afterSaveList.stream()
+                .filter(postFile -> postFile.getTypeName().equals("images"))
+                .min(Comparator.comparing(PostFile::getId))
+                .map(PostFile::getUrl)
+                .orElse(null);
+
+        AtomicInteger index = new AtomicInteger(0);
+        List<PostFileResponse> postFileResponses = afterSaveList.stream()
+                .map(postFile -> {
+                    int currentIndex = index.getAndIncrement();
+                    return PostFileResponse.of(
+                            postFile.getId(),
+                            postFile.getUrl(),
+                            confirmRequests.get(currentIndex).originalFileName()
+                    );
+                })
+                .collect(Collectors.toList());
+
+        return PostFileListResponse.of(thumbnailUrl, postFileResponses);
+    }
+}

src/main/java/ussum/homepage/domain/post/PostFile.java

@@ -4,11 +4,13 @@
 import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import ussum.homepage.infra.jpa.post.entity.PostEntity;
 
 @Getter
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Builder
 public class PostFile {
     private Long id;
     private String fileName;

src/main/java/ussum/homepage/infra/jpa/post/PostRepositoryImpl.java

@@ -534,6 +534,60 @@ public Page<Post> searchAllByBoardIdAndGroupCodeAndMemberCode(Long boardId, Stri
         );
 
     }
+    /*
+        @Override
+public Page<Post> searchAllByBoardIdAndGroupCodeAndMemberCode(Long boardId, String q, GroupCode groupCode, MemberCode memberCode, Pageable pageable) {
+    // 조건절 구성
+    BooleanBuilder whereClause = new BooleanBuilder(postEntity.boardEntity.id.eq(boardId));
+
+    if (memberCode != null) {
+        whereClause.and(memberEntity.memberCode.eq(memberCode));
+    }
+    if (groupCode != null) {
+        whereClause.and(groupEntity.groupCode.eq(groupCode));
+    }
+    if (q != null && !q.isEmpty()) {
+        whereClause.and(postEntity.title.like("%" + q + "%"));
+    }
+
+    // 상태 정렬 조건
+    NumberExpression<Integer> statusOrder = new CaseBuilder()
+            .when(postEntity.status.eq(Status.EMERGENCY_NOTICE)).then(1)
+            .when(postEntity.status.eq(Status.NEW)).then(2)
+            .when(postEntity.status.eq(Status.GENERAL)).then(3)
+            .otherwise(Integer.MAX_VALUE);
+
+    // 조회용 메인 쿼리 - 필요한 조인만 사용
+    JPAQuery<PostEntity> query = queryFactory
+            .selectFrom(postEntity)
+            .leftJoin(postEntity.userEntity, userEntity).fetchJoin()  // fetchJoin 추가
+            .leftJoin(memberEntity).on(memberEntity.userEntity.eq(userEntity)).fetchJoin()  // fetchJoin 추가
+            .leftJoin(memberEntity.groupEntity, groupEntity).fetchJoin()  // fetchJoin 추가
+            .where(whereClause)
+            .orderBy(statusOrder.asc(), postEntity.createdAt.desc());
+
+    // 별도의 카운트 쿼리 - 필요한 조인만 포함
+    JPAQuery<Long> countQuery = queryFactory
+            .select(postEntity.countDistinct())  // countDistinct 사용
+            .from(postEntity)
+            .leftJoin(postEntity.userEntity, userEntity)
+            .leftJoin(memberEntity).on(memberEntity.userEntity.eq(userEntity))
+            .leftJoin(memberEntity.groupEntity, groupEntity)
+            .where(whereClause);
+
+    // 페이징 처리
+    List<PostEntity> content = query
+            .offset(pageable.getOffset())
+            .limit(pageable.getPageSize())
+            .fetch();
+
+    return PageableExecutionUtils.getPage(
+            content.stream().map(postMapper::toDomain).collect(Collectors.toList()),
+            pageable,
+            countQuery::fetchOne
+    );
+}
+     */
 
     @Override
     public Page<Post> searchAllByBoardIdAndCategory(Long boardId, String q, Category category, Pageable pageable) {