Merge pull request #235 from boostcampwm-2024/feat/#234-collect-leaving-users-bookedseats

좌석 선택 중 이탈 시 좌석 회수

Author: kyu4583

back/src/domains/booking/service/booking.service.ts

@@ -9,6 +9,7 @@ import { UserService } from '../../user/service/user.service';
 import { BookingAdmissionStatusDto } from '../dto/bookingAdmissionStatus.dto';
 import { ServerTimeDto } from '../dto/serverTime.dto';
 
+import { BookingSeatsService } from './booking-seats.service';
 import { EnterBookingService } from './enter-booking.service';
 import { InBookingService } from './in-booking.service';
 import { OpenBookingService } from './open-booking.service';
@@ -24,6 +25,7 @@ export class BookingService {
     private readonly redisService: RedisService,
     private readonly eventService: EventService,
     private readonly authService: AuthService,
+    private readonly bookingSeatsService: BookingSeatsService,
     private readonly inBookingService: InBookingService,
     private readonly openBookingService: OpenBookingService,
     private readonly waitingQueueService: WaitingQueueService,
@@ -35,11 +37,25 @@ export class BookingService {
 
   @OnEvent('seats-sse-close')
   async onSeatsSseDisconnected(event: { sid: string }) {
-    const eventId = await this.userService.getUserEventTarget(event.sid);
-    await this.inBookingService.emitSession(event.sid);
+    const sid = event.sid;
+    const eventId = await this.userService.getUserEventTarget(sid);
+    await this.collectSeatsIfNotSaved(eventId, sid);
+    await this.inBookingService.emitSession(sid);
     await this.letInNextWaiting(eventId);
   }
 
+  private async collectSeatsIfNotSaved(eventId: number, sid: string) {
+    const inBookingSession = await this.inBookingService.getSession(eventId, sid);
+    if (inBookingSession && !inBookingSession.saved) {
+      const bookedSeats = inBookingSession.bookedSeats;
+      bookedSeats.forEach((seat) => {
+        this.bookingSeatsService.updateSeatDeleted(eventId, seat);
+      });
+      inBookingSession.bookedSeats = [];
+      await this.inBookingService.setSession(eventId, inBookingSession);
+    }
+  }
+
   @OnEvent('entering-sessions-gc')
   async onEnteringSessionsGc(event: { eventId: number }) {
     await this.letInNextWaiting(event.eventId);

back/src/domains/booking/service/in-booking.service.ts

@@ -10,6 +10,7 @@ type InBookingSession = {
   sid: string;
   bookingAmount: number;
   bookedSeats: [number, number][];
+  saved: boolean;
 };
 
 @Injectable()
@@ -61,6 +62,7 @@ export class InBookingService {
       sid,
       bookingAmount,
       bookedSeats: [],
+      saved: false,
     };
     await this.setSession(eventId, session);
     return true;
@@ -102,6 +104,19 @@ export class InBookingService {
     await this.setSession(eventId, session);
   }
 
+  async getIsSaved(sid: string) {
+    const eventId = await this.getTargetEventId(sid);
+    const session = await this.getSession(eventId, sid);
+    return session.saved;
+  }
+
+  async setIsSaved(sid: string, saved: boolean) {
+    const eventId = await this.getTargetEventId(sid);
+    const session = await this.getSession(eventId, sid);
+    session.saved = saved;
+    await this.setSession(eventId, session);
+  }
+
   async emitSession(sid: string) {
     const eventId = await this.getTargetEventId(sid);
     await this.removeInBooking(eventId, sid);
@@ -129,15 +144,15 @@ export class InBookingService {
     return `in-booking:${eventId}:sessions`;
   }
 
-  private async setSession(eventId: number, inBookingSession: InBookingSession): Promise<void> {
+  async setSession(eventId: number, inBookingSession: InBookingSession): Promise<void> {
     const sessionKey = this.getSessionKey(eventId, inBookingSession.sid);
     const eventKey = this.getEventKey(eventId);
 
     await this.redis.sadd(eventKey, inBookingSession.sid);
     await this.redis.set(sessionKey, JSON.stringify(inBookingSession));
   }
 
-  private async getSession(eventId: number, sid: string): Promise<InBookingSession | null> {
+  async getSession(eventId: number, sid: string): Promise<InBookingSession | null> {
     const session = await this.redis.get(this.getSessionKey(eventId, sid));
     return session ? JSON.parse(session) : null;
   }

back/src/domains/reservation/service/reservation.service.ts

@@ -134,6 +134,8 @@ export class ReservationService {
 
       await queryRunner.commitTransaction();
 
+      await this.inBookingService.setIsSaved(sid, true);
+
       return {
         programName: program.name,
         runningDate: event[0].runningDate,