공연 등록 테스트 및 리팩토링

src/main/java/com/jummi/ticket/common/adapter/persistence/BaseEntity.java

@@ -0,0 +1,29 @@
+package com.jummi.ticket.common.adapter.persistence;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Column;
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@EntityListeners(AuditingEntityListener.class)
+@MappedSuperclass
+public abstract class BaseEntity {
+    @CreatedDate
+    @Column(updatable = false)
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+
+    @Column(columnDefinition = "boolean default false")
+    private boolean isDeleted;
+}

src/main/java/com/jummi/ticket/config/jpa/JpaConfiguration.java

@@ -0,0 +1,9 @@
+package com.jummi.ticket.config.jpa;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@EnableJpaAuditing
+@Configuration
+public class JpaConfiguration {
+}

src/main/java/com/jummi/ticket/performance/adapter/persistence/PerformanceAdapter.java

@@ -1,20 +1,19 @@
 package com.jummi.ticket.performance.adapter.persistence;
 
-import com.jummi.ticket.performance.application.port.out.SavePerformancePort;
+import com.jummi.ticket.performance.application.port.out.SavePerformanceCommand;
 import com.jummi.ticket.performance.converter.PerformanceMapper;
 import com.jummi.ticket.performance.domain.Performance;
 import com.jummi.ticket.performance.domain.Series;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
-@Component
+@Repository
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
-class PerformanceAdapter implements SavePerformancePort {
+class PerformanceAdapter implements SavePerformanceCommand {
     private final PerformanceMapper mapper;
     private final PerformanceRepository performanceRepository;
     private final SeriesRepository seriesRepository;
@@ -24,14 +23,10 @@ class PerformanceAdapter implements SavePerformancePort {
     public Long savePerformance(Performance performance, List<Series> series) {
         PerformanceEntity performanceEntity = mapper.convertDomainEntityToJpaEntity(performance);
         PerformanceEntity saved = performanceRepository.save(performanceEntity);
-        Long performanceId = saved.getPerformanceId();
 
-        List<SeriesEntity> seriesEntities = series.stream()
-                .map(mapper::convertDomainEntityToJpaEntity)
-                .collect(Collectors.toList());
-        seriesEntities.forEach(seriesEntity -> seriesEntity.setPerformanceId(performanceId));
+        List<SeriesEntity> seriesEntities = mapper.convertDomainEntitiesToJpaEntities(series, saved);
         seriesRepository.saveAll(seriesEntities);
 
-        return performanceId;
+        return saved.getPerformanceId();
     }
 }

src/main/java/com/jummi/ticket/performance/adapter/persistence/PerformanceEntity.java

@@ -1,22 +1,25 @@
 package com.jummi.ticket.performance.adapter.persistence;
 
+import com.jummi.ticket.common.adapter.persistence.BaseEntity;
 import com.jummi.ticket.performance.domain.Genre;
+import com.jummi.ticket.performance.domain.ReservationSite;
 import lombok.*;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 @Getter
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "performance")
+@Where(clause = "is_deleted = false")
+@SQLDelete(sql = "UPDATE performance SET is_deleted = true WHERE performance_id = ?")
 @Entity
-public class PerformanceEntity {
+public class PerformanceEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long performanceId;
@@ -32,26 +35,12 @@ public class PerformanceEntity {
 
     private String venue;
 
-    @ElementCollection
-    @CollectionTable(
-            name = "series",
-            joinColumns = @JoinColumn(name = "performance_id")
-    )
-    private List<SeriesEntity> series = new ArrayList<>();
-
-    @ElementCollection
-    @Column(name = "casts")
-    private List<String> casts = new ArrayList<>();
-
     private int runTime;
 
     private int minAvailableAge;
 
     @Enumerated(EnumType.STRING)
-    @ElementCollection
-    @CollectionTable(
-            name = "reservation_sites",
-            joinColumns = @JoinColumn(name = "performance_id")
-    )
-    private Set<ReservationSiteEntity> reservationSites = new HashSet<>();
+    @ElementCollection(targetClass = ReservationSite.class)
+    @CollectionTable
+    private Set<ReservationSite> reservationSites;
 }

src/main/java/com/jummi/ticket/performance/adapter/persistence/SeriesEntity.java

@@ -1,20 +1,40 @@
 package com.jummi.ticket.performance.adapter.persistence;
 
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import com.jummi.ticket.common.adapter.persistence.BaseEntity;
+import lombok.*;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
-import javax.persistence.Embeddable;
+import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.List;
 
-@Embeddable
+@Getter
+@Builder
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class SeriesEntity {
+@Table(name = "series")
+@Where(clause = "is_deleted = false")
+@SQLDelete(sql = "UPDATE series SET is_deleted = true WHERE series_id = ?")
+@Entity
+public class SeriesEntity extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long seriesId;
+
     @Setter
-    private Long performanceId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "performance_id")
+    private PerformanceEntity performance;
+
     private LocalDate playDate;
+
     private LocalTime playTime;
+
+    @ElementCollection
+    @Column(name = "casts")
+    private List<String> casts;
+
     private boolean isPerformed;
 }

src/main/java/com/jummi/ticket/performance/adapter/persistence/SeriesRepository.java

@@ -2,5 +2,5 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface SeriesRepository extends JpaRepository<SeriesEntity, Long> {
+interface SeriesRepository extends JpaRepository<SeriesEntity, Long> {
 }

src/main/java/com/jummi/ticket/performance/adapter/web/RegisterPerformanceController.java

@@ -1,8 +1,6 @@
 package com.jummi.ticket.performance.adapter.web;
 
-import com.jummi.ticket.performance.application.port.in.RegisterPerformanceCommand;
-import com.jummi.ticket.performance.application.port.in.RegisterPerformanceRequest;
-import com.jummi.ticket.performance.domain.PerformanceId;
+import com.jummi.ticket.performance.application.port.in.RegisterPerformanceUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,14 +15,14 @@
 @RequestMapping("/api/performances")
 @RestController
 class RegisterPerformanceController {
-    private final RegisterPerformanceCommand registerPerformanceCommand;
+    private final RegisterPerformanceUseCase registerPerformanceUseCase;
 
     @PostMapping
     ResponseEntity<Void> registerPerformance(@RequestBody @Valid RegisterPerformanceRequest request) {
-        PerformanceId performanceId = registerPerformanceCommand.registerPerformance(request);
+        Long performanceId = registerPerformanceUseCase.registerPerformance(request);
 
         return ResponseEntity.created(
-                        URI.create("/api/performances/" + performanceId.id()))
+                        URI.create("/api/performances/" + performanceId))
                 .build();
     }
 }

src/main/java/com/jummi/ticket/performance/application/port/in/RegisterPerformanceRequest.java → src/main/java/com/jummi/ticket/performance/adapter/web/RegisterPerformanceRequest.java

@@ -1,4 +1,4 @@
-package com.jummi.ticket.performance.application.port.in;
+package com.jummi.ticket.performance.adapter.web;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -35,9 +35,6 @@ public class RegisterPerformanceRequest {
     @NotNull
     private final List<SeriesRequest> series;
 
-    @NotBlank
-    private final List<String> casts;
-
     @Positive
     private final int runTime;
 

src/main/java/com/jummi/ticket/performance/application/port/in/SeriesRequest.java → src/main/java/com/jummi/ticket/performance/adapter/web/SeriesRequest.java

@@ -1,12 +1,14 @@
-package com.jummi.ticket.performance.application.port.in;
+package com.jummi.ticket.performance.adapter.web;
 
 import lombok.Builder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Builder
 @RequiredArgsConstructor
@@ -16,5 +18,8 @@ public class SeriesRequest {
     @DateTimeFormat(pattern = "yyyyMMddHHmm")
     private final LocalDateTime dateTime;
 
+    @NotBlank
+    private final List<String> casts;
+
     private final boolean isPerformed;
 }

src/main/java/com/jummi/ticket/performance/application/port/in/RegisterPerformanceUseCase.java

@@ -0,0 +1,7 @@
+package com.jummi.ticket.performance.application.port.in;
+
+import com.jummi.ticket.performance.adapter.web.RegisterPerformanceRequest;
+
+public interface RegisterPerformanceUseCase {
+    Long registerPerformance(RegisterPerformanceRequest request);
+}

src/main/java/com/jummi/ticket/performance/application/port/out/SavePerformancePort.java → src/main/java/com/jummi/ticket/performance/application/port/out/SavePerformanceCommand.java

@@ -5,6 +5,6 @@
 
 import java.util.List;
 
-public interface SavePerformancePort {
+public interface SavePerformanceCommand {
     Long savePerformance(Performance performance, List<Series> series);
 }

src/main/java/com/jummi/ticket/performance/application/service/RegisterPerformanceService.java

@@ -1,11 +1,10 @@
 package com.jummi.ticket.performance.application.service;
 
-import com.jummi.ticket.performance.application.port.in.RegisterPerformanceCommand;
-import com.jummi.ticket.performance.application.port.in.RegisterPerformanceRequest;
-import com.jummi.ticket.performance.application.port.out.SavePerformancePort;
+import com.jummi.ticket.performance.adapter.web.RegisterPerformanceRequest;
+import com.jummi.ticket.performance.application.port.in.RegisterPerformanceUseCase;
+import com.jummi.ticket.performance.application.port.out.SavePerformanceCommand;
 import com.jummi.ticket.performance.converter.PerformanceMapper;
 import com.jummi.ticket.performance.domain.Performance;
-import com.jummi.ticket.performance.domain.PerformanceId;
 import com.jummi.ticket.performance.domain.Series;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -14,16 +13,15 @@
 
 @RequiredArgsConstructor
 @Service
-public class RegisterPerformanceService implements RegisterPerformanceCommand {
+public class RegisterPerformanceService implements RegisterPerformanceUseCase {
     private final PerformanceMapper mapper;
-    private final SavePerformancePort savePerformancePort;
+    private final SavePerformanceCommand savePerformanceCommand;
 
     @Override
-    public PerformanceId registerPerformance(RegisterPerformanceRequest request) {
+    public Long registerPerformance(RegisterPerformanceRequest request) {
         Performance performance = mapper.convertRequestToDomainEntity(request);
         List<Series> series = mapper.extractSeriesDomainEntity(request);
-        Long performanceId = savePerformancePort.savePerformance(performance, series);
 
-        return new PerformanceId(performanceId);
+        return savePerformanceCommand.savePerformance(performance, series);
     }
 }