Merge branch 'develop' into feat/update-shelter

fagundesjg · fagundesjg · commit 3e09b9f65c3e · 2024-05-08T10:44:09.000-03:00
diff --git a/src/components/ShelterListItem/ShelterListItem.tsx b/src/components/ShelterListItem/ShelterListItem.tsx
@@ -14,7 +14,6 @@ const ShelterListItem = (props: IShelterListItemProps) => {
   const { data } = props;
   const { capacity, shelteredPeople } = data;
   const navigate = useNavigate();
-
   const { availability, className: availabilityClassName } =
     useMemo<IShelterAvailabilityProps>(
       () => getAvailabilityProps(capacity, shelteredPeople),
@@ -23,10 +22,10 @@ const ShelterListItem = (props: IShelterListItemProps) => {
 
   const tags = useMemo(
     () =>
-      data.supplies
+      data.shelterSupplies
         .filter((s) => s.priority >= SupplyPriority.Needing)
         .sort((a, b) => b.priority - a.priority),
-    [data.supplies]
+    [data.shelterSupplies]
   );
 
   return (
@@ -51,7 +50,7 @@ const ShelterListItem = (props: IShelterListItemProps) => {
       <h6 className="text-muted-foreground text-sm md:text-lg font-medium">
         {data.address}
       </h6>
-      {data.supplies.length > 0 && (
+      {data.shelterSupplies.length > 0 && (
         <div className="flex flex-col gap-3">
           <Separator className="mt-2" />
           <p className="text-muted-foreground text-sm md:text-lg font-medium">
@@ -62,7 +61,7 @@ const ShelterListItem = (props: IShelterListItemProps) => {
               <Chip
                 className={getSupplyPriorityProps(s.priority).className}
                 key={idx}
-                label={s.name}
+                label={s.supply.name}
               />
             ))}
           </div>
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
@@ -4,6 +4,7 @@ import { usePaginatedQuery } from './usePaginatedQuery';
 import { useThrottle } from './useThrottle';
 import { useShelter } from './useShelter';
 import { useSupplyCategories } from './useSupplyCategories';
+import { useSupplies } from './useSupplies';
 
 export {
   useShelters,
@@ -12,4 +13,5 @@ export {
   useThrottle,
   useShelter,
   useSupplyCategories,
+  useSupplies,
 };
diff --git a/src/hooks/usePaginatedQuery/paths.ts b/src/hooks/usePaginatedQuery/paths.ts
@@ -1,4 +1,5 @@
 export enum PaginatedQueryPath {
   Shelters = '/shelters',
   SupplyCategories = '/supply-categories',
+  Supplies = '/supplies',
 }
diff --git a/src/hooks/useShelter/types.ts b/src/hooks/useShelter/types.ts
@@ -8,18 +8,24 @@ export interface IUseShelterData {
   contact?: string | null;
   petFriendly?: boolean | null;
   prioritySum: number;
-  supplies: IUseShelterDataSupply[];
+  latitude?: string | null;
+  longitude?: string | null;
+  shelterSupplies: IUseShelterDataSupply[];
   createdAt: string;
   updatedAt?: string | null;
 }
 
 export interface IUseShelterDataSupply {
+  priority: number;
+  supply: IUseShelterDataSupplyData;
+}
+
+export interface IUseShelterDataSupplyData {
   id: string;
   name: string;
-  priority: number;
   supplyCategory: IUseShelterDataSupplyCategory;
-  createdAt: Date;
-  updatedAt: Date | null;
+  createdAt: string;
+  updatedAt?: string | null;
 }
 
 export interface IUseShelterDataSupplyCategory {
diff --git a/src/hooks/useShelters/types.ts b/src/hooks/useShelters/types.ts
@@ -1,4 +1,21 @@
-import { IShelter } from '@/service/shelter/types';
-import { ISupply } from '@/service/supply/types';
+export interface IUseSheltersData {
+  id: string;
+  name: string;
+  address: string;
+  pix?: string | null;
+  shelteredPeople?: number | null;
+  capacity?: number | null;
+  contact?: string | null;
+  petFriendly?: boolean | null;
+  prioritySum: number;
+  latitude?: string | null;
+  longitude?: string | null;
+  createdAt: string;
+  updatedAt?: string | null;
+  shelterSupplies: IUseSheltersDataSupplyData[];
+}
 
-export type IUseSheltersData = IShelter & { supplies: ISupply[] };
+export interface IUseSheltersDataSupplyData {
+  supply: { name: string };
+  priority: number;
+}
diff --git a/src/hooks/useSupplies/index.ts b/src/hooks/useSupplies/index.ts
@@ -0,0 +1,3 @@
+import { useSupplies } from './useSupplies';
+
+export { useSupplies };
diff --git a/src/hooks/useSupplies/types.ts b/src/hooks/useSupplies/types.ts
diff --git a/src/hooks/useSupplies/useSupplies.tsx b/src/hooks/useSupplies/useSupplies.tsx
@@ -0,0 +1,9 @@
+import { ISupply } from '@/service/supply/types';
+import { useFetch } from '../useFetch';
+import { PaginatedQueryPath } from '../usePaginatedQuery/paths';
+
+const useSupplies = () => {
+  return useFetch<ISupply[]>(PaginatedQueryPath.Supplies, []);
+};
+
+export { useSupplies };
diff --git a/src/pages/CreateSupply/CreateSupply.tsx b/src/pages/CreateSupply/CreateSupply.tsx
@@ -16,7 +16,8 @@ import {
 } from '@/components/ui/select';
 import { ICreateSupply, SupplyPriority } from '@/service/supply/types';
 import { getSupplyPriorityProps } from '@/lib/utils';
-import { SupplyServices } from '@/service';
+import { ShelterSupplyServices, SupplyServices } from '@/service';
+import { ICreateShelterSupply } from '@/service/shelterSupply/types';
 
 const CreateSupply = () => {
   const navigate = useNavigate();
@@ -31,12 +32,12 @@ const CreateSupply = () => {
     handleSubmit,
     setFieldValue,
     values,
-  } = useFormik<ICreateSupply>({
+  } = useFormik<ICreateSupply & Omit<ICreateShelterSupply, 'supplyId'>>({
     initialValues: {
       name: '',
-      priority: SupplyPriority.UnderControl,
       supplyCategoryId: supplyCategories?.at(0)?.id ?? '-1',
       shelterId,
+      priority: SupplyPriority.UnderControl,
     },
     enableReinitialize: true,
     validateOnBlur: false,
@@ -50,9 +51,14 @@ const CreateSupply = () => {
     }),
     onSubmit: async (values) => {
       try {
-        await SupplyServices.create({
-          ...values,
+        const resp = await SupplyServices.create({
+          name: values.name,
+          supplyCategoryId: values.supplyCategoryId,
+        });
+        await ShelterSupplyServices.create({
+          supplyId: resp.data.id,
           priority: +values.priority,
+          shelterId,
         });
         toast({
           title: 'Item cadastrado com sucesso',
diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx
@@ -92,15 +92,6 @@ const Home = () => {
             <Search name="search" size="20" className="stroke-zinc-300" />
           </div>
         </div>
-        <div></div>
-        {/* <div className="[&_svg]:stroke-blue-500">
-          <Button variant="ghost" size="sm" className="flex gap-2 items-center">
-            <ListFilter className="h-5 w-5" />
-            <h1 className="font-semibold text-[16px] text-blue-500">
-              Filtros
-            </h1>
-          </Button>
-        </div> */}
         <main className="flex flex-col gap-4">
           {loading ? (
             <Loader className="justify-self-center self-center w-5 h-5 animate-spin" />
diff --git a/src/pages/Shelter/Shelter.tsx b/src/pages/Shelter/Shelter.tsx
@@ -13,20 +13,21 @@ import { SupplyPriority } from '@/service/supply/types';
 
 const Shelter = () => {
   const params = useParams();
-  const { id } = params;
+  const { id = '-1' } = params;
   const navigate = useNavigate();
   const { data: shelter, loading } = useShelter(id ?? '-1');
+  const { data: shelters } = useShelter(id);
 
   const shelterCategories: IShelterCategoryItemsProps[] = useMemo(() => {
-    const grouped = group(shelter?.supplies ?? [], 'priority');
+    const grouped = group(shelters?.shelterSupplies ?? [], 'priority');
     delete grouped[SupplyPriority.UnderControl];
     return Object.entries(grouped)
       .sort(([a], [b]) => (+a > +b ? -1 : 1))
       .map(([key, values]) => ({
         priority: +key,
-        tags: values.map((v) => v.name),
+        tags: values.map((v) => v.supply.name),
       }));
-  }, [shelter.supplies]);
+  }, [shelters.shelterSupplies]);
 
   const { availability, className: availabilityClassName } =
     useMemo<IShelterAvailabilityProps>(
diff --git a/src/pages/Shelter/components/ShelterCategoryItems/ShelterCategoryItems.tsx b/src/pages/Shelter/components/ShelterCategoryItems/ShelterCategoryItems.tsx
@@ -5,9 +5,11 @@ import { IShelterCategoryItemsProps } from './types';
 import { getSupplyPriorityProps } from '@/lib/utils';
 import { CircleStatus, Chip } from '@/components';
 import { Button } from '@/components/ui/button';
+import { SupplyPriority } from '@/service/supply/types';
 
 const ShelterCategoryItems = (props: IShelterCategoryItemsProps) => {
-  const { priority, tags } = props;
+  console.log({ props });
+  const { priority = SupplyPriority.UnderControl, tags } = props;
   const [opened, setOpened] = useState<boolean>(false);
   const maxVisibleTags: number = 10;
   const visibleTags = useMemo(
diff --git a/src/pages/Shelter/components/ShelterCategoryItems/types.ts b/src/pages/Shelter/components/ShelterCategoryItems/types.ts
@@ -1,6 +1,6 @@
 import { SupplyPriority } from '@/service/supply/types';
 
 export interface IShelterCategoryItemsProps {
-  priority: SupplyPriority;
+  priority?: SupplyPriority;
   tags: string[];
 }
diff --git a/src/pages/ShelterItem/ShelterItem.tsx b/src/pages/ShelterItem/ShelterItem.tsx
@@ -1,23 +1,40 @@
 import { ChevronLeft, PlusCircle } from 'lucide-react';
 import { useNavigate, useParams } from 'react-router-dom';
-import { Fragment, useCallback, useMemo, useState } from 'react';
+import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 
-import { DialogSelector, Header, LoadingScreen } from '@/components';
+import { DialogSelector, Header, LoadingScreen, TextField } from '@/components';
 import { Button } from '@/components/ui/button';
-import { useShelter } from '@/hooks';
+import { useShelter, useSupplies, useThrottle } from '@/hooks';
 import { group } from '@/lib/utils';
-import { IUseShelterDataSupply } from '@/hooks/useShelter/types';
 import { SupplyRow } from './components';
 import { IDialogSelectorProps } from '@/components/DialogSelector/types';
-import { SupplyPriority } from '@/service/supply/types';
 import { ISupplyRowItemProps } from './components/SupplyRow/types';
-import { SupplyServices } from '@/service';
+import { ShelterSupplyServices } from '@/service';
 import { useToast } from '@/components/ui/use-toast';
+import { ISupply, SupplyPriority } from '@/service/supply/types';
 
 const ShelterItem = () => {
   const navigate = useNavigate();
   const { shelterId = '-1' } = useParams();
   const { data: shelter, loading, refresh } = useShelter(shelterId);
+  const { data: supplies } = useSupplies();
+  const [filteredSupplies, setFilteredSupplies] = useState<ISupply[]>([]);
+  const [searchValue, setSearchValue] = useState<string>('');
+  const [, setSearch] = useThrottle<string>(
+    {
+      throttle: 400,
+      callback: (v) => {
+        if (v) {
+          setFilteredSupplies(
+            supplies.filter((s) =>
+              s.name.toLowerCase().includes(v.toLowerCase())
+            )
+          );
+        } else setFilteredSupplies(supplies);
+      },
+    },
+    [supplies]
+  );
   const [modalOpened, setModalOpened] = useState<boolean>(false);
   const [loadingSave, setLoadingSave] = useState<boolean>(false);
   const [modalData, setModalData] = useState<Pick<
@@ -27,12 +44,8 @@ const ShelterItem = () => {
   const { toast } = useToast();
 
   const supplyGroups = useMemo(
-    () =>
-      group<IUseShelterDataSupply>(
-        shelter?.supplies ?? [],
-        'supplyCategory.name'
-      ),
-    [shelter.supplies]
+    () => group<ISupply>(filteredSupplies ?? [], 'supplyCategory.name'),
+    [filteredSupplies]
   );
 
   const handleClickSupplyRow = useCallback(
@@ -42,7 +55,7 @@ const ShelterItem = () => {
         value: `${item.priority}`,
         onSave: (v) => {
           setLoadingSave(true);
-          SupplyServices.update(item.id, { priority: +v })
+          ShelterSupplyServices.update(shelterId, item.id, { priority: +v })
             .then(() => {
               setModalOpened(false);
               setModalData(null);
@@ -61,9 +74,13 @@ const ShelterItem = () => {
         },
       });
     },
-    [refresh, toast]
+    [refresh, shelterId, toast]
   );
 
+  useEffect(() => {
+    setFilteredSupplies(supplies);
+  }, [supplies]);
+
   if (loading) return <LoadingScreen />;
 
   return (
@@ -123,6 +140,16 @@ const ShelterItem = () => {
             <PlusCircle />
             Cadastrar novo item
           </Button>
+          <div className="w-full my-2">
+            <TextField
+              label="Buscar"
+              value={searchValue}
+              onChange={(ev) => {
+                setSearchValue(ev.target.value);
+                setSearch(ev.target.value);
+              }}
+            />
+          </div>
           <div className="flex flex-col gap-2 w-full my-4">
             {Object.entries(supplyGroups).map(([key, values], idx) => (
               <SupplyRow
@@ -131,7 +158,7 @@ const ShelterItem = () => {
                 items={values.map((v) => ({
                   id: v.id,
                   name: v.name,
-                  priority: v.priority,
+                  priority: 0, //v.priority,
                 }))}
                 onClick={handleClickSupplyRow}
               />
diff --git a/src/pages/ShelterItem/components/SupplyRowInfo/SupplyRowInfo.tsx b/src/pages/ShelterItem/components/SupplyRowInfo/SupplyRowInfo.tsx
@@ -1,6 +1,7 @@
+import { useMemo } from 'react';
+
 import { CircleStatus } from '@/components';
 import { ISupplyRowInfoProps } from './types';
-import { useMemo } from 'react';
 import { getSupplyPriorityProps } from '@/lib/utils';
 
 const SupplyRowInfo = (props: ISupplyRowInfoProps) => {
diff --git a/src/service/index.ts b/src/service/index.ts
@@ -1,6 +1,13 @@
 import { SessionServices } from './sessions';
 import { ShelterServices } from './shelter';
 import { SupplyServices } from './supply';
+import { ShelterSupplyServices } from './shelterSupply';
 import { UserServices } from './users';
 
-export { UserServices, SessionServices, SupplyServices, ShelterServices };
+export {
+  UserServices,
+  SessionServices,
+  SupplyServices,
+  ShelterServices,
+  ShelterSupplyServices,
+};
diff --git a/src/service/shelterSupply/index.ts b/src/service/shelterSupply/index.ts
@@ -0,0 +1,3 @@
+import { ShelterSupplyServices } from './shelter-supply.service';
+
+export { ShelterSupplyServices };
diff --git a/src/service/shelterSupply/shelter-supply.service.ts b/src/service/shelterSupply/shelter-supply.service.ts
@@ -0,0 +1,23 @@
+import { api } from '@/api';
+import { IServerResponse } from '@/types';
+import { ICreateShelterSupply, IUpdateShelterSupply } from './types';
+
+const ShelterSupplyServices = {
+  update: async (
+    shelterId: string,
+    supplyId: string,
+    payload: IUpdateShelterSupply
+  ): Promise<IServerResponse> => {
+    const { data } = await api.put(
+      `/shelter/supplies/${shelterId}/${supplyId}`,
+      payload
+    );
+    return data;
+  },
+  create: async (payload: ICreateShelterSupply): Promise<IServerResponse> => {
+    const { data } = await api.post('/shelter/supplies', payload);
+    return data;
+  },
+};
+
+export { ShelterSupplyServices };
diff --git a/src/service/shelterSupply/types.ts b/src/service/shelterSupply/types.ts
diff --git a/src/service/supply/supply.service.ts b/src/service/supply/supply.service.ts
diff --git a/src/service/supply/types.ts b/src/service/supply/types.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export enum PaginatedQueryPath {`
`2`	`2`	`Shelters = '/shelters',`
`3`	`3`	`SupplyCategories = '/supply-categories',`
	`4`	`+ Supplies = '/supplies',`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { useSupplies } from './useSupplies';`
	`2`	`+`
	`3`	`+export { useSupplies };`