Merge develop to staging (#137)

Co-authored-by: José Fagundes <fagundesjg@outlook.com>
SOS-RS · May 18, 2024 · 48480b6 · 48480b6
1 parent 7a9aea7
commit 48480b6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 29 deletions.
diff --git a/prisma/migrations/20240517181431_add_unaccent_extension/migration.sql b/prisma/migrations/20240517181431_add_unaccent_extension/migration.sql
@@ -0,0 +1,3 @@
+-- This is an empty migration.
+
+CREATE EXTENSION IF NOT EXISTS unaccent;
diff --git a/prisma/migrations/20240517192040_/migration.sql b/prisma/migrations/20240517192040_/migration.sql
@@ -0,0 +1,6 @@
+-- CreateEnum
+CREATE TYPE "ShelterCategory" AS ENUM ('Shelter', 'DistributionCenter');
+
+-- AlterTable
+ALTER TABLE "shelters" ADD COLUMN     "actived" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "category" "ShelterCategory" NOT NULL DEFAULT 'Shelter';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -14,6 +14,11 @@ enum AccessLevel {
   Admin
 }
 
+enum ShelterCategory {
+  Shelter
+  DistributionCenter
+}
+
 model User {
   id          String      @id @default(uuid())
   name        String
@@ -85,25 +90,27 @@ model Supply {
 }
 
 model Shelter {
-  id              String   @id @default(uuid())
-  name            String   @unique
-  pix             String?  @unique
+  id              String          @id @default(uuid())
+  name            String          @unique
+  pix             String?         @unique
   address         String
   street          String?
   neighbourhood   String?
   city            String?
-  streetNumber    String?  @map("street_number")
-  zipCode         String?  @map("zip_code")
-  petFriendly     Boolean? @map("pet_friendly")
-  shelteredPeople Int?     @map("sheltered_people")
+  streetNumber    String?         @map("street_number")
+  zipCode         String?         @map("zip_code")
+  petFriendly     Boolean?        @map("pet_friendly")
+  shelteredPeople Int?            @map("sheltered_people")
   capacity        Int?
   contact         String?
-  prioritySum     Int      @default(value: 0) @map("priority_sum")
+  prioritySum     Int             @default(value: 0) @map("priority_sum")
   latitude        Float?
   longitude       Float?
-  verified        Boolean  @default(value: false)
-  createdAt       String   @map("created_at") @db.VarChar(32)
-  updatedAt       String?  @map("updated_at") @db.VarChar(32)
+  verified        Boolean         @default(value: false)
+  category        ShelterCategory @default(value: Shelter)
+  actived         Boolean         @default(value: true)
+  createdAt       String          @map("created_at") @db.VarChar(32)
+  updatedAt       String?         @map("updated_at") @db.VarChar(32)
 
   shelterManagers ShelterManagers[]
   shelterSupplies ShelterSupply[]

diff --git a/src/shelter/ShelterSearch.ts b/src/shelter/ShelterSearch.ts
@@ -27,6 +27,7 @@ class ShelterSearch {
   ) {
     this.prismaService = prismaService;
     this.formProps = { ...props };
+    this.getQuery = this.getQuery.bind(this);
   }
 
   priority(supplyIds: string[] = []): Prisma.ShelterWhereInput {
@@ -102,23 +103,20 @@ class ShelterSearch {
     };
   }
 
-  get search(): Prisma.ShelterWhereInput[] {
-    if (!this.formProps.search) return [];
+  async getSearch(): Promise<Prisma.ShelterWhereInput> {
+    if (!this.formProps.search) return {};
 
-    return [
-      {
-        address: {
-          contains: this.formProps.search,
-          mode: 'insensitive',
-        },
-      },
-      {
-        name: {
-          contains: this.formProps.search,
-          mode: 'insensitive',
-        },
+    const search = `${this.formProps.search.toLowerCase()}`;
+
+    const results = await this.prismaService.$queryRaw<{ id: string }[]>(
+      Prisma.sql`SELECT id FROM shelters WHERE lower(unaccent(address)) LIKE '%' || unaccent(${search}) || '%' OR lower(unaccent(name)) LIKE '%' || unaccent(${search}) || '%';`,
+    );
+
+    return {
+      id: {
+        in: results.map((r) => r.id),
       },
-    ];
+    };
   }
 
   get cities(): Prisma.ShelterWhereInput {
@@ -150,13 +148,15 @@ class ShelterSearch {
     };
   }
 
-  get query(): Prisma.ShelterWhereInput {
+  async getQuery(): Promise<Prisma.ShelterWhereInput> {
     if (Object.keys(this.formProps).length === 0) return {};
+
+    const search = await this.getSearch();
     const queryData = {
       AND: [
         this.cities,
         this.geolocation,
-        { OR: this.search },
+        search,
         { OR: this.shelterStatus },
         this.priority(this.formProps.supplyIds),
         this.supplyCategoryIds(this.formProps.priority),

diff --git a/src/shelter/shelter.service.ts b/src/shelter/shelter.service.ts
@@ -87,6 +87,8 @@ export class ShelterService implements OnModuleInit {
         latitude: true,
         longitude: true,
         verified: true,
+        actived: true,
+        category: true,
         shelterSupplies: {
           select: {
             priority: true,
@@ -125,7 +127,9 @@ export class ShelterService implements OnModuleInit {
       search: searchQuery,
     } = SearchSchema.parse(query);
     const queryData = ShelterSearchPropsSchema.parse(qs.parse(searchQuery));
-    const { query: where } = new ShelterSearch(this.prismaService, queryData);
+    const { getQuery } = new ShelterSearch(this.prismaService, queryData);
+    const where = await getQuery();
+
     const count = await this.prismaService.shelter.count({ where });
 
     const take = perPage;
@@ -157,6 +161,8 @@ export class ShelterService implements OnModuleInit {
         verified: true,
         latitude: true,
         longitude: true,
+        actived: true,
+        category: true,
         createdAt: true,
         updatedAt: true,
         shelterSupplies: {