Merge branch 'fix-bug-with-clean-slate-unlocked-incidents' into 'master'

stop inserting and changing deleted unlock incidents

See merge request saburly/psihologija!82

routes/index.js

@@ -46,6 +46,14 @@ router.get('/integration/report/practiceSummary/:year', getPracticeSummaryReport
 
 
 // temporary route, manually trigger door lock charge calculations
-router.get('/calculate', (req, res) => { calculateDoorLockCharges().then(() => res.send('Done')).catch((err) => res.send('Error \r\n', err));});
+router.get('/calculate', (req, res) => {
+    calculateDoorLockCharges()
+        .then(() => {
+            res.send('Done');
+        })
+        .catch((err) => {
+            res.send(`Error \r\n ${err}`);
+        });
+});
 
 module.exports = router;

services/integration/doorLockCharges.js

@@ -126,7 +126,6 @@ const insertUnlockedIncidents = (incidents) => {
                 bookingStart: start,
                 bookingEnd: end,
                 unlockTimestamp,
-                incidentLevel,
             },
             defaults: {...incidentForDB},
         }));
@@ -198,7 +197,7 @@ const setUnlockedIncidentsLevel = (incidents) => {
                 const incidentsWithLevel = [];
 
                 incidents.forEach((incident) => {
-                    const memberLastIncident = membersLastIncident[incident.memberId];
+                    const memberLastIncident = Object.assign({}, membersLastIncident[incident.memberId]);
 
                     const formattedIncident = {
                         reservation: incident.reservation,