Merge pull request #21 from filipepacheco/rebase-develop

 Rebase Develop onto main #2

Author: MatheusDubin

.env.local

@@ -0,0 +1,12 @@
+TZ=America/Sao_Paulo
+
+DB_HOST=sos-rs-db
+DB_PORT=5432
+DB_DATABASE_NAME=sos_rs
+DB_USER=root
+DB_PASSWORD=root
+DATABASE_URL="postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_DATABASE_NAME}?schema=public"
+SECRET_KEY=batata
+
+HOST=::0.0.0.0
+PORT=4000

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Deploy Backend
 
 on:
   push:
-    branches: [main]
+    branches: [deploy]
 
 jobs:
   build:

.gitignore

@@ -43,7 +43,7 @@ lerna-debug.log*
 .env.development.local
 .env.test.local
 .env.production.local
-.env.local
+# .env.local
 
 # temp directory
 .temp

.nvmrc

@@ -0,0 +1 @@
+v18.19.1

docker-compose.dev.yml

@@ -0,0 +1,33 @@
+version: '3.8'
+
+services:
+  api:
+    container_name: sos-rs-api
+    image: node:18.18
+    restart: always
+    tty: true
+    depends_on:
+      - db
+    ports:
+      - '4000:4000'
+    volumes:
+      - .:/usr/app
+      - /usr/app/node_modules
+    working_dir: '/usr/app'
+    environment:
+      - DB_HOST=sos-rs-db
+      - DB_PORT=5432
+      - DB_DATABASE_NAME=sos_rs
+      - DB_USER=root
+      - DB_PASSWORD=root
+    command: >
+      sh -c "npm install &&
+      npx prisma generate &&
+      npx prisma migrate dev &&
+      npm run start"
+  db:
+    container_name: sos-rs-db
+    image: postgres
+    environment:
+      - POSTGRES_PASSWORD=root
+      - POSTGRES_USER=root

src/prisma/prisma.service.ts

@@ -1,9 +1,37 @@
 import { INestApplication, Injectable, OnModuleInit } from '@nestjs/common';
-import { PrismaClient } from '@prisma/client';
+import { Prisma, PrismaClient } from '@prisma/client';
 import * as bcrypt from 'bcrypt';
 
 @Injectable()
-export class PrismaService extends PrismaClient<any> implements OnModuleInit {
+export class PrismaService
+  extends PrismaClient<
+    Prisma.PrismaClientOptions,
+    'query' | 'info' | 'warn' | 'error' | 'beforeExit'
+  >
+  implements OnModuleInit
+{
+  constructor() {
+    super({
+      log: [
+        {
+          emit: 'event',
+          level: 'query',
+        },
+        {
+          emit: 'event',
+          level: 'error',
+        },
+        {
+          emit: 'stdout',
+          level: 'info',
+        },
+        {
+          emit: 'stdout',
+          level: 'warn',
+        },
+      ],
+    });
+  }
   async onModuleInit() {
     await this.$connect();
     this.$use(async (params, next) => {

src/shelter/shelter.controller.ts

@@ -7,6 +7,7 @@ import {
   Param,
   Post,
   Put,
+  Query,
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
@@ -36,6 +37,17 @@ export class ShelterController {
     }
   }
 
+  @Get('/search')
+  async search(@Query() complexSearchQueryParams) {
+    try {
+      const data = await this.shelterService.search(complexSearchQueryParams);
+      return new ServerResponse(200, 'Successfully get shelters', data);
+    } catch (err: any) {
+      this.logger.error(`Failed to get shelters: ${err}`);
+      throw new HttpException(err?.code ?? err?.name ?? `${err}`, 400);
+    }
+  }
+
   @Get(':id')
   async show(@Param('id') id: string) {
     try {

src/shelter/shelter.service.ts

@@ -2,9 +2,9 @@ import { z } from 'zod';
 import { Injectable } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 import { DefaultArgs } from '@prisma/client/runtime/library';
-
 import { PrismaService } from '../prisma/prisma.service';
 import {
+  ComplexSearchSchema,
   CreateShelterSchema,
   FullUpdateShelterSchema,
   UpdateShelterSchema,
@@ -70,7 +70,6 @@ export class ShelterService {
         prioritySum: true,
         latitude: true,
         longitude: true,
-        verified: true,
         shelterSupplies: {
           select: {
             priority: true,
@@ -143,4 +142,175 @@ export class ShelterService {
       },
     );
   }
+
+  async search(props: z.infer<typeof ComplexSearchSchema>) {
+    const payload = ComplexSearchSchema.parse({
+      ...props,
+      supplyCategories:
+        typeof props['supplyCategories[]'] === 'string'
+          ? [props['supplyCategories[]']]
+          : props['supplyCategories[]'],
+      supplies:
+        typeof props['supplies[]'] === 'string'
+          ? [props['supplies[]']]
+          : props['supplies[]'],
+    });
+
+    const shelterStatusFilter = this.addShelterStatusFilter(payload);
+    const where = this.mountWhereFilter(payload);
+    const take = payload.perPage;
+    const skip = payload.perPage * (payload.page - 1);
+
+    if (shelterStatusFilter.length > 0) {
+      where['AND'].push({
+        OR: shelterStatusFilter,
+      });
+    }
+
+    const count = await this.prismaService.shelter.count({
+      where: where,
+    });
+
+    const results = await this.prismaService.shelter.findMany({
+      where: where,
+      orderBy: {
+        prioritySum: 'desc',
+      },
+      take,
+      skip,
+      select: {
+        id: true,
+        name: true,
+        pix: true,
+        address: true,
+        capacity: true,
+        contact: true,
+        verified: true,
+        petFriendly: true,
+        shelteredPeople: true,
+        prioritySum: true,
+        latitude: true,
+        longitude: true,
+        createdAt: true,
+        updatedAt: true,
+        shelterSupplies: {
+          where: {
+            priority: {
+              gte: SupplyPriority.Needing,
+            },
+          },
+          take: 10,
+          select: {
+            priority: true,
+            supply: {
+              select: {
+                name: true,
+              },
+            },
+          },
+          orderBy: {
+            priority: 'desc',
+          },
+        },
+      },
+    });
+    return { perPage: payload.perPage, page: payload.page, count, results };
+  }
+
+  private mountWhereFilter(payload: z.infer<typeof ComplexSearchSchema>) {
+    const filter: any = {
+      AND: [
+        {
+          OR: [
+            { address: { contains: payload.search } },
+            { name: { contains: payload.search } },
+          ],
+        },
+      ],
+    };
+
+    const shelterSuppliesFilter = {
+      shelterSupplies: {
+        some: {},
+      },
+    };
+
+    if (payload.priority) {
+      shelterSuppliesFilter.shelterSupplies.some['priority'] = parseInt(
+        payload.priority,
+      );
+    }
+
+    if (payload?.supplyCategories && payload?.supplyCategories.length !== 0) {
+      shelterSuppliesFilter.shelterSupplies.some['supply'] = {
+        supplyCategoryId: {
+          in: payload.supplyCategories,
+        },
+      };
+    }
+
+    if (payload?.supplies && payload?.supplies.length !== 0) {
+      shelterSuppliesFilter.shelterSupplies.some['supplyId'] = {
+        in: payload.supplies,
+      };
+    }
+
+    if (Object.keys(shelterSuppliesFilter.shelterSupplies.some).length !== 0) {
+      filter['AND'].push(shelterSuppliesFilter);
+    }
+
+    return filter;
+  }
+
+  private addShelterStatusFilter(payload: z.infer<typeof ComplexSearchSchema>) {
+    const shelterStatusFilter: any = [];
+
+    if (payload.filterAvailableShelter) {
+      shelterStatusFilter.push({
+        AND: [
+          {
+            capacity: {
+              gt: this.prismaService.shelter.fields.shelteredPeople,
+            },
+          },
+          {
+            capacity: { not: null },
+          },
+          {
+            shelteredPeople: { not: null },
+          },
+        ],
+      });
+    }
+
+    if (payload.filterUnavailableShelter) {
+      shelterStatusFilter.push({
+        AND: [
+          {
+            capacity: {
+              lte: this.prismaService.shelter.fields.shelteredPeople,
+            },
+          },
+          {
+            capacity: { not: null },
+          },
+          {
+            shelteredPeople: { not: null },
+          },
+        ],
+      });
+    }
+
+    if (payload.waitingShelterAvailability) {
+      shelterStatusFilter.push({
+        capacity: null,
+      });
+
+      shelterStatusFilter.push({
+        shelteredPeople: null,
+      });
+    }
+
+    return shelterStatusFilter;
+  }
 }

src/shelter/types.ts

@@ -22,6 +22,33 @@ const ShelterSchema = z.object({
   updatedAt: z.string().nullable().optional(),
 });
 
+const ComplexSearchSchema = z.object({
+  search: z.preprocess((v) => v ?? '', z.string()),
+  status: z.array(z.number()).nullable().optional(),
+  perPage: z.preprocess(
+    (v) => +((v ?? '20') as string),
+    z.number().min(1).max(100),
+  ),
+  filterAvailableShelter: z.preprocess(
+    (v) => (v === 'true' ? true : false),
+    z.boolean(),
+  ),
+  filterUnavailableShelter: z.preprocess(
+    (v) => (v === 'true' ? true : false),
+    z.boolean(),
+  ),
+  waitingShelterAvailability: z.preprocess(
+    (v) => (v === 'true' ? true : false),
+    z.boolean(),
+  ),
+  page: z.preprocess((v) => +((v ?? '1') as string), z.number().min(1)),
+  supplyCategories: z.array(z.string()).nullable().optional(),
+  supplies: z.array(z.string()).nullable().optional(),
+  priority: z.string().nullable().optional(),
+  order: z.string(),
+  orderBy: z.string().nullable().optional(),
+});
+
 const CreateShelterSchema = ShelterSchema.omit({
   id: true,
   createdAt: true,
@@ -44,4 +71,5 @@ export {
   CreateShelterSchema,
   UpdateShelterSchema,
   FullUpdateShelterSchema,
+  ComplexSearchSchema,
 };

src/supply/supply.service.ts

@@ -33,21 +33,24 @@ export class SupplyService {
 
   async index() {
     const data = await this.prismaService.supply.findMany({
+      distinct: ['name', 'supplyCategoryId'],
+      orderBy: {
+        name: 'desc',
+      },
       select: {
         id: true,
         name: true,
         supplyCategory: {
           select: {
             id: true,
             name: true,
-            createdAt: true,
-            updatedAt: true,
           },
         },
-        updatedAt: true,
         createdAt: true,
+        updatedAt: true,
       },
     });
+
     return data;
   }
 }