Improved: Added logic to fetch archived facilities in batches using a do-while loop (#359)

src/services/FacilityService.ts

@@ -526,30 +526,35 @@ const fetchFacilityGroups = async (payload: any): Promise<any> => {
 }
 
 const fetchArchivedFacilities = async (): Promise<any> => {
-  let facilities = []
+  let facilities = [] as any, viewIndex = 0, resp = {} as any;
 
   try {
-    const resp = await api({
-      url: "performFind",
-      method: "post",
-      data: {
-        inputFields: {
-          facilityGroupId: 'ARCHIVE',
-        },
-        fieldList: ['facilityName', 'facilityGroupId', 'facilityId', 'facilityGroupTypeId', "fromDate"],
-        entityName: "FacilityAndGroupMember",
-        distinct: 'Y',
-        noConditionFind: 'Y',
-        filterByDate: 'Y',
-        viewSize: 50
+    do {
+      resp = await api({
+        url: "performFind",
+        method: "post",
+        data: {
+          inputFields: {
+            facilityGroupId: 'ARCHIVE',
+          },
+          fieldList: ['facilityName', 'facilityGroupId', 'facilityId', 'facilityGroupTypeId', "fromDate"],
+          entityName: "FacilityAndGroupMember",
+          distinct: 'Y',
+          noConditionFind: 'Y',
+          filterByDate: 'Y',
+          viewSize: 50,
+          viewIndex
+        }
+      }) as any
+
+      if (!hasError(resp) && resp.data.count > 0) {
+        facilities = facilities.concat(resp.data.docs)
+        viewIndex++;
+      } else {
+        throw resp.data
       }
-    }) as any
-
-    if (!hasError(resp) && resp.data.count > 0) {
-      facilities = resp.data.docs
-    } else {
-      throw resp.data
     }
+    while (resp.data.docs.length >= 50);
   } catch (error) {
     logger.error('Failed to fetch archived parkings.', error)
   }

src/store/modules/facility/actions.ts

@@ -557,9 +557,7 @@
           parentFacilityTypeId_grp: '1',
           facilityTypeId_value: 'VIRTUAL_FACILITY',
           facilityTypeId_op: 'equals',
-          facilityTypeId_grp: '2',
-          // conditionally filtering if archived facilities are present
-          ...(archivedFacilityIds.length && { facilityId: archivedFacilityIds, facilityId_op: 'not-in' }),
+          facilityTypeId_grp: '2'
         },
         orderBy: "facilityName ASC",
         entityName: "FacilityAndProductStore",
@@ -585,11 +583,19 @@
     }
 
     emitter.emit("dismissLoader");
-    commit(types.FACILITY_VIRTUAL_FACILITY_LIST_UPDATED, { facilities, total });
-    if (facilities.length) {
+    const filteredFacilities = await dispatch('filterParkingFacilities', { facilities, archivedFacilityIds })
+    commit(types.FACILITY_VIRTUAL_FACILITY_LIST_UPDATED, { facilities: filteredFacilities, total });
+    if (filteredFacilities.length) {
       await dispatch('fetchVirtualFacilitiesAdditionalDetail', payload)
     }
   },
+
+  async filterParkingFacilities({ commit, dispatch }, { facilities, archivedFacilityIds }) {
+    const matchedFacilities = facilities.filter((facility: any) => archivedFacilityIds.includes(facility.facilityId));
+    const updatedFacilities = facilities.filter((facility: any) => !archivedFacilityIds.includes(facility.facilityId));
+    if(matchedFacilities.length) dispatch('updateArchivedFacilities', matchedFacilities)
+    if(updatedFacilities.length) return updatedFacilities;
+  },
 
   async fetchVirtualFacilitiesAdditionalDetail({ commit, state }, payload) {
     // getting all the facilties from state