calculate dlock charges on dlock file upload. Refactor member lookup

This commit is contained in:
Bilal Catic
2019-06-15 14:46:13 +02:00
parent 596336c41b
commit 803fed2bcf
3 changed files with 26 additions and 26 deletions

View File

@@ -30,34 +30,39 @@ const uploadDoorLockData = (req, res) => {
unknownMembers.push(...parserResult.unknownMembers);
});
const asyncJobs = [];
const asyncWriteJobs = [];
fetchAllBookings()
.then((bookingEntries) => {
bookingEntries.forEach((bookingEntry) => asyncJobs.push(writeBookingReservation(bookingEntry)));
})
.catch((error) => {
res.status(500).send(error);
return;
});
parsedData.forEach((entry) => asyncWriteJobs.push(writeDoorLockEvent(entry)));
parsedData.forEach((entry) => asyncJobs.push(writeDoorLockEvent(entry)));
Promise.all(asyncJobs)
Promise.all(asyncWriteJobs)
.then(() => {
res.json({
parsedData,
parserErrors,
unknownMembers
});
calculateDoorLockCharges();
})
.catch((error) => {
console.log(`${integrationServiceErrors.FAILED_TO_SAVE_BOOKINGS} or ${integrationServiceErrors.FAILED_TO_SAVE_DOOR_LOCK_ENTRIES}`)
console.log(integrationServiceErrors.FAILED_TO_SAVE_DOOR_LOCK_ENTRIES);
console.log(error);
res.status(500).send(integrationServiceErrors.FAILED_TO_SAVE_DATA_GENERIC);
});
fetchAllBookings()
.then((bookingEntries) => {
const asyncJobs = [];
bookingEntries.forEach((bookingEntry) => asyncJobs.push(writeBookingReservation(bookingEntry)));
Promise.all(asyncJobs)
.then(() => {
calculateDoorLockCharges();
});
})
.catch((error) => {
console.log(integrationServiceErrors.FAILED_TO_SAVE_BOOKINGS);
console.log(error);
return;
});
})
.catch((error) => {
res.status(500).send(error);