remove pager gateway

This commit is contained in:
2025-12-12 15:50:03 +03:30
parent 19787ea52c
commit f57145edc2
3 changed files with 68 additions and 72 deletions
@@ -9,29 +9,28 @@ import {
} from '@nestjs/websockets';
import { Server, Socket } from 'socket.io';
import { Logger, UseGuards, Inject, forwardRef } from '@nestjs/common';
import { Pager } from './entities/pager.entity';
import { WsAdminAuthGuard, type AuthenticatedSocket } from './guards/ws-admin-auth.guard';
import { WsRestId } from './decorators/ws-rest-id.decorator';
import { PagerService } from './providers/pager.service';
import { WsAdminId } from './decorators/ws-admin-id.decorator';
import { PagerStatus } from './interface/pager';
import { NotificationService } from './services/notification.service';
import { WsAdminAuthGuard, type AuthenticatedSocket } from './guards/ws-admin-auth.guard';
@UseGuards(WsAdminAuthGuard)
@WebSocketGateway({
cors: {
origin: true,
credentials: true,
connectionGuard: WsAdminAuthGuard,
},
namespace: '/pager',
namespace: '/notifications',
})
export class PagerGateway implements OnGatewayConnection, OnGatewayDisconnect {
export class NotificationGateway implements OnGatewayConnection, OnGatewayDisconnect {
@WebSocketServer()
server!: Server;
private readonly logger = new Logger(PagerGateway.name);
private readonly logger = new Logger(NotificationGateway.name);
constructor(
@Inject(forwardRef(() => PagerService))
private readonly pagerService: PagerService,
@Inject(forwardRef(() => NotificationService))
private readonly notificationService: NotificationService,
) {}
handleConnection(client: Socket) {
@@ -184,62 +183,62 @@ export class PagerGateway implements OnGatewayConnection, OnGatewayDisconnect {
}
}
/**
* Emit pager created event to restaurant room
*/
emitPagerCreated(pager: Pager) {
const room = `restaurant:${pager.restaurant.id}`;
this.server.to(room).emit('pager:created', {
pager: {
id: pager.id,
tableNumber: pager.tableNumber,
message: pager.message,
status: pager.status,
createdAt: pager.createdAt,
user: pager.user
? {
id: pager.user.id,
firstName: pager.user.firstName,
lastName: pager.user.lastName,
}
: null,
},
});
this.logger.log(`Emitted pager:created to room: ${room}`);
}
// /**
// * Emit pager created event to restaurant room
// */
// emitPagerCreated(pager: Pager) {
// const room = `restaurant:${pager.restaurant.id}`;
// this.server.to(room).emit('pager:created', {
// pager: {
// id: pager.id,
// tableNumber: pager.tableNumber,
// message: pager.message,
// status: pager.status,
// createdAt: pager.createdAt,
// user: pager.user
// ? {
// id: pager.user.id,
// firstName: pager.user.firstName,
// lastName: pager.user.lastName,
// }
// : null,
// },
// });
// this.logger.log(`Emitted pager:created to room: ${room}`);
// }
/**
* Emit pager status updated event to both restaurant and cookie rooms
*/
emitPagerStatusUpdated(pager: Pager) {
const restaurantRoom = `restaurant:${pager.restaurant.id}`;
const cookieRoom = `cookie:${pager.cookieId}`;
// /**
// * Emit pager status updated event to both restaurant and cookie rooms
// */
// emitPagerStatusUpdated(pager: Pager) {
// const restaurantRoom = `restaurant:${pager.restaurant.id}`;
// const cookieRoom = `cookie:${pager.cookieId}`;
const pagerData = {
id: pager.id,
tableNumber: pager.tableNumber,
message: pager.message,
status: pager.status,
updatedAt: pager.updatedAt,
staff: pager.staff
? {
id: pager.staff.id,
firstName: pager.staff.firstName,
lastName: pager.staff.lastName,
}
: null,
};
// const pagerData = {
// id: pager.id,
// tableNumber: pager.tableNumber,
// message: pager.message,
// status: pager.status,
// updatedAt: pager.updatedAt,
// staff: pager.staff
// ? {
// id: pager.staff.id,
// firstName: pager.staff.firstName,
// lastName: pager.staff.lastName,
// }
// : null,
// };
// Emit to restaurant room (admin/staff)
this.server.to(restaurantRoom).emit('pager:status:updated', {
pager: pagerData,
});
this.logger.log(`Emitted pager:status:updated to room: ${restaurantRoom}`);
// // Emit to restaurant room (admin/staff)
// this.server.to(restaurantRoom).emit('pager:status:updated', {
// pager: pagerData,
// });
// this.logger.log(`Emitted pager:status:updated to room: ${restaurantRoom}`);
// Emit to cookie room (public user)
this.server.to(cookieRoom).emit('pager:status:updated', {
pager: pagerData,
});
this.logger.log(`Emitted pager:status:updated to room: ${cookieRoom}`);
}
// // Emit to cookie room (public user)
// this.server.to(cookieRoom).emit('pager:status:updated', {
// pager: pagerData,
// });
// this.logger.log(`Emitted pager:status:updated to room: ${cookieRoom}`);
// }
}
+1 -3
View File
@@ -5,12 +5,10 @@ import { MikroOrmModule } from '@mikro-orm/nestjs';
import { Pager } from './entities/pager.entity';
import { JwtModule } from '@nestjs/jwt';
import { RolesModule } from '../roles/roles.module';
import { PagerGateway } from './pager.gateway';
@Module({
imports: [MikroOrmModule.forFeature([Pager]), JwtModule, RolesModule],
controllers: [PagerController],
providers: [PagerService, PagerGateway],
exports: [PagerGateway],
providers: [PagerService],
})
export class PagerModule {}
+4 -5
View File
@@ -7,14 +7,13 @@ import { Pager } from '../entities/pager.entity';
import { PagerStatus } from '../interface/pager';
import { ulid } from 'ulid';
import { Admin } from '../../admin/entities/admin.entity';
import { PagerGateway } from '../pager.gateway';
@Injectable()
export class PagerService {
constructor(
private readonly em: EntityManager,
@Inject(forwardRef(() => PagerGateway))
private readonly pagerGateway: PagerGateway,
// @Inject(forwardRef(() => PagerGateway))
// private readonly pagerGateway: PagerGateway,
) {}
async create(
@@ -69,7 +68,7 @@ export class PagerService {
await this.em.populate(pager, ['restaurant', 'user']);
// Emit socket event for new pager
this.pagerGateway.emitPagerCreated(pager);
// this.pagerGateway.emitPagerCreated(pager);
return pager;
}
@@ -107,7 +106,7 @@ export class PagerService {
await this.em.populate(pager, ['restaurant', 'staff', 'user']);
// Emit socket event for status update
this.pagerGateway.emitPagerStatusUpdated(pager);
// this.pagerGateway.emitPagerStatusUpdated(pager);
return pager;
}