Merge pull request #248 from boostcampwm-2024/feat/#243-close-event

예매 마감 로직

Author: kyu4583

back/package-lock.json

@@ -38,6 +38,7 @@
     "class-validator": "^0.14.1",
     "connect-redis": "^7.1.1",
     "cookie-parser": "^1.4.7",
+    "cron": "^3.1.7",
     "dotenv": "^16.4.5",
     "express-session": "^1.18.1",
     "ioredis": "^5.4.1",

back/package.json

@@ -10,7 +10,7 @@ const ormConfig: TypeOrmModuleOptions = {
   entities: [__dirname + '/../**/*.entity{.ts,.js}'],
   synchronize: process.env.DATABASE_SYNCHRONIZE === 'true',
   charset: 'utf8mb4',
-  timezone: 'z',
+  timezone: '+09:00',
 };
 
 export default ormConfig;

back/src/config/typeOrmConfig.ts

@@ -0,0 +1 @@
+export const ONE_MINUTE_BEFORE_THE_HOUR = '0 59 * * * *';

back/src/domains/booking/const/cronExpressions.const.ts

@@ -193,6 +193,6 @@ export class BookingController {
   @ApiOkResponse({ description: '확인 및 오픈 완료' })
   @ApiUnauthorizedResponse({ description: '인증 실패' })
   async reloadOpenTarget() {
-    await this.openBookingService.checkAndOpenReservations();
+    await this.openBookingService.scheduleUpcomingReservations();
   }
 }

back/src/domains/booking/controller/booking.controller.ts

@@ -10,7 +10,6 @@ import Redis from 'ioredis';
 import { BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { AuthService } from '../../../auth/service/auth.service';
 import { UserService } from '../../user/service/user.service';
 import { SEATS_BROADCAST_INTERVAL } from '../const/seatsBroadcastInterval.const';
 import { SEATS_SSE_RETRY_TIME } from '../const/seatsSseRetryTime.const';
@@ -36,7 +35,6 @@ export class BookingSeatsService {
   constructor(
     private redisService: RedisService,
     private inBookingService: InBookingService,
-    private authService: AuthService,
     private eventEmitter: EventEmitter2,
     private readonly userService: UserService,
   ) {
@@ -58,6 +56,18 @@ export class BookingSeatsService {
     this.seatsSubscriptionMap.set(eventId, subscription);
   }
 
+  async clearSeatsSubscription(eventId: number) {
+    const subscription = this.seatsSubscriptionMap.get(eventId);
+    if (subscription) {
+      subscription.complete();
+      this.seatsSubscriptionMap.delete(eventId);
+    }
+    const keys = await this.redis.keys(`event:${eventId}:*`);
+    if (keys.length > 0) {
+      await this.redis.unlink(...keys);
+    }
+  }
+
   async bookSeat(sid: string, target: [number, number]) {
     const eventId = await this.userService.getUserEventTarget(sid);
     const bookedSeat = await this.inBookingService.getBookedSeats(sid);

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

@@ -4,7 +4,6 @@ import { OnEvent } from '@nestjs/event-emitter';
 import Redis from 'ioredis';
 
 import { AuthService } from '../../../auth/service/auth.service';
-import { EventService } from '../../event/service/event.service';
 import { UserService } from '../../user/service/user.service';
 import { BookingAdmissionStatusDto } from '../dto/bookingAdmissionStatus.dto';
 import { ServerTimeDto } from '../dto/serverTime.dto';
@@ -15,15 +14,12 @@ import { InBookingService } from './in-booking.service';
 import { OpenBookingService } from './open-booking.service';
 import { WaitingQueueService } from './waiting-queue.service';
 
-const OFFSET = 1000 * 60 * 60 * 9;
-
 @Injectable()
 export class BookingService {
   private logger = new Logger(BookingService.name);
   private readonly redis: Redis | null;
   constructor(
     private readonly redisService: RedisService,
-    private readonly eventService: EventService,
     private readonly authService: AuthService,
     private readonly bookingSeatsService: BookingSeatsService,
     private readonly inBookingService: InBookingService,
@@ -39,9 +35,11 @@ export class BookingService {
   async onSeatsSseDisconnected(event: { sid: string }) {
     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);
+    if (await this.openBookingService.isEventOpened(eventId)) {
+      await this.collectSeatsIfNotSaved(eventId, sid);
+      await this.inBookingService.emitSession(sid);
+      await this.letInNextWaiting(eventId);
+    }
   }
 
   private async collectSeatsIfNotSaved(eventId: number, sid: string) {
@@ -100,17 +98,9 @@ export class BookingService {
 
   // 함수 이름 생각하기
   async isAdmission(eventId: number, sid: string): Promise<BookingAdmissionStatusDto> {
-    // eventId를 받아서 해당 이벤트가 존재하는지 확인한다.
-    const event = await this.eventService.findEvent({ eventId });
-    const now = new Date(Date.now() + OFFSET);
     const isOpened = await this.openBookingService.isEventOpened(eventId);
-
     if (!isOpened) {
-      throw new BadRequestException('아직 예약이 오픈되지 않았습니다.');
-    } else if (now >= event.reservationCloseDate) {
-      //event 시간 확인 이벤트 종료시간 이후인지
-      // 예약 시간이 아닙니다.
-      throw new BadRequestException('이미 예약 마감된 이벤트입니다.');
+      throw new BadRequestException('예약이 오픈되지 않았습니다.');
     }
 
     await this.userService.setUserEventTarget(sid, eventId);

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

@@ -1,6 +1,7 @@
 import { RedisService } from '@liaoliaots/nestjs-redis';
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
+import { SchedulerRegistry } from '@nestjs/schedule';
 import Redis from 'ioredis';
 
 import { UserService } from '../../user/service/user.service';
@@ -13,15 +14,30 @@ export class EnterBookingService {
     private readonly redisService: RedisService,
     private readonly userService: UserService,
     private readonly eventEmitter: EventEmitter2,
+    private readonly schedulerRegistry: SchedulerRegistry,
   ) {
     this.redis = this.redisService.getOrThrow();
   }
 
   async gcEnteringSessions(eventId: number) {
-    setInterval(() => {
+    this.deleteIntervalIfExists(`gc-entering-${eventId}`);
+
+    const interval = setInterval(() => {
       this.removeExpiredSessions(eventId);
       this.eventEmitter.emit('entering-sessions-gc', { eventId });
     }, ENTERING_GC_INTERVAL);
+
+    this.schedulerRegistry.addInterval(`gc-entering-${eventId}`, interval);
+  }
+
+  clearGCInterval(eventId: number) {
+    this.deleteIntervalIfExists(`gc-entering-${eventId}`);
+  }
+
+  private deleteIntervalIfExists(intervalName: string) {
+    if (this.schedulerRegistry.doesExist('interval', intervalName)) {
+      this.schedulerRegistry.deleteInterval(intervalName);
+    }
   }
 
   async addEnteringSession(sid: string) {
@@ -64,4 +80,16 @@ export class EnterBookingService {
     const expiryTimestamp = Date.now() - ENTERING_SESSION_EXPIRY;
     await this.redis.zremrangebyscore(`entering:${eventId}`, 0, expiryTimestamp);
   }
+
+  async getAllEnteringSids(eventId: number) {
+    return this.redis.zrange(`entering:${eventId}`, 0, -1);
+  }
+
+  async clearEnteringPool(eventId: number) {
+    this.clearGCInterval(eventId);
+    const keys = await this.redis.keys('entering:*');
+    if (keys.length > 0) {
+      await this.redis.unlink(...keys);
+    }
+  }
 }

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

@@ -179,4 +179,15 @@ export class InBookingService {
       bookedSeats: session.bookedSeats,
     };
   }
+
+  async getAllInBookingSids(eventId: number) {
+    return this.redis.smembers(this.getEventKey(eventId));
+  }
+
+  async clearInBookingPool(eventId: number) {
+    const keys = await this.redis.keys(`in-booking:${eventId}:*`);
+    if (keys.length > 0) {
+      await this.redis.unlink(...keys);
+    }
+  }
 }