fix: supply services

Author: fagundesjg

prisma/migrations/20240508041443_/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `priority` on the `supplies` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "shelter_supplies" ALTER COLUMN "priority" SET DEFAULT 0;
+
+-- AlterTable
+ALTER TABLE "supplies" DROP COLUMN "priority";

prisma/migrations/20240508050213_/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[name]` on the table `supplies` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "supplies_name_key" ON "supplies"("name");

prisma/schema.prisma

@@ -57,7 +57,7 @@ model SupplyCategory {
 model ShelterSupply {
   shelterId String  @map("shelter_id")
   supplyId  String  @map("supply_id")
-  priority  Int
+  priority  Int     @default(value: 0)
   createdAt String  @map("created_at") @db.VarChar(32)
   updatedAt String? @map("updated_at") @db.VarChar(32)
 
@@ -72,7 +72,6 @@ model Supply {
   id               String  @id @default(uuid())
   supplyCategoryId String  @map("supply_category_id")
   name             String
-  priority         Int     @default(value: 0)
   createdAt        String  @map("created_at") @db.VarChar(32)
   updatedAt        String? @map("updated_at") @db.VarChar(32)
 

src/shelter-supply/shelter-supply.service.ts

@@ -8,18 +8,59 @@ import { CreateShelterSupplySchema, UpdateShelterSupplySchema } from './types';
 export class ShelterSupplyService {
   constructor(private readonly prismaService: PrismaService) {}
 
+  private async handleUpdateShelterSum(
+    shelterId: string,
+    oldPriority: number,
+    newPriority: number,
+  ) {
+    await this.prismaService.shelter.update({
+      where: {
+        id: shelterId,
+      },
+      data: {
+        prioritySum: {
+          increment: newPriority - oldPriority,
+        },
+        updatedAt: new Date().toISOString(),
+      },
+    });
+  }
+
   async store(body: z.infer<typeof CreateShelterSupplySchema>) {
-    const payload = CreateShelterSupplySchema.parse(body);
+    const { shelterId, priority, supplyId } =
+      CreateShelterSupplySchema.parse(body);
+    await this.handleUpdateShelterSum(shelterId, 0, priority);
     await this.prismaService.shelterSupply.create({
       data: {
-        ...payload,
+        shelterId,
+        priority,
+        supplyId,
         createdAt: new Date().toISOString(),
       },
     });
   }
 
   async update(body: z.infer<typeof UpdateShelterSupplySchema>) {
     const { data, where } = UpdateShelterSupplySchema.parse(body);
+    const { priority } = data;
+    if (priority !== null && priority !== undefined) {
+      const shelterSupply = await this.prismaService.shelterSupply.findFirst({
+        where: {
+          shelterId: where.shelterId,
+          supplyId: where.supplyId,
+        },
+        select: {
+          priority: true,
+        },
+      });
+      if (shelterSupply)
+        await this.handleUpdateShelterSum(
+          where.shelterId,
+          shelterSupply.priority,
+          priority,
+        );
+    }
+
     await this.prismaService.shelterSupply.update({
       where: {
         shelterId_supplyId: where,
@@ -42,7 +83,6 @@ export class ShelterSupplyService {
           select: {
             id: true,
             name: true,
-            priority: true,
             supplyCategory: {
               select: {
                 id: true,

src/shelter-supply/types.ts

@@ -1,10 +1,17 @@
 import z from 'zod';
 
+import { SupplyPriority } from '../supply/types';
+
 const ShelterSupplySchema = z.object({
   id: z.string(),
   shelterId: z.string(),
   supplyId: z.string(),
-  priority: z.number(),
+  priority: z.union([
+    z.literal(SupplyPriority.UnderControl),
+    z.literal(SupplyPriority.Remaining),
+    z.literal(SupplyPriority.Needing),
+    z.literal(SupplyPriority.Urgent),
+  ]),
   createdAt: z.string(),
   updatedAt: z.string().nullable().optional(),
 });
@@ -18,6 +25,12 @@ const CreateShelterSupplySchema = ShelterSupplySchema.pick({
 const UpdateShelterSupplySchema = z.object({
   data: z
     .object({
+      priority: z.union([
+        z.literal(SupplyPriority.UnderControl),
+        z.literal(SupplyPriority.Remaining),
+        z.literal(SupplyPriority.Needing),
+        z.literal(SupplyPriority.Urgent),
+      ]),
       shelterId: z.string(),
       supplyId: z.string(),
     })

src/shelter/shelter.controller.ts

@@ -16,6 +16,7 @@ import { ServerResponse } from '../utils';
 import { SearchQuery } from '../decorators';
 import { SeachQueryProps } from '@/decorators/search-query/types';
 import { StaffGuard } from '@/guards/staff.guard';
+import { UserGuard } from '@/guards/user.guard';
 
 @ApiTags('Abrigos')
 @Controller('shelters')
@@ -47,7 +48,7 @@ export class ShelterController {
   }
 
   @Post('')
-  @UseGuards(StaffGuard)
+  @UseGuards(UserGuard)
   async store(@Body() body) {
     try {
       const data = await this.shelterService.store(body);

src/shelter/shelter.service.ts

@@ -72,11 +72,12 @@ export class ShelterService {
         longitude: true,
         shelterSupplies: {
           select: {
+            priority: true,
             supply: {
               select: {
                 id: true,
                 name: true,
-                priority: true,
+
                 supplyCategory: {
                   select: {
                     id: true,
@@ -125,10 +126,10 @@ export class ShelterService {
             },
             take: 10,
             select: {
+              priority: true,
               supply: {
                 select: {
                   name: true,
-                  priority: true,
                 },
               },
             },

src/supply/supply.service.ts

@@ -8,45 +8,24 @@ import { CreateSupplySchema, UpdateSupplySchema } from './types';
 export class SupplyService {
   constructor(private readonly prismaService: PrismaService) {}
 
-  private async handleUpdateShelterSum(
-    shelterId: string,
-    oldPriority: number,
-    newPriority: number,
-  ) {
-    await this.prismaService.shelter.update({
-      where: {
-        id: shelterId,
-      },
-      data: {
-        prioritySum: {
-          increment: newPriority - oldPriority,
-        },
-        updatedAt: new Date().toISOString(),
-      },
-    });
-  }
-
   async store(body: z.infer<typeof CreateSupplySchema>) {
-    const { priority, ...rest } = CreateSupplySchema.parse(body);
-    await this.prismaService.supply.create({
+    const payload = CreateSupplySchema.parse(body);
+    return await this.prismaService.supply.create({
       data: {
-        priority,
-        ...rest,
+        ...payload,
         createdAt: new Date().toISOString(),
       },
     });
   }
 
   async update(id: string, body: z.infer<typeof UpdateSupplySchema>) {
-    const { priority, ...rest } = UpdateSupplySchema.parse(body);
-
+    const payload = UpdateSupplySchema.parse(body);
     await this.prismaService.supply.update({
       where: {
         id,
       },
       data: {
-        priority,
-        ...rest,
+        ...payload,
         updatedAt: new Date().toISOString(),
       },
     });
@@ -57,7 +36,6 @@ export class SupplyService {
       select: {
         id: true,
         name: true,
-        priority: true,
         supplyCategory: {
           select: {
             id: true,

src/supply/types.ts

@@ -1,4 +1,5 @@
 import z from 'zod';
+import { capitalize } from '../utils';
 
 enum SupplyPriority {
   UnderControl = 0,
@@ -10,13 +11,7 @@ enum SupplyPriority {
 const SupplySchema = z.object({
   id: z.string(),
   supplyCategoryId: z.string(),
-  name: z.string(),
-  priority: z.union([
-    z.literal(SupplyPriority.UnderControl),
-    z.literal(SupplyPriority.Remaining),
-    z.literal(SupplyPriority.Needing),
-    z.literal(SupplyPriority.Urgent),
-  ]),
+  name: z.string().transform(capitalize),
   createdAt: z.string(),
   updatedAt: z.string().nullable().optional(),
 });
@@ -30,7 +25,6 @@ const CreateSupplySchema = SupplySchema.omit({
 const UpdateSupplySchema = SupplySchema.pick({
   name: true,
   supplyCategoryId: true,
-  priority: true,
 }).partial();
 
 export { SupplySchema, CreateSupplySchema, UpdateSupplySchema, SupplyPriority };