senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make dlock screen waiting for incident calculation to finish

Browse Source
This commit is contained in:
Bilal Catic
2019-07-25 06:28:26 +02:00
parent 2b271196a0
commit 54ae3e4ef5
3 changed files with 81 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
constants/constants.js
View File

@@ -62,6 +62,7 @@ const officeRnDAPIErrors = {
FAILED_TO_ADD_FEES: 'Failed to add fees in ORD', FAILED_TO_ADD_FEES: 'Failed to add fees in ORD',
}; };
const integrationServiceErrors = { 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_BOOKINGS: 'Failed to save booking reservations',
FAILED_TO_SAVE_DOOR_LOCK_ENTRIES: 'Failed to save door lock entries', FAILED_TO_SAVE_DOOR_LOCK_ENTRIES: 'Failed to save door lock entries',
FAILED_TO_SAVE_DATA_GENERIC: 'Failed to save data', FAILED_TO_SAVE_DATA_GENERIC: 'Failed to save data',

34
controllers/doorLock.js
View File

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

92
services/integration/doorLockCharges.js
View File

@@ -510,52 +510,66 @@ const getIncidentData = (reservation) => {
}; };
const calculateDoorLockCharges = () => { const calculateDoorLockCharges = () => {
getAllFinishedBookings() return new Promise((resolve, reject) => {
.then((reservations) => { getAllFinishedBookings()
const unlockedIncidents = []; .then((reservations) => {
const unscheduledIncidents = []; const unlockedIncidents = [];
const unscheduledIncidents = [];
const asyncCheckForIncidents = []; const asyncCheckForIncidents = [];
reservations.forEach((reservation) => { reservations.forEach((reservation) => {
asyncCheckForIncidents.push(getIncidentData(reservation)); asyncCheckForIncidents.push(getIncidentData(reservation));
}); });
Promise.all(asyncCheckForIncidents) Promise.all(asyncCheckForIncidents)
.then((allReservationsIncidents) => { .then((allReservationsIncidents) => {
allReservationsIncidents.forEach((reservationIncidents) => { allReservationsIncidents.forEach((reservationIncidents) => {
reservationIncidents.forEach((incident) => { reservationIncidents.forEach((incident) => {
if (incident.error) { if (incident.error) {
console.log('Error checking incident : ', incident.error); console.log('Error checking incident : ', incident.error);
} else if (incident.incidentType) { } else if (incident.incidentType) {
switch (incident.incidentType) { switch (incident.incidentType) {
case incidentType.UNLOCKED_INCIDENT_RELATED_WITH_RESERVATION: case incidentType.UNLOCKED_INCIDENT_RELATED_WITH_RESERVATION:
case incidentType.UNLOCKED_INCIDENT_STANDALONE: case incidentType.UNLOCKED_INCIDENT_STANDALONE:
unlockedIncidents.push(incident); unlockedIncidents.push(incident);
break; break;
case incidentType.UNSCHEDULED_INCIDENT_BEFORE_RESERVATION: case incidentType.UNSCHEDULED_INCIDENT_BEFORE_RESERVATION:
case incidentType.UNSCHEDULED_INCIDENT_AFTER_RESERVATION: case incidentType.UNSCHEDULED_INCIDENT_AFTER_RESERVATION:
case incidentType.UNSCHEDULED_INCIDENT_STANDALONE: case incidentType.UNSCHEDULED_INCIDENT_STANDALONE:
unscheduledIncidents.push(incident); unscheduledIncidents.push(incident);
break; break;
}
} }
} });
}); });
});
insertUnscheduledIncidents(unscheduledIncidents) setUnlockedIncidentsLevel(unlockedIncidents)
.catch((error) => console.log(error)); .then((completedUnlockedIncidents) => {
const insertIncidentsJobs = [insertUnscheduledIncidents(unscheduledIncidents), insertUnlockedIncidents(completedUnlockedIncidents)];
setUnlockedIncidentsLevel(unlockedIncidents) Promise.all(insertIncidentsJobs)
.then((completedUnlockedIncidents) => { .then(() => {
insertUnlockedIncidents(completedUnlockedIncidents) resolve(true);
.catch((error) => console.log(error)); })
}) .catch((error) => {
.catch((error) => console.log(error)); reject(error);
}) });
.catch((error) => console.log(error));
}) /*
.catch((error) => console.log(error)); insertUnscheduledIncidents(unscheduledIncidents)
.catch((error) => console.log(error));
insertUnlockedIncidents(completedUnlockedIncidents)
.catch((error) => console.log(error));
*/
})
.catch((error) => reject(error));
})
.catch((error) => reject(error));
})
.catch((error) => reject(error));
});
}; };
module.exports = { module.exports = {