Finish notifications (#88)

backend/code/src/auth/auth.controller.ts

@@ -8,7 +8,7 @@ import {
  Res,
  HttpCode,
  HttpStatus,
- Param
+ Param,
 } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { AuthDto } from './dto/auth.dto';
@@ -110,12 +110,7 @@ export class AuthController {
  }
 
  @Get('validatToken/:token')
- async validatToken(
- @Param('token') token: string,
- @Res({ passthrough: true }) res: Response,
- ) {
+ async validatToken(@Param('token') token: string) {
  return this.authService.checkToken(token);
  }
 }
-
-

backend/code/src/auth/auth.service.ts

@@ -107,17 +107,14 @@ export class AuthService {
  return { isValid };
  }
 
-
- async checkToken(tfaToken: string)
- {
+ async checkToken(tfaToken: string) {
  const user = await this.prisma.user.findUnique({
  where: { tfaToken },
  select: {
- tfaToken: true
+  tfaToken: true,
  },
  });
- if(!user)
- return false;
- return true; 
+ if (!user) return false;
+ return true;
  }
 }

backend/code/src/game/game.service.ts

@@ -19,13 +19,12 @@ export class GameService {
  handleGameStartEvent(client: Socket) {
  const index = this.waitingPlayers.find((player) => {
  return player.data.user.sub === client.data.user.sub;
- }
- );
+ });
  if (index) {
  console.log('client already in the queue');
  return;
  }
- 
+
  this.waitingPlayers.push(client);
  console.log('client subscribed to the queue');
  }

backend/code/src/game/game.ts

@@ -2,33 +2,34 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Server, Socket } from 'socket.io';
 
 export class Game {
- constructor(private readonly eventEmitter: EventEmitter2 , private readonly server: Server) {}
+ constructor(
+ private readonly eventEmitter: EventEmitter2,
+ private readonly server: Server,
+ ) {}
  private async loop() {
-
  console.log('loop');
  await this.sleep(5000);
 
  this.loop();
  }
 
-
- private async sleepCounter(){
+ private async sleepCounter() {
  let timer = 3000;
 
  for (let i = 0; i < 4; i++) {
- await new Promise(resolve => setTimeout(resolve, 1000));
- this.server.emit("timer", timer);
+ await new Promise((resolve) => setTimeout(resolve, 1000));
+ this.server.emit('timer', timer);
  timer -= 1000;
  }
  }
  async start(ngameid: string) {
  console.log('game started', ngameid);
  this.gameid = ngameid;
- await this.sleepCounter()
+ await this.sleepCounter();
  this.loop();
  }
 
- setplayerScokets(p1socket: Socket, p2socket: Socket ) {
+ setplayerScokets(p1socket: Socket, p2socket: Socket) {
  this.p1socket = p1socket;
  this.p2socket = p2socket;
  this.p1socket.on('up', (data) => {

backend/code/src/gateways/gateways.gateway.ts

@@ -13,7 +13,6 @@ import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { Game } from 'src/game/game';
 import { $Enums, Notification } from '@prisma/client';
-import { Client } from 'socket.io/dist/client';
 
 @WebSocketGateway(3004, {
  cors: {
@@ -165,7 +164,10 @@ export class Gateways implements OnGatewayConnection, OnGatewayDisconnect {
  });
 
  roomMembers = roomMembers.filter(
- (member) => member.userId !== message.authorId && member.userId !== notif.actorId && !member.is_banned,
+ (member) =>
+ member.userId !== message.authorId &&
+ member.userId !== notif.actorId &&
+ !member.is_banned,
  );
 
  const clientsSockets = await this.server
@@ -211,7 +213,7 @@ export class Gateways implements OnGatewayConnection, OnGatewayDisconnect {
  clients.forEach((client: any) => {
  client.join(game_channel);
  });
- const new_game = new Game(this.eventEmitter , this.server);
+ const new_game = new Game(this.eventEmitter, this.server);
  new_game.setplayerScokets(clients[0], clients[1]);
  new_game.start(game_channel);
  this.games_map.set(game_channel, new_game);
@@ -227,23 +229,21 @@ export class Gateways implements OnGatewayConnection, OnGatewayDisconnect {
  }
 
  @SubscribeMessage('joinRoom')
- async handleJoinRoomEvent(client: Socket,  data: any) {
- const userId = client.data.user.sub; 
+ async handleJoinRoomEvent(client: Socket, data: any) {
+ const userId = client.data.user.sub;
  const member = await this.prisma.roomMember.findFirst({
  where: {
  userId: data.memberId,
  roomId: data.roomId,
  },
  });
  if (member && !member.is_banned && userId === data.memberId) {
-  client.join(`Room:${data.roomId}`);
+ client.join(`Room:${data.roomId}`);
  }
-
  }
 
  @SubscribeMessage('PingOnline')
  async handlePingOnlineEvent(client: Socket, data: any) {
- const userId = client.data.user.sub;
  const friendId = data.friendId;
  if (this.server.sockets.adapter.rooms.get(`User:${friendId}`)?.size) {
  client.emit('friendOnline', friendId);
@@ -283,7 +283,9 @@ export class Gateways implements OnGatewayConnection, OnGatewayDisconnect {
  async hundleDeparture(
  @MessageBody() data: { roomId: string; memberId: string; type: string },
  ) {
- const clients = await this.server.in(`User:${data.memberId}`).fetchSockets();
+ const clients = await this.server
+ .in(`User:${data.memberId}`)
+ .fetchSockets();
  const clientsToBan = clients.filter(
  (client) => client.data.user.sub === data.memberId,
  );

backend/code/src/profile/profile.controller.ts

@@ -99,10 +99,41 @@ export class ProfileController {
  @GetCurrentUser('userId') userId: string,
  @Query() { offset, limit }: QueryOffsetDto,
  ) {
- console.log('getNotifications');
  return this.profileService.getNotifications(userId, offset, limit);
  }
 
+ @Post('read-notification/:id')
+ @UseGuards(AtGuard)
+ readNotification(
+ @GetCurrentUser('userId') userId: string,
+ @Param('id') notificationId: string,
+ ) {
+ return this.profileService.readNotification(userId, notificationId);
+ }
+
+ @Post('read-all-notifications')
+ @UseGuards(AtGuard)
+ readAllNotifications(@GetCurrentUser('userId') userId: string) {
+ return this.profileService.readAllNotifications(userId);
+ }
+
+ // read a bunch of messages
+
+ @Get('unread-messages')
+ @UseGuards(AtGuard)
+ getUnreadMessages(@GetCurrentUser('userId') userId: string) {
+ return this.profileService.getUnreadMessages(userId);
+ }
+
+ @Post('read-messages')
+ @UseGuards(AtGuard)
+ readMessages(
+ @GetCurrentUser('userId') userId: string,
+ @Body() { messagesIds }: { messagesIds: string[] },
+ ) {
+ return this.profileService.readMessages(userId, messagesIds);
+ }
+
  @Get(':id')
  @ApiOkResponse({ type: ProfileDto })
  @ApiParam({