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

disable adding fees for current or month in future

Browse Source
This commit is contained in:
Bilal Catic
2019-09-06 07:43:51 +02:00
parent ddd375d4ce
commit 392c7f33c3
1 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
controllers/integration.js
View File

@@ -10,7 +10,7 @@ const { reformatMembershipsName } = require('../services/officeRnD/memberships')
const { checkBookingChanges } = require('../services/integration/checkBookingChange'); const { checkBookingChanges } = require('../services/integration/checkBookingChange');
const { checkIfProcessing } = require('../services/integration/processingStatus'); const { checkIfProcessing } = require('../services/integration/processingStatus');
const { UI_TIMEZONE } = require('../constants/constants'); const { UI_TIMEZONE, DEFAULT_DATE_FORMAT } = require('../constants/constants');
const getKnownOfficeResourceMappings = (req, res) => { const getKnownOfficeResourceMappings = (req, res) => {
const dataToFetch = [getMappingsFromDatabase(), fetchOffices(), fetchResources()]; const dataToFetch = [getMappingsFromDatabase(), fetchOffices(), fetchResources()];
@@ -117,7 +117,16 @@ const addFees = (req, res) => {
const dateRange = req.body && req.body.dateRange ? req.body.dateRange : {startDate: null, endDate: null}; const dateRange = req.body && req.body.dateRange ? req.body.dateRange : {startDate: null, endDate: null};
const { startDate, endDate } = dateRange; const { startDate, endDate } = dateRange;
if (startDate && endDate && Array.isArray(memberIds)){ const startDateMoment = moment.tz(dateRange.startDate, DEFAULT_DATE_FORMAT, UI_TIMEZONE);
if (startDate && endDate && startDateMoment.isValid() && Array.isArray(memberIds)){
const currentMoment = moment.tz(UI_TIMEZONE);
const startMomentMonth = startDateMoment.month();
const startMomentYear = startDateMoment.year();
const currentMonth = currentMoment.month();
const currentYear = currentMoment.year();
if ((startMomentYear < currentYear) || (startMomentYear === currentYear && startMomentMonth < currentMonth)) {
checkBookingChanges() checkBookingChanges()
.then(() => { .then(() => {
deleteFeesFromORD(dateRange, memberIds) deleteFeesFromORD(dateRange, memberIds)
@@ -159,6 +168,10 @@ const addFees = (req, res) => {
console.log('Error with updating booking reservations'); console.log('Error with updating booking reservations');
res.status(500).send(error); res.status(500).send(error);
}) })
}else{
console.log('Selected month/year pair is current month or in the future');
res.status(400).send('Selected month/year pair is current month or in the future');
}
}else{ }else{
console.log('Date range is missing to send fees to ORD'); console.log('Date range is missing to send fees to ORD');
res.status(400).send('Date range is missing'); res.status(400).send('Date range is missing');