Feature: 세션 사진 수 증가

src/main/java/org/cotato/csquiz/api/session/controller/SessionController.java

@@ -1,21 +1,28 @@
 package org.cotato.csquiz.api.session.controller;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.cotato.csquiz.api.session.dto.AddSessionPhotoRequest;
+import org.cotato.csquiz.api.session.dto.AddSessionPhotoResponse;
 import org.cotato.csquiz.api.session.dto.AddSessionRequest;
 import org.cotato.csquiz.api.session.dto.AddSessionResponse;
 import org.cotato.csquiz.api.session.dto.CsEducationOnSessionNumberResponse;
+import org.cotato.csquiz.api.session.dto.DeleteSessionPhotoRequest;
 import org.cotato.csquiz.api.session.dto.SessionListResponse;
 import org.cotato.csquiz.api.session.dto.UpdateSessionDescriptionRequest;
 import org.cotato.csquiz.api.session.dto.UpdateSessionNumberRequest;
+import org.cotato.csquiz.api.session.dto.UpdateSessionPhotoOrderRequest;
 import org.cotato.csquiz.api.session.dto.UpdateSessionPhotoRequest;
 import org.cotato.csquiz.api.session.dto.UpdateSessionRequest;
 import org.cotato.csquiz.domain.generation.service.SessionService;
 import org.cotato.csquiz.common.error.exception.ImageException;
 import org.springframework.http.HttpStatus;
 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.ModelAttribute;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -33,20 +40,21 @@ public class SessionController {
 
     private final SessionService sessionService;
 
+    @Operation(summary = "Session 리스트 정보 얻기", description = "Get Session Infos")
     @GetMapping("")
     public ResponseEntity<List<SessionListResponse>> findSessionsByGenerationId(@RequestParam Long generationId) {
         return ResponseEntity.status(HttpStatus.OK).body(sessionService.findSessionsByGenerationId(generationId));
     }
 
+    @Operation(summary = "Session 추가하기", description = "세션 추가하기")
     @PostMapping(value = "/add", consumes = "multipart/form-data")
     public ResponseEntity<AddSessionResponse> addSession(@ModelAttribute @Valid AddSessionRequest request)
             throws ImageException {
         return ResponseEntity.status(HttpStatus.CREATED).body(sessionService.addSession(request));
     }
 
     @PatchMapping(value = "/update", consumes = "multipart/form-data")
-    public ResponseEntity<Void> updateSession(@ModelAttribute @Valid UpdateSessionRequest request)
-            throws ImageException {
+    public ResponseEntity<Void> updateSession(@RequestBody @Valid UpdateSessionRequest request) {
         sessionService.updateSession(request);
         return ResponseEntity.noContent().build();
     }
@@ -57,16 +65,24 @@ public ResponseEntity<Void> updateSessionNumber(@RequestBody @Valid UpdateSessio
         return ResponseEntity.noContent().build();
     }
 
-    @PatchMapping("/description")
-    public ResponseEntity<Void> updateSessionDescription(@RequestBody @Valid UpdateSessionDescriptionRequest request) {
-        sessionService.updateSessionDescription(request);
+    @Operation(summary = "Session 수정 - 사진 순서", description = "세션 사진 순서 바꾸기")
+    @PatchMapping("/photo/order")
+    public ResponseEntity<Void> updateSessionPhotoOrder(@RequestBody UpdateSessionPhotoOrderRequest request) {
+        sessionService.updateSessionPhotoOrder(request);
         return ResponseEntity.noContent().build();
     }
 
-    @PatchMapping(value = "/update/photo", consumes = "multipart/form-data")
-    public ResponseEntity<Void> updateSessionPhoto(@ModelAttribute @Valid UpdateSessionPhotoRequest request)
+    @Operation(summary = "Session 수정 - 사진 추가하기", description = "세션 수정 시 사진 추가하기, photoId 반환")
+    @PostMapping(value = "/photo", consumes = "multipart/form-data")
+    public ResponseEntity<AddSessionPhotoResponse> additionalSessionPhoto(@ModelAttribute @Valid AddSessionPhotoRequest request)
             throws ImageException {
-        sessionService.updateSessionPhoto(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(sessionService.additionalSessionPhoto(request));
+    }
+
+    @Operation(summary = "Session 수정 - 사진 삭제하기", description = "사진 삭제하기")
+    @DeleteMapping(value = "/photo")
+    public ResponseEntity<Void> deleteSessionPhoto(@RequestBody DeleteSessionPhotoRequest request) {
+        sessionService.deleteSessionPhoto(request);
         return ResponseEntity.noContent().build();
     }
 

src/main/java/org/cotato/csquiz/api/session/dto/AddSessionPhotoRequest.java

@@ -0,0 +1,13 @@
+package org.cotato.csquiz.api.session.dto;
+
+import jakarta.validation.constraints.NotNull;
+import org.springframework.web.multipart.MultipartFile;
+
+public record AddSessionPhotoRequest(
+
+        @NotNull
+        Long sessionId,
+        @NotNull
+        MultipartFile photo
+) {
+}

src/main/java/org/cotato/csquiz/api/session/dto/AddSessionPhotoResponse.java

@@ -0,0 +1,17 @@
+package org.cotato.csquiz.api.session.dto;
+
+import jakarta.validation.constraints.NotNull;
+import org.cotato.csquiz.domain.generation.entity.SessionPhoto;
+import org.springframework.web.multipart.MultipartFile;
+
+public record AddSessionPhotoResponse(
+        Long photoId,
+        String photoUrl,
+        Integer order
+) {
+        public static AddSessionPhotoResponse from(SessionPhoto sessionPhoto) {
+                return new AddSessionPhotoResponse(sessionPhoto.getId(),
+                        sessionPhoto.getS3Info().getUrl(),
+                        sessionPhoto.getOrder());
+        }
+}

src/main/java/org/cotato/csquiz/api/session/dto/AddSessionRequest.java

@@ -1,5 +1,6 @@
 package org.cotato.csquiz.api.session.dto;
 
+import java.util.List;
 import org.cotato.csquiz.domain.generation.enums.CSEducation;
 import org.cotato.csquiz.domain.generation.enums.DevTalk;
 import org.cotato.csquiz.domain.generation.enums.ItIssue;
@@ -10,7 +11,7 @@
 public record AddSessionRequest(
         @NotNull
         Long generationId,
-        MultipartFile sessionImage,
+        List<MultipartFile> photos,
         @NotNull
         String title,
         @NotNull

src/main/java/org/cotato/csquiz/api/session/dto/DeleteSessionPhotoRequest.java

@@ -0,0 +1,9 @@
+package org.cotato.csquiz.api.session.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record DeleteSessionPhotoRequest(
+        @NotNull
+        Long photoId
+) {
+}

src/main/java/org/cotato/csquiz/api/session/dto/SessionListPhotoInfoResponse.java

@@ -0,0 +1,23 @@
+package org.cotato.csquiz.api.session.dto;
+
+import jakarta.validation.constraints.NotNull;
+import java.util.List;
+import org.cotato.csquiz.domain.generation.entity.SessionPhoto;
+
+public record SessionListPhotoInfoResponse(
+        Long photoId,
+        String photoUrl,
+        Integer order
+) {
+        public static SessionListPhotoInfoResponse from(SessionPhoto sessionPhoto) {
+                return new SessionListPhotoInfoResponse(sessionPhoto.getId(),
+                        sessionPhoto.getS3Info().getUrl(),
+                        sessionPhoto.getOrder());
+        }
+
+        public static List<SessionListPhotoInfoResponse> from(List<SessionPhoto> sessionPhotos) {
+                return sessionPhotos.stream()
+                        .map(SessionListPhotoInfoResponse::from)
+                        .toList();
+        }
+}

src/main/java/org/cotato/csquiz/api/session/dto/SessionListResponse.java

@@ -1,13 +1,14 @@
 package org.cotato.csquiz.api.session.dto;
 
+import java.util.List;
 import org.cotato.csquiz.domain.generation.embedded.SessionContents;
 import org.cotato.csquiz.domain.generation.entity.Session;
 
 public record SessionListResponse(
         Long sessionId,
         Integer sessionNumber,
         String title,
-        String photoUrl,
+        List<SessionListPhotoInfoResponse> photoInfos,
         String description,
         Long generationId,
         SessionContents sessionContents
@@ -17,7 +18,7 @@ public static SessionListResponse from(Session session) {
                 session.getId(),
                 session.getNumber(),
                 session.getTitle(),
-                (session.getPhotoS3Info() != null) ? session.getPhotoS3Info().getUrl() : null,
+                SessionListPhotoInfoResponse.from(session.getSessionPhotos()),
                 session.getDescription(),
                 session.getGeneration().getId(),
                 session.getSessionContents()

src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionPhotoOrderInfoRequest.java

@@ -0,0 +1,11 @@
+package org.cotato.csquiz.api.session.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record UpdateSessionPhotoOrderInfoRequest(
+        @NotNull
+        Long photoId,
+        @NotNull
+        Integer order
+) {
+}

src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionPhotoOrderRequest.java

@@ -0,0 +1,9 @@
+package org.cotato.csquiz.api.session.dto;
+
+import java.util.List;
+
+public record UpdateSessionPhotoOrderRequest(
+        Long sessionId,
+        List<UpdateSessionPhotoOrderInfoRequest> orderInfos
+) {
+}

src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionPhotoRequest.java

@@ -8,6 +8,6 @@
 public record UpdateSessionPhotoRequest(
         @NotNull
         Long sessionId,
-        MultipartFile sessionImage
+        MultipartFile photo
 ) {
 }

src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionRequest.java

@@ -5,14 +5,10 @@
 import org.cotato.csquiz.domain.generation.enums.ItIssue;
 import org.cotato.csquiz.domain.generation.enums.Networking;
 import jakarta.validation.constraints.NotNull;
-import org.springframework.web.multipart.MultipartFile;
 
 public record UpdateSessionRequest(
         @NotNull
         Long sessionId,
-        MultipartFile sessionImage,
-        @NotNull
-        Boolean isPhotoUpdated,
         String title,
         String description,
         @NotNull
@@ -21,7 +17,6 @@ public record UpdateSessionRequest(
         Networking networking,
         @NotNull
         CSEducation csEducation,
-
         @NotNull
         DevTalk devTalk
 ) {

src/main/java/org/cotato/csquiz/common/error/ErrorCode.java

@@ -45,8 +45,13 @@ public enum ErrorCode {
     EDUCATION_STATUS_NOT_BEFORE(HttpStatus.BAD_REQUEST, "E-402", "이미 시작한 적이 있는 교육입니다."),
     MEMBER_CANT_ACCESS(HttpStatus.BAD_REQUEST, "E-403", "해당 멤버의 ROLE로 접근할 수 없습니다"),
 
+    //세션 사진
+    SESSION_PHOTO_COUNT_MISMATCH(HttpStatus.BAD_REQUEST, "P-101", "저장된 사진 수와 요청 사진 수가 다릅니다."),
+    SESSION_ORDER_INVALID(HttpStatus.BAD_REQUEST, "P-102", "입력한 순서는 유효하지 않습니다."),
+
     FILE_EXTENSION_FAULT(HttpStatus.BAD_REQUEST, "F-001", "해당 파일은 등록 할 수 없는 확장자명입니다."),
 
+
     INVALID_ANSWER(HttpStatus.BAD_REQUEST, "Q-101", "객관식 문제는 숫자 형식의 값만 정답으로 추가할 수 있습니다."),
     CONTENT_IS_NOT_ANSWER(HttpStatus.BAD_REQUEST, "Q-201", "추가되지 않은 정답을 추가할 수 없습니다."),
     QUIZ_NUMBER_DUPLICATED(HttpStatus.CONFLICT, "Q-301", "퀴즈 번호는 중복될 수 없습니다."),

src/main/java/org/cotato/csquiz/domain/generation/entity/Session.java

@@ -12,6 +12,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -38,8 +41,8 @@ public class Session extends BaseTimeEntity {
     @Column(name = "session_title", length = 100)
     private String title;
 
-    @Embedded
-    private S3Info photoS3Info;
+    @OneToMany(mappedBy = "session", orphanRemoval = true)
+    private List<SessionPhoto> sessionPhotos = new ArrayList<>();
 
     @Column(name = "session_description")
     private String description;
@@ -61,9 +64,8 @@ public class Session extends BaseTimeEntity {
     private SessionContents sessionContents;
 
     @Builder
-    public Session(Integer number, S3Info s3Info, String title, String description, Generation generation, SessionContents sessionContents) {
+    public Session(Integer number, String title, String description, Generation generation, SessionContents sessionContents) {
         this.number = number;
-        this.photoS3Info = s3Info;
         this.title = title;
         this.description = description;
         this.generation = generation;
@@ -78,10 +80,6 @@ public void updateDescription(String description) {
         this.description = description;
     }
 
-    public void changePhotoUrl(S3Info photoUrl) {
-        this.photoS3Info = photoUrl;
-    }
-
     public void updateSessionContents(SessionContents sessionContents) {
         this.sessionContents = sessionContents;
     }

src/main/java/org/cotato/csquiz/domain/generation/entity/SessionPhoto.java

@@ -0,0 +1,58 @@
+package org.cotato.csquiz.domain.generation.entity;
+
+import static jakarta.persistence.FetchType.LAZY;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.cotato.csquiz.api.session.dto.SessionListPhotoInfoResponse;
+import org.cotato.csquiz.common.entity.BaseTimeEntity;
+import org.cotato.csquiz.common.entity.S3Info;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class SessionPhoto extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "session_photo_id")
+    private Long id;
+
+    @Embedded
+    private S3Info s3Info;
+
+    @Column(name = "session_photo_order")
+    private Integer order;
+
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "session_id")
+    private Session session;
+
+    @Builder
+    public SessionPhoto(Session session, Integer order, S3Info s3Info) {
+        this.session = session;
+        this.order = order;
+        this.s3Info = s3Info;
+    }
+
+    public void updateOrder(Integer order) {
+        this.order = order;
+    }
+
+    public void decreaseOrder() {
+        if (order > 0) {
+            order--;
+        }
+    }
+}

src/main/java/org/cotato/csquiz/domain/generation/repository/SessionPhotoRepository.java

@@ -0,0 +1,13 @@
+package org.cotato.csquiz.domain.generation.repository;
+
+import java.util.List;
+import java.util.Optional;
+import org.cotato.csquiz.domain.generation.entity.Session;
+import org.cotato.csquiz.domain.generation.entity.SessionPhoto;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SessionPhotoRepository extends JpaRepository<SessionPhoto, Long> {
+    List<SessionPhoto> findAllBySession(Session session);
+
+    Optional<SessionPhoto> findFirstBySessionOrderByOrderDesc(Session session);
+}