Merge pull request #220 from boostcampwm-2024/feat/#219-divide-authService

AuthService 속 함수들 책임 분리

Author: KWAKMANBO

back/src/auth/service/auth.service.ts

@@ -47,17 +47,6 @@ export class AuthService {
     this.redis.set(`user:${sid}`, JSON.stringify({ ...session, userStatus: USER_STATUS.ADMIN }));
   }
 
-  async setUserEventTarget(sid: string, eventId: number) {
-    const session = JSON.parse(await this.redis.get(`user:${sid}`));
-
-    this.redis.set(`user:${sid}`, JSON.stringify({ ...session, targetEvent: eventId }));
-  }
-
-  async getUserEventTarget(sid: string) {
-    const session = JSON.parse(await this.redis.get(`user:${sid}`));
-    return session.targetEvent;
-  }
-
   async removeSession(sid: string, loginId: string) {
     this.redis.unlink(`user-id:${loginId}`);
     return this.redis.unlink(`user:${sid}`);

back/src/domains/booking/booking.module.ts

@@ -4,6 +4,7 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
 import { AuthModule } from '../../auth/auth.module';
 import { EventModule } from '../event/event.module';
 import { PlaceModule } from '../place/place.module';
+import { UserModule } from '../user/user.module';
 
 import { BookingController } from './controller/booking.controller';
 import { BookingSeatsService } from './service/booking-seats.service';
@@ -13,7 +14,7 @@ import { OpenBookingService } from './service/open-booking.service';
 import { WaitingQueueService } from './service/waiting-queue.service';
 
 @Module({
-  imports: [EventEmitterModule.forRoot(), EventModule, AuthModule, PlaceModule],
+  imports: [EventEmitterModule.forRoot(), EventModule, AuthModule, PlaceModule, UserModule],
   controllers: [BookingController],
   providers: [BookingService, InBookingService, OpenBookingService, BookingSeatsService, WaitingQueueService],
   exports: [InBookingService],

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

@@ -11,6 +11,7 @@ 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';
 import { SeatStatus } from '../const/seatStatus.enum';
@@ -37,6 +38,7 @@ export class BookingSeatsService {
     private inBookingService: InBookingService,
     private authService: AuthService,
     private eventEmitter: EventEmitter2,
+    private readonly userService: UserService,
   ) {
     this.redis = this.redisService.getOrThrow();
   }
@@ -57,7 +59,7 @@ export class BookingSeatsService {
   }
 
   async bookSeat(sid: string, target: [number, number]) {
-    const eventId = await this.authService.getUserEventTarget(sid);
+    const eventId = await this.userService.getUserEventTarget(sid);
     const bookedSeat = await this.inBookingService.getBookedSeats(sid);
     const bookingAmount = await this.inBookingService.getBookingAmount(sid);
     const bookedAmount = bookedSeat.length;
@@ -74,7 +76,7 @@ export class BookingSeatsService {
   }
 
   async unBookSeat(sid: string, target: [number, number]) {
-    const eventId = await this.authService.getUserEventTarget(sid);
+    const eventId = await this.userService.getUserEventTarget(sid);
     const bookedSeat = await this.inBookingService.getBookedSeats(sid);
     const bookedAmount = bookedSeat.length;
 

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

@@ -3,6 +3,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 
 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';
 
@@ -21,11 +22,12 @@ export class BookingService {
     private readonly inBookingService: InBookingService,
     private readonly openBookingService: OpenBookingService,
     private readonly waitingQueueService: WaitingQueueService,
+    private readonly userService: UserService,
   ) {}
 
   @OnEvent('seats-sse-close')
   async letInNextWaiting(event: { sid: string }) {
-    const eventId = await this.authService.getUserEventTarget(event.sid);
+    const eventId = await this.userService.getUserEventTarget(event.sid);
     if ((await this.waitingQueueService.getQueueSize(eventId)) < 1) {
       return;
     }
@@ -53,7 +55,7 @@ export class BookingService {
       throw new BadRequestException('이미 예약 마감된 이벤트입니다.');
     }
 
-    await this.authService.setUserEventTarget(sid, eventId);
+    await this.userService.setUserEventTarget(sid, eventId);
 
     return await this.getForwarded(sid);
   }

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

@@ -4,6 +4,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 import Redis from 'ioredis';
 
 import { AuthService } from '../../../auth/service/auth.service';
+import { UserService } from '../../user/service/user.service';
 
 type InBookingSession = {
   sid: string;
@@ -17,6 +18,7 @@ export class InBookingService {
   constructor(
     private readonly authService: AuthService,
     private redisService: RedisService,
+    private readonly userService: UserService,
   ) {
     this.redis = this.redisService.getOrThrow();
   }
@@ -104,7 +106,7 @@ export class InBookingService {
   }
 
   private getTargetEventId(sid: string) {
-    return this.authService.getUserEventTarget(sid);
+    return this.userService.getUserEventTarget(sid);
   }
 
   private getSessionKey(eventId: number, sid: string) {

back/src/domains/booking/service/waiting-queue.service.ts

@@ -5,6 +5,7 @@ import { BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { AuthService } from '../../../auth/service/auth.service';
+import { UserService } from '../../user/service/user.service';
 import { WAITING_BROADCAST_INTERVAL } from '../const/waitingBroadcastInterval.const';
 import { DEFAULT_WAITING_THROUGHPUT_RATE } from '../const/watingThroughputRate.const';
 import { WaitingSseDto } from '../dto/waitingSse.dto';
@@ -23,6 +24,7 @@ export class WaitingQueueService {
   constructor(
     private redisService: RedisService,
     private authService: AuthService,
+    private userService: UserService,
   ) {
     this.redis = this.redisService.getOrThrow();
   }
@@ -39,7 +41,7 @@ export class WaitingQueueService {
   }
 
   async pushQueue(sid: string) {
-    const eventId = await this.authService.getUserEventTarget(sid);
+    const eventId = await this.userService.getUserEventTarget(sid);
     if (!this.queueSubscriptionMap.get(eventId)) {
       await this.createQueueSubscription(eventId);
     }

back/src/domains/reservation/reservation.module.ts

@@ -22,6 +22,7 @@ import { ReservationService } from './service/reservation.service';
     PlaceModule,
     AuthModule,
     BookingModule,
+    UserModule,
   ],
   controllers: [ReservationController],
   providers: [ReservationService, ReservationRepository, ReservedSeatRepository],

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

@@ -11,6 +11,7 @@ import { Event } from '../../event/entity/event.entity';
 import { Place } from '../../place/entity/place.entity';
 import { Section } from '../../place/entity/section.entity';
 import { Program } from '../../program/entities/program.entity';
+import { UserService } from '../../user/service/user.service';
 import { ReservationCreateDto } from '../dto/reservationCreate.dto';
 import { ReservationIdDto } from '../dto/reservationId.dto';
 import { ReservationSeatInfoDto } from '../dto/reservationSeatInfo.dto';
@@ -30,6 +31,7 @@ export class ReservationService {
     @Inject() private readonly dataSource: DataSource,
     @Inject() private readonly authService: AuthService,
     @Inject() private readonly inBookingService: InBookingService,
+    @Inject() private readonly userService: UserService,
   ) {
     this.redis = this.redisService.getOrThrow();
   }
@@ -93,7 +95,7 @@ export class ReservationService {
     try {
       const session = await this.authService.getUserSession(sid);
       const userId = session.id;
-      const eventId = await this.authService.getUserEventTarget(sid);
+      const eventId = await this.userService.getUserEventTarget(sid);
       const { bookingAmount, bookedSeats } = await this.inBookingService.getBookAmountAndBookedSeats(
         sid,
         eventId,

back/src/domains/user/service/user.service.ts

@@ -141,4 +141,15 @@ export class UserService {
       throw new InternalServerErrorException('로그아웃에 실패하였습니다.');
     }
   }
+
+  async setUserEventTarget(sid: string, eventId: number) {
+    const session = JSON.parse(await this.redis.get(`user:${sid}`));
+
+    this.redis.set(`user:${sid}`, JSON.stringify({ ...session, targetEvent: eventId }));
+  }
+
+  async getUserEventTarget(sid: string) {
+    const session = JSON.parse(await this.redis.get(`user:${sid}`));
+    return session.targetEvent;
+  }
 }