make dlock screen waiting for incident calculation to finish

constants/constants.js

@@ -62,6 +62,7 @@ const officeRnDAPIErrors = {
     FAILED_TO_ADD_FEES: 'Failed to add fees in ORD',
 };
 const integrationServiceErrors = {
+    IMPORT_SUCCESSFUL_CALCULATION_FAILED: 'Import succeeded but fetching reservations and calculating charges failed',
     FAILED_TO_SAVE_BOOKINGS: 'Failed to save booking reservations',
     FAILED_TO_SAVE_DOOR_LOCK_ENTRIES: 'Failed to save door lock entries',
     FAILED_TO_SAVE_DATA_GENERIC: 'Failed to save data',

controllers/doorLock.js

@@ -4,6 +4,7 @@ const { parseDoorLockDataFile, writeDoorLockEvent } = require('../services/doorL
 const { fetchAllBookings, writeBookingReservation } = require('../services/officeRnD/bookings');
 const { calculateDoorLockCharges } = require('../services/integration/doorLockCharges');
 const { integrationServiceErrors } = require('../constants/constants');
+const { checkBookingChanges } = require('../services/integration/checkBookingChange');
 
 const IncomingForm = require('formidable').IncomingForm;
 
@@ -41,6 +42,10 @@ const uploadDoorLockData = (req, res) => {
                 parsedData.forEach((entry) => asyncWriteJobs.push(writeDoorLockEvent(entry)));
 
                 Promise.all(asyncWriteJobs)
+                    .then(() => {
+                        checkBookingChanges()
+                            .then(() => {
+                                calculateDoorLockCharges()
                                     .then(() => {
                                         res.json({
                                             parsedData,
@@ -48,13 +53,23 @@ const uploadDoorLockData = (req, res) => {
                                             unknownMembers
                                         });
                                     })
+                                    .catch((error) => {
+                                        console.log('Error : ', error);
+                                        res.status(500).send(integrationServiceErrors.IMPORT_SUCCESSFUL_CALCULATION_FAILED);
+                                    });
+                            })
+                            .catch((error) => {
+                                console.log('Error : ', error);
+                                res.status(500).send(integrationServiceErrors.IMPORT_SUCCESSFUL_CALCULATION_FAILED);
+                            });
+                    })
                     .catch((error) => {
                         console.log(integrationServiceErrors.FAILED_TO_SAVE_DOOR_LOCK_ENTRIES);
                         console.log(error);
                         res.status(500).send(integrationServiceErrors.FAILED_TO_SAVE_DATA_GENERIC);
                     });
 
-                fetchAllBookings()
+                /*fetchAllBookings()
                     .then((bookingEntries) => {
                         const asyncJobs = [];
                         bookingEntries.forEach((bookingEntry) => asyncJobs.push(writeBookingReservation(bookingEntry)));
@@ -62,13 +77,18 @@ const uploadDoorLockData = (req, res) => {
                         Promise.all(asyncJobs)
                             .then(() => {
                                 calculateDoorLockCharges();
-                            });
+                            })
+                            .catch((error) => {
+                                console.log('Error updating booking reservations : ');
+                                console.log(error);
+                            })
                     })
                     .catch((error) => {
                         console.log(integrationServiceErrors.FAILED_TO_SAVE_BOOKINGS);
                         console.log(error);
                         return;
                     });
+                 */
             })
             .catch((error) => {
                 res.status(500).send(error);

services/integration/doorLockCharges.js

@@ -510,6 +510,7 @@ const getIncidentData = (reservation) => {
 };
 
 const calculateDoorLockCharges = () => {
+    return new Promise((resolve, reject) => {
         getAllFinishedBookings()
             .then((reservations) => {
                 const unlockedIncidents = [];
@@ -543,19 +544,32 @@ const calculateDoorLockCharges = () => {
                             });
                         });
 
+                        setUnlockedIncidentsLevel(unlockedIncidents)
+                            .then((completedUnlockedIncidents) => {
+                                const insertIncidentsJobs = [insertUnscheduledIncidents(unscheduledIncidents), insertUnlockedIncidents(completedUnlockedIncidents)];
+
+                                Promise.all(insertIncidentsJobs)
+                                    .then(() => {
+                                        resolve(true);
+                                    })
+                                    .catch((error) => {
+                                        reject(error);
+                                    });
+
+                                /*
                                 insertUnscheduledIncidents(unscheduledIncidents)
                                     .catch((error) => console.log(error));
 
-                    setUnlockedIncidentsLevel(unlockedIncidents)
-                        .then((completedUnlockedIncidents) => {
                                 insertUnlockedIncidents(completedUnlockedIncidents)
                                     .catch((error) => console.log(error));
+                                 */
                             })
-                        .catch((error) => console.log(error));
+                            .catch((error) => reject(error));
                     })
-                .catch((error) => console.log(error));
+                    .catch((error) => reject(error));
             })
-        .catch((error) => console.log(error));
+            .catch((error) => reject(error));
+    });
 };
 
 module.exports = {