Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.example.pventure.domain.album.controller;

import com.example.pventure.domain.album.docs.CreateAlbumDocs;
import com.example.pventure.domain.album.docs.DeleteAlbumDocs;
import com.example.pventure.domain.album.docs.GetAlbumDocs;
import com.example.pventure.domain.album.docs.GetAlbumsDocs;
import com.example.pventure.domain.album.docs.UpdateAlbumDocs;
import com.example.pventure.domain.album.dto.request.AlbumRequestDto;
import com.example.pventure.domain.album.dto.response.AlbumResponseDto;
import com.example.pventure.domain.album.service.AlbumService;
import com.example.pventure.global.response.CustomResponse;
import com.example.pventure.global.response.CustomResponseHelper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

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 = "Album", description = "앨범 κ΄€λ ¨ API")
@RestController
@RequestMapping("/trips/{tripId}/albums")
@RequiredArgsConstructor
public class AlbumController {

private final AlbumService albumService;

@CreateAlbumDocs
@PostMapping
public ResponseEntity<CustomResponse<AlbumResponseDto>> createAlbum(
@RequestParam Long userId,
@PathVariable Long tripId,
@Valid @RequestBody AlbumRequestDto requestDto
) {
return CustomResponseHelper.created(albumService.createAlbum(userId, tripId, requestDto));
}

@GetAlbumsDocs
@GetMapping
public ResponseEntity<CustomResponse<List<AlbumResponseDto>>> getAlbums(
@RequestParam Long userId,
@PathVariable Long tripId
){
return CustomResponseHelper.ok(albumService.getAlbums(userId, tripId));
}

@GetAlbumDocs
@GetMapping("/{albumId}")
public ResponseEntity<CustomResponse<AlbumResponseDto>> getAlbum(
@RequestParam Long userId,
@PathVariable Long tripId,
@PathVariable Long albumId
){
return CustomResponseHelper.ok(albumService.getAlbum(userId, tripId, albumId));
}

@UpdateAlbumDocs
@PutMapping("/{albumId}")
public ResponseEntity<CustomResponse<AlbumResponseDto>> updateAlbum(
@RequestParam Long userId,
@PathVariable Long tripId,
@PathVariable Long albumId,
@Valid @RequestBody AlbumRequestDto requestDto
) {
return CustomResponseHelper.ok(albumService.updateAlbum(userId, tripId, albumId, requestDto));
}

@DeleteAlbumDocs
@DeleteMapping("/{albumId}")
public ResponseEntity<Void> deleteAlbum(
@RequestParam Long userId,
@PathVariable Long tripId,
@PathVariable Long albumId
) {
albumService.deleteAlbum(userId, tripId, albumId);
return CustomResponseHelper.noContent();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.example.pventure.domain.album.docs;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class AlbumSwaggerDocs {

// --- Create ---
public static final String CREATE_ALBUM_SUMMARY = "앨범 생성";
public static final String CREATE_ALBUM_DESCRIPTION = "μ‚¬μš©μž ID, μ—¬ν–‰ ID, 앨범 정보λ₯Ό μž…λ ₯ν•˜μ—¬ μƒˆλ‘œμš΄ μ—¬ν–‰ 앨범을 μƒμ„±ν•©λ‹ˆλ‹€.";

// --- Get Albums ---
public static final String GET_ALBUMS_SUMMARY = "앨범 λͺ©λ‘ 쑰회";
public static final String GET_ALBUMS_DESCRIPTION = "μ‚¬μš©μž ID와 μ—¬ν–‰ ID둜 νŠΉμ • 여행에 μ†ν•œ λͺ¨λ“  앨범 λͺ©λ‘μ„ μ‘°νšŒν•©λ‹ˆλ‹€.";

// --- Get Album ---
public static final String GET_ALBUM_SUMMARY = "앨범 상세 쑰회";
public static final String GET_ALBUM_DESCRIPTION = "μ‚¬μš©μž ID, μ—¬ν–‰ ID, 앨범 ID둜 νŠΉμ • μ•¨λ²”μ˜ 상세 정보λ₯Ό μ‘°νšŒν•©λ‹ˆλ‹€.";

// --- Update Album ---
public static final String UPDATE_ALBUM_SUMMARY = "앨범 정보 μˆ˜μ •";
public static final String UPDATE_ALBUM_DESCRIPTION = "μ‚¬μš©μž ID, μ—¬ν–‰ ID, 앨범 IDλ₯Ό 톡해 앨범 정보λ₯Ό μˆ˜μ •ν•©λ‹ˆλ‹€.";

// --- Delete Album ---
public static final String DELETE_ALBUM_SUMMARY = "앨범 μ‚­μ œ";
public static final String DELETE_ALBUM_DESCRIPTION = "μ‚¬μš©μž ID, μ—¬ν–‰ ID, 앨범 IDλ₯Ό 톡해 νŠΉμ • 앨범을 μ‚­μ œν•©λ‹ˆλ‹€.";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.example.pventure.domain.album.docs;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import java.lang.annotation.*;

@Documented
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Operation(
summary = AlbumSwaggerDocs.CREATE_ALBUM_SUMMARY,
description = AlbumSwaggerDocs.CREATE_ALBUM_DESCRIPTION
)
@ApiResponse(responseCode = "201", description = "생성 성곡", useReturnTypeSchema = true)
@ApiResponse(responseCode = "400", description = "잘λͺ»λœ μš”μ²­")
@ApiResponse(responseCode = "403", description = "νŽΈμ§‘ κΆŒν•œ μ—†μŒ")
@ApiResponse(responseCode = "404", description = "μ‚¬μš©μž λ˜λŠ” μ—¬ν–‰ μ—†μŒ")
public @interface CreateAlbumDocs {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.example.pventure.domain.album.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 = AlbumSwaggerDocs.DELETE_ALBUM_SUMMARY,
description = AlbumSwaggerDocs.DELETE_ALBUM_DESCRIPTION
)
@ApiResponse(responseCode = "204", description = "μ‚­μ œ 성곡")
@ApiResponse(responseCode = "403", description = "νŽΈμ§‘ κΆŒν•œ μ—†μŒ")
@ApiResponse(responseCode = "404", description = "μ‚¬μš©μž λ˜λŠ” μ—¬ν–‰ λ˜λŠ” 앨범 μ—†μŒ")
public @interface DeleteAlbumDocs {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.example.pventure.domain.album.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 = AlbumSwaggerDocs.GET_ALBUM_SUMMARY,
description = AlbumSwaggerDocs.GET_ALBUM_DESCRIPTION
)
@ApiResponse(responseCode = "200", description = "쑰회 성곡", useReturnTypeSchema = true)
@ApiResponse(responseCode = "403", description = "보기 κΆŒν•œ μ—†μŒ")
@ApiResponse(responseCode = "404", description = "μ‚¬μš©μž λ˜λŠ” μ—¬ν–‰ λ˜λŠ” 앨범 μ—†μŒ")
public @interface GetAlbumDocs {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.example.pventure.domain.album.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 = AlbumSwaggerDocs.GET_ALBUMS_SUMMARY,
description = AlbumSwaggerDocs.GET_ALBUMS_DESCRIPTION
)
@ApiResponse(responseCode = "200", description = "쑰회 성곡", useReturnTypeSchema = true)
@ApiResponse(responseCode = "403", description = "보기 κΆŒν•œ μ—†μŒ")
@ApiResponse(responseCode = "404", description = "μ‚¬μš©μž λ˜λŠ” μ—¬ν–‰ μ—†μŒ")
public @interface GetAlbumsDocs {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.example.pventure.domain.album.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 = AlbumSwaggerDocs.UPDATE_ALBUM_SUMMARY,
description = AlbumSwaggerDocs.UPDATE_ALBUM_DESCRIPTION
)
@ApiResponse(responseCode = "200", description = "μˆ˜μ • 성곡", useReturnTypeSchema = true)
@ApiResponse(responseCode = "400", description = "잘λͺ»λœ μš”μ²­")
@ApiResponse(responseCode = "403", description = "νŽΈμ§‘ κΆŒν•œ μ—†μŒ")
@ApiResponse(responseCode = "404", description = "μ‚¬μš©μž λ˜λŠ” μ—¬ν–‰ λ˜λŠ” 앨범 μ—†μŒ")
public @interface UpdateAlbumDocs {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.example.pventure.domain.album.dto.query;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public class AlbumWithPhotoCountQDto {

private final Long id;

private final String title;

private final Long photoCount;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.example.pventure.domain.album.dto.request;

import com.example.pventure.domain.album.entity.Album;
import com.example.pventure.domain.trip.entity.Trip;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "앨범 생성/μˆ˜μ • μš”μ²­ DTO")
public class AlbumRequestDto {

@Schema(description = "앨범 이름", example = "1일차 앨범")
@NotBlank(message = "앨범 이름을 μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String title;

public Album toEntity(Trip trip) {
return Album.builder()
.trip(trip)
.title(title)
.build();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.example.pventure.domain.album.dto.response;

import com.example.pventure.domain.album.dto.query.AlbumWithPhotoCountQDto;
import com.example.pventure.domain.album.entity.Album;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "앨범 응닡 DTO")
public class AlbumResponseDto {

@Schema(description = "앨범 ID", example = "1")
private Long id;

@Schema(description = "앨범 제λͺ©", example = "1일차 앨범")
private String title;

@Schema(description = "사진 개수", example = "10")
private Long photoCount;

public static AlbumResponseDto from(Album album, Long photoCount) {
return AlbumResponseDto.builder()
.id(album.getId())
.title(album.getTitle())
.photoCount(photoCount)
.build();
}

public static AlbumResponseDto from(AlbumWithPhotoCountQDto dto) {
return AlbumResponseDto.builder()
.id(dto.getId())
.title(dto.getTitle())
.photoCount(dto.getPhotoCount())
.build();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public class Album extends BaseEntity {
private String title;

@Builder.Default
@OneToMany(mappedBy = "album", cascade = CascadeType.ALL, orphanRemoval = true)
@OneToMany(mappedBy = "album")
private List<Photo> photos = new ArrayList<>();
}

public void updateTitle(String title) { this.title = title; }
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.example.pventure.domain.album.repository;

import com.example.pventure.domain.album.entity.Album;
import com.example.pventure.domain.trip.entity.Trip;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;

public interface AlbumRepository extends JpaRepository<Album, Long> {
public interface AlbumRepository extends JpaRepository<Album, Long>, AlbumRepositoryCustom {

Optional<Album> findByIdAndTrip(Long id, Trip trip);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.pventure.domain.album.repository;

import com.example.pventure.domain.album.dto.query.AlbumWithPhotoCountQDto;
import java.util.List;

public interface AlbumRepositoryCustom {

List<AlbumWithPhotoCountQDto> findAllByTripWithPhotoCount(Long tripId);

AlbumWithPhotoCountQDto findByIdAndTripWithPhotoCount(Long albumId, Long tripId);
}
Loading