From ad9bdfa6060b176c60b538b238067cd81a331c7d Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Tue, 9 Jul 2019 15:05:36 +0200
Subject: [PATCH] track room change for booking change incidents

---
 models/bookingChangeIncident.js              | 3 ++-
 services/integration/bookingChangeCharges.js | 9 ++++++---
 services/officeRnD/bookings.js               | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/models/bookingChangeIncident.js b/models/bookingChangeIncident.js
index 1a91f1e..a5e9a75 100644
--- a/models/bookingChangeIncident.js
+++ b/models/bookingChangeIncident.js
@@ -4,7 +4,8 @@ module.exports = (sequelize, DataTypes) => {
     const bookingChangeIncident = sequelize.define('bookingChangeIncident', {
         reservationId: DataTypes.TEXT,
         memberId: DataTypes.TEXT,
-        resourceId: DataTypes.TEXT,
+        oldResourceId: DataTypes.TEXT,
+        newResourceId: DataTypes.TEXT,
         oldBookingStart: DataTypes.DATE,
         oldBookingEnd: DataTypes.DATE,
         newBookingStart: DataTypes.DATE,
diff --git a/services/integration/bookingChangeCharges.js b/services/integration/bookingChangeCharges.js
index 13d47b2..e46a691 100644
--- a/services/integration/bookingChangeCharges.js
+++ b/services/integration/bookingChangeCharges.js
@@ -22,12 +22,14 @@ const bulkWriteBookingChangeIncidents = (incidents) => {
 
 const chargeBookingChanges = (changes) => {
     return new Promise((resolve, reject) => {
+        console.log(changes);
         if (Array.isArray(changes)){
             const incidents = [];
             const errors = [];
             changes.forEach((change) => {
                 const { oldReservation, newReservation } = change;
                 if (oldReservation && newReservation){
+                    const oldResourceId = oldReservation.resourceId;
                     const oldStart = oldReservation.start ? moment.utc(oldReservation.start) : null;
                     const oldEnd = oldReservation.end ? moment.utc(oldReservation.end) : null;
 
@@ -56,14 +58,14 @@ const chargeBookingChanges = (changes) => {
                                 // Check if member shortened the reservation
 
                                 if (newReservationLength < oldReservationLength){
-
                                     const differenceInLength = oldReservationLength - newReservationLength;
                                     const chargeFee = differenceInLength*hourlyRate*BOOKING_CHANGE_PERCENTAGE_CHARGE/100;
 
                                     const incident = {
                                         reservationId,
                                         memberId,
-                                        resourceId,
+                                        oldResourceId: oldResourceId || newReservation.resourceId,
+                                        newResourceId: newReservation.resourceId,
                                         oldBookingStart: oldReservation.start,
                                         oldBookingEnd: oldReservation.end,
                                         newBookingStart: newReservation.start,
@@ -82,7 +84,8 @@ const chargeBookingChanges = (changes) => {
                                 const incident = {
                                     reservationId,
                                     memberId,
-                                    resourceId,
+                                    oldResourceId: oldResourceId || newReservation.resourceId,
+                                    newResourceId: newReservation.resourceId,
                                     oldBookingStart: oldReservation.start,
                                     oldBookingEnd: oldReservation.end,
                                     newBookingStart: newReservation.start,
diff --git a/services/officeRnD/bookings.js b/services/officeRnD/bookings.js
index 3a63a6c..650b7aa 100644
--- a/services/officeRnD/bookings.js
+++ b/services/officeRnD/bookings.js
@@ -174,7 +174,7 @@ const bulkWriteReservationsWithChangesTracking = (reservations) => {
             const changedKeys = instance.changed();
             const previous = instance.previous();
 
-            const lookupKeys = ['start', 'end'];
+            const lookupKeys = ['start', 'end', 'resourceId'];
 
             let realChange = false;
             lookupKeys.forEach((key) => {