6 files changed, 66 insertions, 34 deletions
diff --git a/server/app.module.ts b/server/app.module.ts
index 5fc4654..60cf865 100644
--- a/server/app.module.ts
+++ b/server/app.module.ts
@@ -5,7 +5,7 @@ import { AppController } from './app.controller';
 import { config } from './database/config';
 import { ChatRoomModule } from './modules/chat_room.module';
 import { UsersModule } from './modules/users.module';
-import { PingGateway } from './providers/gateways/ping.gateway';
+import { ChatRoomGateway } from './providers/gateways/chat_room.gateway';
 import { AuthGuard } from './providers/guards/auth.guard';
 import { RolesGuard } from './providers/guards/roles.guard';
 import { ChatRoomService } from './providers/services/chat_room.service';
@@ -18,7 +18,7 @@ import { GuardUtil } from './providers/util/guard.util';
   imports: [TypeOrmModule.forRoot(config), UsersModule, ChatRoomModule],
   controllers: [AppController],
   providers: [
-    PingGateway,
+    ChatRoomGateway,
     UsersService,
     RolesService,
     JwtService,
diff --git a/server/controllers/chat_room.controller.ts b/server/controllers/chat_room.controller.ts
index bd9ba4a..668a686 100644
--- a/server/controllers/chat_room.controller.ts
+++ b/server/controllers/chat_room.controller.ts
@@ -4,20 +4,43 @@ import { JwtBodyDto } from 'server/dto/jwt_body.dto';
 import { ChatRoomService } from 'server/providers/services/chat_room.service';
 import { UsersService } from 'server/providers/services/users.service';
 
+const haversine = (p1, p2) => {
+  const degreesToRadians = (degrees) => degrees * (Math.PI / 180);
+  const delta = { lat: degreesToRadians(p2.lat - p1.lat), lng: degreesToRadians(p2.lng - p1.lng) };
+  const a =
+    Math.sin(delta.lat / 2) * Math.sin(delta.lat / 2) +
+    Math.cos(degreesToRadians(p1.lat)) *
+      Math.cos(degreesToRadians(p2.lat)) *
+      Math.sin(delta.lng / 2) *
+      Math.sin(delta.lng / 2);
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  const r = 6371 * 1000;
+  return r * c;
+};
 @Controller()
 export class ChatRoomController {
   constructor(private chatRoomService: ChatRoomService, private usersService: UsersService) {}
 
   @Get('/chat_rooms')
-  async get(@Query() query: any) {
-    console.log(query);
-    return await this.chatRoomService.near(query);
+  async get(@JwtBody() jwtBody: JwtBodyDto, @Query() query: any) {
+    return await this.chatRoomService.nearOrUserOwns({ ...query, userId: jwtBody.userId });
+  }
+
+  @Get('/chat_rooms/:id')
+  async getId(@Param('id') id: number) {
+    return await this.chatRoomService.findById(id);
+  }
+
+  @Get('/chat_rooms/:id/joinable')
+  async joinable(@JwtBody() jwtBody, @Param('id') id: number, @Query() query: any) {
+    return !!(await this.chatRoomService.nearOrUserOwns({ ...query, userId: jwtBody.userId })).find(
+      (cr) => cr.id == id && haversine({ lat: cr.latitude, lng: cr.longitude }, query) < cr.radius,
+    );
   }
 
   @Post('/chat_rooms')
   async create(@JwtBody() jwtBody: JwtBodyDto, @Body() chatRoom: any) {
     chatRoom.user = await this.usersService.find(jwtBody.userId);
-    console.log(jwtBody);
     return await this.chatRoomService.create(chatRoom);
   }
 
diff --git a/server/database/migrations/1648605030863-AddChatRoom.ts b/server/database/migrations/1648605030863-AddChatRoom.ts
index e4b5ca9..4a6c156 100644
--- a/server/database/migrations/1648605030863-AddChatRoom.ts
+++ b/server/database/migrations/1648605030863-AddChatRoom.ts
@@ -32,6 +32,11 @@ export class AddChatRoom1648605030863 implements MigrationInterface {
             type: 'float',
             isNullable: false,
           },
+          {
+            name: 'name',
+            type: 'varchar',
+            isNullable: true,
+          },
         ],
       }),
     );
diff --git a/server/entities/chat_room.entity.ts b/server/entities/chat_room.entity.ts
index 6f46c97..29619be 100644
--- a/server/entities/chat_room.entity.ts
+++ b/server/entities/chat_room.entity.ts
@@ -15,6 +15,9 @@ export class ChatRoom {
   @Column()
   radius: number;
 
+  @Column()
+  name: string;
+
   @ManyToOne(() => User, (user) => user.chatRooms)
   user: User;
 }
diff --git a/server/providers/gateways/ping.gateway.ts b/server/providers/gateways/chat_room.gateway.ts
index 27fe785..b565d40 100644
--- a/server/providers/gateways/ping.gateway.ts
+++ b/server/providers/gateways/chat_room.gateway.ts
@@ -1,27 +1,29 @@
 import { UseGuards } from '@nestjs/common';
-import { ConnectedSocket, MessageBody, OnGatewayConnection, OnGatewayDisconnect, OnGatewayInit, SubscribeMessage, WebSocketGateway, WebSocketServer, WsException } from '@nestjs/websockets';
+import {
+  ConnectedSocket,
+  MessageBody,
+  OnGatewayConnection,
+  OnGatewayDisconnect,
+  OnGatewayInit,
+  SubscribeMessage,
+  WebSocketGateway,
+  WebSocketServer,
+  WsException,
+} from '@nestjs/websockets';
 import { GatewayJwtBody } from 'server/decorators/gateway_jwt_body.decorator';
 import { JwtBodyDto } from 'server/dto/jwt_body.dto';
 import { Server, Socket } from 'socket.io';
 import { GatewayAuthGuard } from '../guards/gatewayauth.guard';
 import { JwtService } from '../services/jwt.service';
-
-class JoinPayload {
-  currentRoom?: string;
-  newRoom: string;
-}
-
-class PingPayload {
-  currentRoom: string;
-}
+import { UsersService } from '../services/users.service';
 
 @WebSocketGateway()
 @UseGuards(GatewayAuthGuard)
-export class PingGateway implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect {
+export class ChatRoomGateway implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect {
   @WebSocketServer()
   server: Server;
 
-  constructor(private jwtService: JwtService) {}
+  constructor(private jwtService: JwtService, private userService: UsersService) {}
 
   afterInit(server: Server) {
     console.log('Sockets initialized');
@@ -36,8 +38,9 @@ export class PingGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
     try {
       const jwt = client.handshake.auth.token;
       const jwtBody = this.jwtService.parseToken(jwt);
-      console.log(client.handshake.query);
+      const chatRoomId = client.handshake.query.chatRoomId;
       console.log('Client Connected: ', jwtBody.userId);
+      client.join(chatRoomId);
     } catch (e) {
       throw new WsException('Invalid token');
     }
@@ -47,21 +50,18 @@ export class PingGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
     console.log('Client Disconnected');
   }
 
-  @SubscribeMessage('ping')
-  public handlePing(
+  @SubscribeMessage('message')
+  public async handleMessage(
     @ConnectedSocket() client: Socket,
-    @MessageBody() payload: PingPayload,
+    @MessageBody() data: string,
     @GatewayJwtBody() jwtBody: JwtBodyDto,
   ) {
-    this.server.to(payload.currentRoom).emit('pong', { message: { userId: jwtBody.userId } });
-    console.log(client.rooms);
-  }
-
-  @SubscribeMessage('join-room')
-  public async joinRoom(client: Socket, payload: JoinPayload) {
-    console.log(payload);
-    payload.currentRoom && (await client.leave(payload.currentRoom));
-    await client.join(payload.newRoom);
-    return { msg: 'Joined room', room: payload.newRoom };
+    const user = await this.userService.find(jwtBody.userId);
+    this.server.to(client.handshake.query.chatRoomId).emit('new-message', {
+      id: user.id * Math.random() * 2048 * Date.now(),
+      content: data,
+      userName: `${user.firstName} ${user.lastName}`,
+      userId: user.id,
+    });
   }
 }
diff --git a/server/providers/services/chat_room.service.ts b/server/providers/services/chat_room.service.ts
index a6af023..ed75ba4 100644
--- a/server/providers/services/chat_room.service.ts
+++ b/server/providers/services/chat_room.service.ts
@@ -18,9 +18,10 @@ export class ChatRoomService {
     return this.chatRoomRepository.find();
   }
 
-  near({ lat, lng }: { lat: number; lng: number }) {
+  nearOrUserOwns({ lat, lng, userId }: { lat: number; lng: number; userId: number }) {
+    // SQL injection maybe?
     return this.chatRoomRepository.query(
-      `SELECT * FROM chat_room WHERE calculate_distance(latitude, longitude, ${lat}, ${lng}, 'M') < 5`,
+      `SELECT * FROM chat_room WHERE calculate_distance(latitude, longitude, ${lat}, ${lng}, 'M') < 5 OR "userId" = ${userId}`,
     );
   }