fix: 🐛 adjust shelters types to edit and create shelter

emiliosheinz · Jun 2, 2024 · f7a71c7 · f7a71c7
1 parent 3517bd0
commit f7a71c7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/src/app/user/shelters/[id]/edit/page.tsx b/src/app/user/shelters/[id]/edit/page.tsx
@@ -11,9 +11,10 @@ export default function EditShelterPage({
 }: {
   params: { id: number };
 }) {
-  const { data, isLoading, error } = api.shelter.findUserShelterById.useQuery({
-    id: Number(params.id),
-  });
+  const { data, isLoading, error } =
+    api.userShelters.findUserShelterById.useQuery({
+      id: Number(params.id),
+    });
 
   if (error?.data?.httpStatus === 404 && !isLoading) {
     notFound();

diff --git a/src/app/user/shelters/_components/form-edit-register/dialog-delete/index.tsx b/src/app/user/shelters/_components/form-edit-register/dialog-delete/index.tsx
@@ -22,10 +22,10 @@ export function DialogDelete({ shelterId }: { shelterId: number }) {
   const router = useRouter();
   const [open, setOpen] = useState(false);
 
-  const deleteShelter = api.shelter.delete.useMutation({
+  const deleteShelter = api.userShelters.delete.useMutation({
     onSuccess: () => {
       toast.success("Abrigo excluído com sucesso!");
-      router.replace("/");
+      router.replace("/user/shelters");
       setOpen(false);
     },
     onError: (error) => {

diff --git a/src/app/user/shelters/_components/form-edit-register/index.tsx b/src/app/user/shelters/_components/form-edit-register/index.tsx
@@ -17,7 +17,7 @@ import {
   FormDescription,
 } from "~/components/ui/form";
 import { cepMask, phoneMask, socialMediaMask } from "~/lib/masks";
-import { shelterSchema } from "~/schemas/shelter";
+import { shelterSchema, type apiShelterSchema } from "~/schemas/shelter";
 import { api } from "~/trpc/react";
 import { useRouter } from "next/navigation";
 import { TagInput } from "~/components/tag-input";
@@ -28,7 +28,7 @@ import { googleMaps } from "~/lib/google-maps";
 import { useState } from "react";
 
 interface FormEditRegisterProps {
-  shelter?: z.infer<typeof shelterSchema> | null;
+  shelter?: z.infer<typeof apiShelterSchema> | null;
 }
 
 export function FormEditRegister({ shelter }: FormEditRegisterProps = {}) {
@@ -79,7 +79,7 @@ export function FormEditRegister({ shelter }: FormEditRegisterProps = {}) {
         state,
       });
 
-      const shelter = {
+      const formShelter = {
         ...values,
         address: {
           ...values.address,
@@ -88,8 +88,13 @@ export function FormEditRegister({ shelter }: FormEditRegisterProps = {}) {
         },
       };
 
-      const mutation = isEditing ? updateShelter : createShelter;
-      mutation.mutate(shelter);
+      if (isEditing) {
+        updateShelter.mutate({ ...formShelter, id: shelter.id });
+
+        return;
+      }
+
+      createShelter.mutate(formShelter);
     } catch (error) {
       toast.error(
         "Ops! Houve um erro ao buscar as coordenadas do endereço e o abrigo não foi criado. Tente novamente!.",
@@ -434,9 +439,7 @@ export function FormEditRegister({ shelter }: FormEditRegisterProps = {}) {
               >
                 {isLoading ? <Loader2 className="animate-spin" /> : "Salvar"}
               </Button>
-              {isEditing && shelter.id && (
-                <DialogDelete shelterId={shelter.id} />
-              )}
+              {isEditing && <DialogDelete shelterId={shelter.id} />}
             </div>
           </form>
         </Form>

diff --git a/src/schemas/shelter.ts b/src/schemas/shelter.ts
@@ -1,7 +1,6 @@
 import { z } from "zod";
 
 export const shelterSchema = z.object({
-  id: z.number().optional(),
   name: z
     .string({
       message: "Campo obrigatório",

diff --git a/src/server/api/routers/user/shelters.ts b/src/server/api/routers/user/shelters.ts
@@ -3,7 +3,7 @@ import { TRPCError } from "@trpc/server";
 
 import { createTRPCRouter, protectedProcedure } from "~/server/api/trpc";
 import { db } from "~/server/db";
-import { apiShelterSchema } from "~/schemas/shelter";
+import { apiShelterSchema, createShelterSchema } from "~/schemas/shelter";
 
 const InputIdParams = z.object({
   id: z.number(),
@@ -87,7 +87,7 @@ export const userSheltersRouter = createTRPCRouter({
       };
     }),
   create: protectedProcedure
-    .input(apiShelterSchema)
+    .input(createShelterSchema)
     .mutation(async ({ ctx, input }) => {
       await db.shelter.create({
         data: {