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

fetch only non-deleted unlocked/unscheduled incidents

Browse Source
This commit is contained in:
Bilal Catic
2019-11-20 15:26:20 +01:00
parent d4f823ff72
commit 3d051766b1
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/integration/doorLockCharges.js
View File

@@ -18,7 +18,8 @@ const { getAllFinishedBookings, getFirstPreviousBooking, getFirstNextBooking } =
const getSortedIncidentsForMember = (memberId) => { const getSortedIncidentsForMember = (memberId) => {
const attributes = ['bookingStart', 'incidentLevel', 'incidentLevelPrice', 'unlockTimestamp']; const attributes = ['bookingStart', 'incidentLevel', 'incidentLevelPrice', 'unlockTimestamp'];
const filters = { const filters = {
memberId memberId,
deleted: false
}; };
const order = [['unlockTimestamp', 'DESC']]; const order = [['unlockTimestamp', 'DESC']];
@@ -59,6 +60,7 @@ const insertUnscheduledIncidents = (incidents) => {
bookingEnd: end, bookingEnd: end,
unlockTimestamp, unlockTimestamp,
lockTimestamp, lockTimestamp,
deleted: false
}, },
defaults: {...incidentForDB}, defaults: {...incidentForDB},
})); }));
@@ -93,6 +95,7 @@ const insertUnlockedIncidents = (incidents) => {
bookingEnd: end, bookingEnd: end,
unlockTimestamp, unlockTimestamp,
incidentLevel, incidentLevel,
deleted: false
}, },
defaults: {...incidentForDB}, defaults: {...incidentForDB},
})); }));

8
services/integration/reports.js
View File

@@ -18,7 +18,9 @@ const { getChargedCanceledReservations } = require('../integration/bookingChange
const getUnlockedIncidents = (startDate, endDate, memberIds) => { const getUnlockedIncidents = (startDate, endDate, memberIds) => {
const attributes = ['id', 'reservationId', 'memberId', 'resourceId', 'bookingStart', 'bookingEnd', 'unlockTimestamp', 'incidentLevel', 'incidentLevelPrice']; const attributes = ['id', 'reservationId', 'memberId', 'resourceId', 'bookingStart', 'bookingEnd', 'unlockTimestamp', 'incidentLevel', 'incidentLevelPrice'];
const filters = {}; const filters = {
deleted: false
};
if (startDate && endDate) { if (startDate && endDate) {
const bookingStartCondition = { const bookingStartCondition = {
@@ -76,7 +78,9 @@ const getUnscheduledIncidents = (startDate, endDate, memberIds) => {
'totalChargeFee' 'totalChargeFee'
]; ];
const filters = {}; const filters = {
deleted: false
};
if (startDate && endDate) { if (startDate && endDate) {
const bookingStartCondition = { const bookingStartCondition = {