add migration; insert 'deleted' column in booking change incidents table

migrations/20190822090157-add-deleted-column-for-booking-change-incidents-table.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn('bookingChangeIncidents', 'deleted', {
+      type: Sequelize.BOOLEAN,
+      defaultValue: false,
+      after: 'chargeFee',
+    });
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn('bookingChangeIncidents', 'deleted');
+  }
+};

models/bookingChangeIncident.js

@@ -12,6 +12,7 @@ module.exports = (sequelize, DataTypes) => {
         newBookingEnd: DataTypes.DATE,
         incidentType: DataTypes.INTEGER,
         chargeFee: DataTypes.FLOAT,
+        deleted: DataTypes.BOOLEAN,
     }, {});
     bookingChangeIncident.associate = function(models) {
         // associations can be defined here

services/integration/reports.js

@@ -136,7 +136,9 @@ const getBookingChangeIncidents = (startDate, endDate, memberIds) => {
         'createdAt'
     ];
 
-    const filters = {};
+    const filters = {
+        deleted: false,
+    };
 
     if (startDate && endDate) {
         filters.createdAt = {
@@ -280,6 +282,7 @@ const getAllIncidents = (dateRange, memberIds) => {
                         newBookingEnd,
                         incidentType,
                         chargeFee,
+                        deleted,
                         createdAt,
                     } = bookingChangeIncident;
                     const memberName = membersMap[memberId].name;
@@ -307,6 +310,7 @@ const getAllIncidents = (dateRange, memberIds) => {
                         newBookingEndRaw: newBookingEnd,
                         incidentType,
                         totalChargeFee: chargeFee,
+                        deleted,
                         incidentTimestamp: formatTime(createdAt),
                         incidentTimestampRaw: createdAt,
                     });