Merge branch 'dev'

Author: Donggle0315

README.md

@@ -1,15 +1,26 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, Unique } from 'typeorm';
+import {
+  Column,
+  DeleteDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  Unique,
+} from 'typeorm';
 
 import { Event } from '../../event/entity/event.entity';
 
 import { Reservation } from './reservation.entity';
 
 @Entity({ name: 'Reserved_Seat' })
-@Unique(['row', 'col', 'sectionName', 'event'])
+@Unique(['row', 'col', 'sectionName', 'event', 'deletedAt'])
 export class ReservedSeat {
   @PrimaryGeneratedColumn('increment')
   id: number;
 
+  @DeleteDateColumn({ type: 'timestamp', name: 'deleted_at', nullable: true })
+  deletedAt: Date;
+
   @Column({ type: 'varchar', length: 255, name: 'section_name' })
   sectionName: string;
 

back/src/domains/reservation/entity/reservedSeat.entity.ts

@@ -1,12 +1,18 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { MoreThanOrEqual, Repository } from 'typeorm';
+import { DataSource, MoreThanOrEqual, Repository } from 'typeorm';
 
 import { Reservation } from '../entity/reservation.entity';
 
+import { ReservedSeatRepository } from './reservedSeat.repository';
+
 @Injectable()
 export class ReservationRepository {
-  constructor(@InjectRepository(Reservation) private ReservationRepository: Repository<Reservation>) {}
+  constructor(
+    @InjectRepository(Reservation) private ReservationRepository: Repository<Reservation>,
+    private readonly reservedSeatRepository: ReservedSeatRepository,
+    private readonly dataSource: DataSource,
+  ) {}
 
   async selectAllReservationAfterNowByUserWithAll(userId: number): Promise<Reservation[]> {
     return await this.ReservationRepository.find({
@@ -28,9 +34,12 @@ export class ReservationRepository {
   }
 
   async deleteReservationByIdMatchedUserId(userId: number, reservationId: number) {
-    return await this.ReservationRepository.softDelete({
-      id: reservationId,
-      user: { id: userId },
+    await this.dataSource.transaction(async () => {
+      await this.reservedSeatRepository.deleteReservedSeatByReservation(reservationId);
+      await this.ReservationRepository.softDelete({
+        id: reservationId,
+        user: { id: userId },
+      });
     });
   }
 

back/src/domains/reservation/repository/reservation.repository.ts

@@ -12,4 +12,10 @@ export class ReservedSeatRepository {
     const reservedSeat = this.reservedSeatRepository.create(reservedSeatData);
     return this.reservedSeatRepository.save(reservedSeat);
   }
+
+  async deleteReservedSeatByReservation(reservationId: number) {
+    return await this.reservedSeatRepository.softDelete({
+      reservation: { id: reservationId },
+    });
+  }
 }