refactor: changed order of shelters to updated at instead priority sum (SOS-RS#137) (SOS-RS#140)

Co-authored-by: José Geraldo D. F <[email protected]>

Author: 2 people

src/hooks/useShelters/types.ts

@@ -1,6 +1,17 @@
-import { ShelterTagType } from '@/pages/Home/components/ShelterListItem/types';
+export enum ShelterCategory {
+  Shelter = 'Shelter',
+  DistributionCenter = 'DistributionCenter',
+}
+
+export enum SupplyMeasure {
+  Unit = 'Unit',
+  Kg = 'Kg',
+  Litters = 'Litters',
+  Box = 'Box',
+  Piece = 'Piece',
+}
 
-export interface IUseSheltersData {
+export interface IUseShelterData {
   id: string;
   name: string;
   street?: string;
@@ -18,24 +29,29 @@ export interface IUseSheltersData {
   verified: boolean;
   latitude?: string | null;
   longitude?: string | null;
+  shelterSupplies: IUseShelterDataSupply[];
+  category: ShelterCategory;
+  actived: boolean;
   createdAt: string;
   updatedAt?: string | null;
-  shelterSupplies: IUseSheltersDataSupplyData[];
 }
 
-export interface IUseSheltersDataSupplyData {
-  supply: {
-    name: string;
-    supplyCategory: { name: string };
-  };
+export interface IUseShelterDataSupply {
   priority: number;
-  tags: ShelterTagType[];
-<<<<<<< HEAD
   quantity?: number | null;
-=======
->>>>>>> 3d3f437 (merge: develop -> master (#91))
+  supply: IUseShelterDataSupplyData;
 }
 
-export interface IUseShelterOptions {
-  cache?: boolean;
+export interface IUseShelterDataSupplyData {
+  id: string;
+  name: string;
+  measure: SupplyMeasure;
+  supplyCategory: IUseShelterDataSupplyCategory;
+  createdAt: string;
+  updatedAt?: string | null;
 }
+
+export interface IUseShelterDataSupplyCategory {
+  id: string;
+  name: string;
+}

src/hooks/useShelters/useShelters.tsx

@@ -1,70 +1,11 @@
-import { useState, useCallback, useEffect } from 'react';
-import { AxiosRequestConfig } from 'axios';
+import { useFetch } from '../useFetch';
+import { PaginatedQueryPath } from '../usePaginatedQuery/paths';
+import { IUseShelterData } from './types';
 
-import { api } from '@/api';
-import { IServerResponse } from '@/types';
-import { IPaginatedResponse } from '../usePaginatedQuery/types';
-import { IUseShelterOptions, IUseSheltersData } from './types';
-
-const useShelters = (options: IUseShelterOptions = {}) => {
-  const { cache } = options;
-  const [loading, setLoading] = useState<boolean>(false);
-  const [data, setData] = useState<IPaginatedResponse<IUseSheltersData>>({
-    count: 0,
-    page: 1,
-    perPage: 20,
-    results: [],
-  });
-
-  const refresh = useCallback(
-    (config: AxiosRequestConfig<any> = {}, append: boolean = false) => {
-      const { search, ...rest } = (config ?? {}).params ?? {};
-      const headers = config.headers ?? {};
-      if (cache) headers['x-app-cache'] = 'true';
-      if (!append) setLoading(true);
-      api
-        .get<IServerResponse<any>>('/shelters', {
-          ...config,
-          headers,
-          params: {
-<<<<<<< HEAD
-            orderBy: 'updatedAt',
-=======
-            orderBy: 'prioritySum',
->>>>>>> 3d3f437 (merge: develop -> master (#91))
-            order: 'desc',
-            search:
-              search ?? new URLSearchParams(window.location.search).toString(),
-            ...rest,
-          },
-        })
-        .then(({ data }) => {
-          if (append) {
-            setData((prev) => ({
-              ...prev,
-              ...data.data,
-              results: [...prev.results, ...data.data.results],
-            }));
-          } else {
-            setData((prev) => ({
-              ...prev,
-              ...data.data,
-              results: [...data.data.results],
-            }));
-          }
-        })
-        .finally(() => {
-          if (!append) setLoading(false);
-        });
-    },
-    []
+const useShelter = (shelterId: string) => {
+  return useFetch<IUseShelterData>(
+    `${PaginatedQueryPath.Shelters}/${shelterId}`
   );
-
-  useEffect(() => {
-    refresh();
-  }, [refresh]);
-
-  return { data, loading, refresh };
 };
 
-export { useShelters };
+export { useShelter };