feat: Add get user in proximity + get cities

prisma/schema.prisma

@@ -28,6 +28,8 @@ model User {
   birthDate DateTime? @db.Timestamptz(6)
   email     String    @unique
   sex       Int       @default(0)
+  latitude Float
+  longitude Float
   cityId    String @db.Uuid()
   city      City      @relation(fields: [cityId], references: [id])
   animals   Animal[]

prisma/seed.ts

@@ -11,10 +11,11 @@ const prisma = new PrismaClient();
 async function main() {
   dotenv.config();
   console.log('Seeding...');
+  await prisma.account.deleteMany({});
+  await prisma.animal.deleteMany({});
   await prisma.user.deleteMany({});
   await prisma.city.deleteMany({});
   await prisma.breed.deleteMany({});
-  await prisma.animal.deleteMany({});
 
   console.log('seeding Cities...');
   await seedCities();

prisma/users.ts

@@ -17,8 +17,14 @@ export const seedUsers = async (): Promise<void> => {
       email: Faker.internet.email(),
       city: { connect: random.arrayElement(cities.map((m) => ({ id: m.id }))) },
       sex: 1,
+      latitude: 44.837789 + generateRandomFloatInRange(-0.5, 0.5),
+      longitude: -0.57918 + generateRandomFloatInRange(-0.5, 0.5),
     };
     promises.push(prisma.user.create({ data: items }));
   }
   await Promise.all(promises);
 };
+
+function generateRandomFloatInRange(min, max) {
+  return Math.random() * (max - min + 1) + min;
+}

src/auth/auth.controller.ts

@@ -18,6 +18,7 @@ export class AuthController {
     @Body() body: CreateUserDto,
     @Body('password') password: string,
   ): Promise<void> {
+    delete body.password;
     const { id } = await this.citizenService.create(body);
     await this.authService.register(body.username, password, id);
   }

src/dtos/users/user.ts

@@ -50,6 +50,14 @@ export class CreateUserDto {
   @IsNumber()
   @IsOptional()
   public sex?: number | null;
+
+  @IsNumber()
+  @IsOptional()
+  public latitude?: number | null;
+
+  @IsNumber()
+  @IsOptional()
+  public longitude?: number | null;
 }
 
 export class UserDto extends CreateUserDto {

src/user/city/city.controller.ts

@@ -6,16 +6,22 @@ import {
   Param,
   Post,
   Put,
+  Query,
 } from '@nestjs/common';
 import { City } from '@prisma/client';
-import { CreateCityDto } from 'src/dtos';
+import { CreateCityDto, FilterDto } from 'src/dtos';
 
 import { CityService } from './city.service';
 
 @Controller('/cities')
 export class CityController {
   constructor(private readonly cityService: CityService) {}
 
+  @Get('/')
+  async list(@Query() query: FilterDto | undefined): Promise<City[]> {
+    return await this.cityService.list({});
+  }
+
   @Get('/:id')
   async get(@Param('id') id: string): Promise<City> {
     return await this.cityService.get({ id: id });

src/user/user.controller.ts

@@ -8,8 +8,10 @@ import {
   Put,
   Query,
   UseGuards,
+  Request,
 } from '@nestjs/common';
 import { User } from '@prisma/client';
+import { query } from 'express';
 import { CreateUserDto, FilterDto } from 'src/dtos';
 import { AuthGuard } from 'src/guards/auth.guard';
 
@@ -33,6 +35,19 @@ export class UserController {
     });
   }
 
+  @UseGuards(AuthGuard)
+  @Get('/proximity')
+  async getUsersInRadius(
+    @Query('radius') radius: string,
+    @Request() req: any,
+  ): Promise<User[]> {
+    console.log(req);
+    const currentUser = await this.userService.get({
+      username: req.user.username,
+    });
+    return await this.userService.getUsersInRadius(radius, currentUser);
+  }
+
   @UseGuards(AuthGuard)
   @Get('/:id')
   async get(@Param('id') id: string): Promise<User> {

src/user/user.service.ts

@@ -64,4 +64,50 @@ export class UserService {
       where,
     });
   }
+
+  async getUsersInRadius(radius, currentUser): Promise<User[]> {
+    const users = this.prisma.user.findMany({});
+
+    const usersInProximity = [];
+    (await users).map((user) => {
+      const distance = Math.round(
+        calcCrow(
+          currentUser.latitude,
+          currentUser.longitude,
+          user.latitude,
+          user.longitude,
+        ),
+      );
+      if (user.id != currentUser.id && distance <= parseInt(radius))
+        usersInProximity.push({ ...user, distance });
+    });
+
+    return usersInProximity;
+  }
+}
+
+//This function takes in latitude and longitude of two location and returns the distance between them as the crow flies (in km)
+function calcCrow(lat1, lon1, lat2, lon2) {
+  const R = 6371; // km
+  const dLat = toRad(lat2 - lat1);
+  const dLon = toRad(lon2 - lon1);
+  // eslint-disable-next-line no-var
+  const radLat1 = toRad(lat1);
+  // eslint-disable-next-line no-var
+  const radLat2 = toRad(lat2);
+
+  const a =
+    Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+    Math.sin(dLon / 2) *
+      Math.sin(dLon / 2) *
+      Math.cos(radLat1) *
+      Math.cos(radLat2);
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+  const d = R * c;
+  return d;
+}
+
+// Converts numeric degrees to radians
+function toRad(Value) {
+  return (Value * Math.PI) / 180;
 }