Merge pull request #24 from potenday-23/feature/ticket_folder

Feature : 티켓 폴더 데이터 구조 추가

src/main/java/project/backend/domain/like/CulturalEventLikeListener.java

@@ -1,9 +1,7 @@
 package project.backend.domain.like;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import project.backend.domain.like.entity.CulturalEventLike;
-import project.backend.domain.notification.service.NotificationService;
 
 import javax.persistence.PrePersist;
 import javax.persistence.PreRemove;

src/main/java/project/backend/domain/media/dto/MediaDto.java

@@ -10,5 +10,4 @@
 public class MediaDto {
     private String mediaUrl;
     private Integer ordering;
-    private Boolean isThumbnail;
 }

src/main/java/project/backend/domain/media/service/MediaService.java

@@ -20,7 +20,6 @@
 @Transactional
 public class MediaService {
     private final MediaRepository mediaRepository;
-    private final MediaMapper mediaMapper;
     private final ImageService imageService;
 
     public Media createMedia(MultipartFile file) {
@@ -30,16 +29,9 @@ public Media createMedia(MultipartFile file) {
         return media;
     }
 
-    public Media setOrderThumbnail(MediaDto mediaDto) {
-        Media media;
-        Optional<Media> optionalMedia = mediaRepository.findFirstByMediaUrl(mediaDto.getMediaUrl());
-        if (optionalMedia.isPresent()) {
-            media = optionalMedia.get();
-        } else {
-            media = Media.builder().mediaUrl(mediaDto.getMediaUrl()).build();
-        }
+    public Media setMediaOrdering(MediaDto mediaDto) {
+        Media media = Media.builder().mediaUrl(mediaDto.getMediaUrl()).build();
         media.setOrdering(mediaDto.getOrdering());
-        media.setIsThumbnail(mediaDto.getIsThumbnail());
         return mediaRepository.save(media);
     }
 }

src/main/java/project/backend/domain/member/MemberListener.java

@@ -0,0 +1,28 @@
+package project.backend.domain.member;
+
+import org.springframework.stereotype.Component;
+import project.backend.domain.member.entity.Member;
+import project.backend.domain.ticketfolder.entity.TicketFolder;
+import project.backend.domain.ticketfolder.repository.TicketFolderRepository;
+import project.backend.global.config.SpringContext;
+
+import javax.persistence.PostPersist;
+import java.util.Arrays;
+import java.util.List;
+
+
+@Component
+public class MemberListener {
+
+    List<String> defaultTicketFolderTitles = Arrays.asList("뮤지컬", "영화", "연극", "콘서트", "전시회");
+    @PostPersist
+    public void postPersist(Member member) {
+        TicketFolderRepository ticketFolderRepository = SpringContext.getBean(TicketFolderRepository.class);
+        for (String title : defaultTicketFolderTitles) {
+            TicketFolder ticketFolder = TicketFolder.builder().isDefault(true).title(title).build();
+            ticketFolderRepository.save(ticketFolder);
+            ticketFolder.setMember(member);
+        }
+
+    }
+}

src/main/java/project/backend/domain/member/entity/Member.java

@@ -6,11 +6,13 @@
 import lombok.RequiredArgsConstructor;
 import project.backend.domain.keyword.entity.CulturalEventSearchKeyword;
 import project.backend.domain.like.entity.CulturalEventLike;
+import project.backend.domain.member.MemberListener;
 import project.backend.domain.member.dto.MemberInfoDto;
 import project.backend.domain.common.entity.BaseEntity;
 import project.backend.domain.onboardingmembercategory.entity.OnboardingMemberCategory;
 import project.backend.domain.ticket.entity.Ticket;
 import project.backend.domain.member.dto.MemberPatchRequestDto;
+import project.backend.domain.ticketfolder.entity.TicketFolder;
 import project.backend.domain.visit.entity.CulturalEventVisit;
 
 import javax.persistence.*;
@@ -22,6 +24,7 @@
 
 @Entity
 @Getter
+@EntityListeners(MemberListener.class)
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class Member extends BaseEntity {
     @Id
@@ -69,6 +72,8 @@ public class Member extends BaseEntity {
     @OneToMany(mappedBy = "member", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
     public List<CulturalEventSearchKeyword> culturalEventSearchKeywordList = new ArrayList<>();
 
+    @OneToMany(mappedBy = "member", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
+    public List<TicketFolder> ticketFolderList = new ArrayList<>();
     @Builder
     public Member(SocialType socialType, String socialId, String nickname, String profileImageUrl, String refreshToken) {
         this.socialType = socialType;

src/main/java/project/backend/domain/member/repository/MemberRepository.java

@@ -1,6 +1,7 @@
 package project.backend.domain.member.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import project.backend.domain.member.entity.Member;
 import project.backend.domain.member.entity.SocialType;
 
@@ -13,5 +14,6 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findFirstBySocialIdAndSocialType(String socialId, SocialType socialType);
 
     Optional<Member> findByNicknameAndIdNot(String nickname, Long id);
-
+    @Query("SELECT m FROM Member m LEFT JOIN FETCH m.ticketFolderList")
+    List<Member> findAllWithTicketFolders();
 }

src/main/java/project/backend/domain/ticket/controller/TicketController.java

@@ -28,7 +28,7 @@ public class TicketController {
     private final TicketService ticketService;
     private final TicketMapper ticketMapper;
 
-    @ApiOperation(value = "티켓 생성하기")
+    @ApiOperation(value = "티켓 생성")
     @PreAuthorize("isAuthenticated()")
     @PostMapping
     public ResponseEntity create(@Valid @RequestBody TicketCreateDto ticketCreateDto) {

src/main/java/project/backend/domain/ticket/dto/TicketCreateDto.java

@@ -3,11 +3,9 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import project.backend.domain.media.dto.MediaDto;
-import project.backend.global.annotation.ValidDateFormat;
 
 import javax.validation.constraints.*;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter
@@ -19,7 +17,7 @@ public class TicketCreateDto {
     // TODO(sprint4) : Category, place 연결 미구현 상태
 
     @NotBlank
-    @NotNull
+    @NotNull(message = "문화생활의 제목을 입력해주세요")
     @Size(min = 1, max = 20, message = "1자 ~ 20자 사이만 입력 가능합니다.")
     @Schema(description = "제목", example = "<뮤지컬> 시카고", required = true)
     public String title;
@@ -29,7 +27,7 @@ public class TicketCreateDto {
     @Schema(description = "메인 이미지", example = "https://placehold.co/600x400/png", required = true)
     public String mainImageUrl;
 
-    @NotNull
+    @NotNull(message = "날짜를 입력해주세요")
     @Schema(description = "날짜", example = "2024-01-01", required = true)
     public LocalDate date;
 
@@ -39,15 +37,18 @@ public class TicketCreateDto {
     @Schema(description = "별점", example = "3.5", required = true)
     public Float score;
 
-    @Schema(description = "별점", example = "2층 2열 8번", required = false)
+    @Schema(description = "별점", example = "2층 2열 8번")
+    @NotNull(message = "좌석 정보를 입력해주세요")
     public String seat;
 
-    @Schema(description = "가격", example = "156000", required = false)
+    @Schema(description = "가격", example = "156000")
     public Integer price;
 
     @Size(max = 500, message = "Review must be up to 500 characters")
-    @Schema(description = "리뷰", example = "정말 재미있었어요", required = false)
-    private String review;
+    @Schema(description = "리뷰", example = "정말 재미있었어요")
+    public String review;
+
+    public Long ticketFolderId;
 
     public List<MediaDto> medias;
 }

src/main/java/project/backend/domain/ticket/dto/TicketRetrieveDto.java

@@ -1,6 +1,8 @@
 package project.backend.domain.ticket.dto;
 
 import lombok.*;
+import project.backend.domain.ticketfolder.dto.TicketFolderRetrieveDto;
+
 import java.time.LocalDateTime;
 
 @Getter
@@ -19,4 +21,5 @@ public class TicketRetrieveDto {
     public Integer price;
     private String review;
     public String mediasData;
+    public TicketFolderRetrieveDto ticketFolder;
 }

src/main/java/project/backend/domain/ticket/entity/Ticket.java

@@ -9,6 +9,7 @@
 import project.backend.domain.media.entity.Media;
 import project.backend.domain.place.entity.Place;
 import project.backend.domain.member.entity.Member;
+import project.backend.domain.ticketfolder.entity.TicketFolder;
 import project.backend.domain.ticketingsite.entity.TicketingSite;
 
 import javax.persistence.*;
@@ -42,6 +43,9 @@ public class Ticket extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     public Place place;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    public TicketFolder ticketFolder;
+
     @OneToMany(mappedBy = "ticket", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
     public List<Media> medias = new ArrayList<>();
 
@@ -91,4 +95,14 @@ public void setPlace(Place place) {
         this.place = Optional.ofNullable(place).orElse(this.place);
         this.place.getTickets().add(this);
     }
+
+    public void setTicketFolder(TicketFolder ticketFolder) {
+        if (this.ticketFolder != null) {
+            if (this.ticketFolder.getTickets().contains(this)) {
+                this.ticketFolder.getTickets().remove(this);
+            }
+        }
+        this.ticketFolder = Optional.ofNullable(ticketFolder).orElse(this.ticketFolder);
+        this.ticketFolder.getTickets().add(this);
+    }
 }

src/main/java/project/backend/domain/ticket/service/TicketService.java

@@ -18,21 +18,29 @@
 import project.backend.domain.ticket.dto.TicketCreateDto;
 import project.backend.domain.ticket.entity.Ticket;
 import project.backend.domain.ticket.repository.TicketRepository;
+import project.backend.domain.ticketfolder.entity.TicketFolder;
+import project.backend.domain.ticketfolder.repository.TicketFolderRepository;
 import project.backend.global.error.exception.BusinessException;
 import project.backend.global.error.exception.ErrorCode;
 
 import java.io.IOException;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 @Transactional
 public class TicketService {
     private final TicketRepository ticketRepository;
+    private final TicketFolderRepository ticketFolderRepository;
     private final MediaService mediaService;
     private final MemberJwtService memberJwtService;
 
     public Ticket createTicket(TicketCreateDto ticketCreateDto) {
-        Media media;
+
+        Member member = memberJwtService.getMember();
+        TicketFolder ticketFolder = ticketFolderRepository.findById(ticketCreateDto.getTicketFolderId())
+                .orElseThrow(() -> new BusinessException(ErrorCode.TICKET_FOLDER_NOT_FOUND));
+
         Ticket ticket = Ticket.builder()
                 .title(ticketCreateDto.getTitle())
                 .mainImageUrl(ticketCreateDto.getMainImageUrl())
@@ -45,13 +53,20 @@ public Ticket createTicket(TicketCreateDto ticketCreateDto) {
 
         // Media 연결
         for (MediaDto mediaDto : ticketCreateDto.medias) {
-            media = mediaService.setOrderThumbnail(mediaDto);
+            Media media = mediaService.setMediaOrdering(mediaDto);
             media.setTicket(ticket);
         }
-        ticket.setMember(memberJwtService.getMember());
-        ticketRepository.save(ticket);
 
-        return ticket;
+        // Ticket Folder 연결
+        if (ticketFolder.getMember() != member) {
+            throw new BusinessException(ErrorCode.TICKET_FOLDER_ADD_AUTH);
+        }
+        ticket.setTicketFolder(ticketFolder);
+
+        // Member 연결
+        ticket.setMember(member);
+
+        return ticketRepository.save(ticket);
     }
 
     public Ticket getTicket(Long id) {

src/main/java/project/backend/domain/ticketfolder/controller/TicketFolderController.java

@@ -0,0 +1,45 @@
+package project.backend.domain.ticketfolder.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import project.backend.domain.ticket.dto.TicketCreateDto;
+import project.backend.domain.ticket.entity.Ticket;
+import project.backend.domain.ticketfolder.dto.TicketFolderCreateDto;
+import project.backend.domain.ticketfolder.dto.TicketFolderRetrieveDto;
+import project.backend.domain.ticketfolder.entity.TicketFolder;
+import project.backend.domain.ticketfolder.mapper.TicketFolderMapper;
+import project.backend.domain.ticketfolder.service.TicketFolderService;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(tags = "TicketFolder - 티켓 폴더")
+@RestController
+@RequestMapping("/api/ticket-folders")
+@RequiredArgsConstructor
+public class TicketFolderController {
+    private final TicketFolderService ticketFolderService;
+    private final TicketFolderMapper ticketFolderMapper;
+
+    @ApiOperation(value = "티켓 폴더 리스트 조회")
+    @PreAuthorize("isAuthenticated()")
+    @GetMapping
+    public ResponseEntity list() {
+        List<TicketFolder> ticketFolderList = ticketFolderService.getTicketFolderList();
+        List<TicketFolderRetrieveDto> ticketFolderRetrieveDtoList = ticketFolderMapper.ticketFolderToTicketFolderRetrieveDto(ticketFolderList);
+        return ResponseEntity.status(HttpStatus.OK).body(ticketFolderRetrieveDtoList);
+    }
+
+    @ApiOperation(value = "티켓 폴더 생성")
+    @PreAuthorize("isAuthenticated()")
+    @PostMapping
+    public ResponseEntity create(@Valid @RequestBody TicketFolderCreateDto ticketFolderCreateDto) {
+        TicketFolder ticketFolder = ticketFolderService.createTicketFolder(ticketFolderCreateDto);
+        return ResponseEntity.status(HttpStatus.CREATED).body(ticketFolderMapper.ticketFolderToTicketFolderRetrieveDto(ticketFolder));
+    }
+}

src/main/java/project/backend/domain/ticketfolder/dto/TicketFolderCreateDto.java

@@ -0,0 +1,22 @@
+package project.backend.domain.ticketfolder.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TicketFolderCreateDto {
+    @NotBlank
+    @NotNull(message = "티켓 폴더의 제목을 입력해주세요")
+    @Size(min = 1, max = 12, message = "1자 ~ 12자 사이만 입력 가능합니다.")
+    @Schema(description = "제목", example = "서울 공연", required = true)
+    public String title;
+}

src/main/java/project/backend/domain/ticketfolder/dto/TicketFolderRetrieveDto.java

@@ -0,0 +1,14 @@
+package project.backend.domain.ticketfolder.dto;
+
+import lombok.*;
+
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TicketFolderRetrieveDto {
+    public Long id;
+    public String title;
+}