remove redundant models

ohcnetwork · Oct 30, 2023 · 72e5b27 · 72e5b27
1 parent ca42eb8
commit 72e5b27
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 60 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx
@@ -259,9 +259,9 @@ export const FacilityCreate = (props: FacilityProps) => {
       setIsWardLoading(true);
       if (wardsData) {
         const updatedWards = {
-          id: wardsData.id,
-          name: wardsData.name,
-          number: wardsData.number,
+          id: wardsData.results[0].id,
+          name: wardsData.results[0].name,
+          number: wardsData.results[0].number,
         };
         setWard([updatedWards]);
       }

diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
@@ -247,10 +247,6 @@ export type IStateListResponse = PaginatedResponse<UnitModel>;
 export type IDistrictLocalBodyResponse = StateModel & {
   state: number;
 };
-export type IWardLocalBodyResponse = StateModel & {
-  number: number;
-  local_body: number;
-};
 
 export type IFacilityRequest = Omit<
   FacilityModel,
@@ -275,10 +271,20 @@ export type IFacilityRequest = Omit<
   longitude?: string;
   phone_number?: string | undefined;
 };
-export type IFacilityResponse = Omit<
-  IAllFacilitiesResponse,
-  "facility_type"
-> & {
+export type IFacilityResponse = {
+  id: string;
+  name: string;
+  local_body: number;
+  district: number;
+  state: number;
+  ward_object: WardModel;
+  local_body_object: { id: number } & LocalBodyModel;
+  district_object: DistrictModel;
+  state_object: StateModel;
+  read_cover_image_url: string;
+  features: number[];
+  patient_count: string;
+  bed_count: string;
   ward: number;
   facility_type: number;
   address: string;
@@ -299,22 +305,6 @@ export type IFacilityResponse = Omit<
   expected_type_c_cylinders: number;
   expected_type_d_cylinders: number;
 };
-export type IAllFacilitiesResponse = {
-  id: string;
-  name: string;
-  local_body: number;
-  district: number;
-  state: number;
-  ward_object: WardModel;
-  local_body_object: { id: number } & LocalBodyModel;
-  district_object: DistrictModel;
-  state_object: StateModel;
-  facility_type: string;
-  read_cover_image_url: string;
-  features: number[];
-  patient_count: string;
-  bed_count: string;
-};
 
 export type IListDoctorResponse = PaginatedResponse<{
   id: string;
@@ -641,14 +631,6 @@ export type IFlagInventoryItemResponse = {
   created_by: number;
 };
 
-export type IAssetBedResponse = PaginatedResponse<
-  BaseResponse & {
-    asset_object: Asset;
-    bed_object: BedObjectModel;
-    meta: Record<string, string>;
-  }
->;
-
 export type ICreateTriageRequest = {
   entry_date?: string;
   num_patients_visited?: number;

diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
@@ -1,5 +1,5 @@
 import { IConfig } from "../Common/hooks/useConfig";
-import { AssetData } from "../Components/Assets/AssetTypes";
+import { AssetBedModel, AssetData } from "../Components/Assets/AssetTypes";
 import {
   IUserFacilityRequest,
   IFacilityNotificationRequest,
@@ -9,7 +9,6 @@ import {
   IUserListFacilityResponse,
   LocationModel,
   IUserFacilityResponse,
-  IAllFacilitiesResponse,
   IFacilityUserResponse,
   ILocalBodyResponse,
   IInventorySummaryResponse,
@@ -25,17 +24,17 @@ import {
   ISetMinQuantityRequest,
   ISetMinQuantityResponse,
   IFlagInventoryItemResponse,
-  IAssetBedResponse,
   IStateListResponse,
   IDistrictLocalBodyResponse,
-  IWardLocalBodyResponse,
   ICreateTriageRequest,
   ICreateTriageResponse,
   IFacilityNotificationResponse,
   CapacityModal,
   StateModel,
   InventoryItemObjectModel,
   DeleteModel,
+  FacilityModel,
+  WardModel,
 } from "../Components/Facility/models";
 import { PatientModel } from "../Components/Patient/models";
 import { UserModel } from "../Components/Users/models";
@@ -222,7 +221,7 @@ const routes = {
 
   getAnyFacility: {
     path: "/api/v1/getallfacilities/{id}/",
-    TRes: Type<IAllFacilitiesResponse>(),
+    TRes: Type<FacilityModel>(),
   },
 
   updateFacility: {
@@ -235,8 +234,8 @@ const routes = {
   partialUpdateFacility: {
     path: "/api/v1/facility/{id}/",
     method: "PATCH",
-    TBody: Type<IFacilityRequest>(),
-    TRes: Type<IFacilityResponse>(),
+    TBody: Type<FacilityModel>(),
+    TRes: Type<FacilityModel>(),
   },
 
   deleteFacilityCoverImage: {
@@ -275,7 +274,7 @@ const routes = {
   listAssetBeds: {
     path: "/api/v1/assetbed/",
     method: "GET",
-    TRes: Type<IAssetBedResponse>(),
+    TRes: Type<PaginatedResponse<AssetBedModel>>(),
   },
   createAssetBed: {
     path: "/api/v1/assetbed/",
@@ -626,7 +625,7 @@ const routes = {
   },
   getWardByLocalBody: {
     path: "/api/v1/ward/?local_body={id}",
-    TRes: Type<IWardLocalBodyResponse>(),
+    TRes: Type<PaginatedResponse<WardModel>>(),
   },
 
   // Sample Test