Merge branch 'create-database-connections-pool' into 'master'

Create database connections pool

See merge request saburly/psihologija!28

config/config.js

@@ -1,3 +1,9 @@
+const pool = {
+  max: parseInt(process.env.DB_POOL_MAX_CONNECTIONS) || 5,
+  acquire: parseInt(process.env.DB_POOL_ACQUIRE) || 60000,
+  evict: parseInt(process.env.DB_POOL_EVICT) || 1000,
+};
+
 module.exports = {
   development: {
     username: 'docker',
@@ -5,14 +11,17 @@ module.exports = {
     database: 'CrmIntegration',
     port: '5431',
     dialect: 'postgres',
-    logging: parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false
+    logging: parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false,
+    pool
   },
   test: {
     "use_env_variable": 'DATABASE_URL',
-    logging: parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false
+    logging: parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false,
+    pool
   },
   production: {
     "use_env_variable": 'DATABASE_URL',
-    logging: parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false
+    logging: parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false,
+    pool
   }
 };

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);

environment.env

@@ -24,3 +24,8 @@ BOOKING_CHANGE_PERCENTAGE_CHARGE=Percentage of hourly reate to apply for cancell
 ALLOWED_BOOKING_CANCELLATION_TIME=Time from creation (in minutes) in which cancellation is not charged
 
 SEQUELIZE_LOGGING=0 - false, 1 - true (console logging)
+
+#More about pool option : http://docs.sequelizejs.com/class/lib/sequelize.js~Sequelize.html
+DB_POOL_MAX_CONNECTIONS=Maximum number of connection in pool (ex. 18)
+DB_POOL_ACQUIRE=The maximum time, in milliseconds, that pool will try to get connection before throwing error (ex. 120000)
+DB_POOL_EVICT=The time interval, in milliseconds, after which sequelize-pool will remove idle connections. (ex. 10000)

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 = {