From 2ac4074d94733e5efca33d0302a152491acd96b0 Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Thu, 22 Aug 2019 06:02:29 +0200
Subject: [PATCH] Bug fixes

---
 constants/constants.js     | 3 +++
 services/officeRnD/fees.js | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/constants/constants.js b/constants/constants.js
index 1c9f12f..26c3997 100644
--- a/constants/constants.js
+++ b/constants/constants.js
@@ -119,6 +119,8 @@ const discounts = {
 };
 const DISCOUNT_PLANS = process.env.DISCOUNT_PLANS.split(',').map(planName => planName.trim()) || [];
 
+const UNPAID_FEE_STATUS = 'not_paid';
+
 module.exports = {
     VALID_CSV_HEADERS,
     USER_ENTRY_EVENT,
@@ -141,4 +143,5 @@ module.exports = {
     ALLOWED_BOOKING_CANCELLATION_TIME,
     discounts,
     DISCOUNT_PLANS,
+    UNPAID_FEE_STATUS,
 };
diff --git a/services/officeRnD/fees.js b/services/officeRnD/fees.js
index dd93131..83ede89 100644
--- a/services/officeRnD/fees.js
+++ b/services/officeRnD/fees.js
@@ -3,7 +3,7 @@
 const moment = require('moment-timezone');
 
 const { API } = require('../../helpers/api');
-const { officeRnDAPIErrors, DEFAULT_DATE_FORMAT } = require('../../constants/constants');
+const { officeRnDAPIErrors, DEFAULT_DATE_FORMAT, UNPAID_FEE_STATUS } = require('../../constants/constants');
 
 const deleteFeesFromORD = (dateRange, memberIds) => {
     return new Promise((resolve, reject) => {
@@ -29,11 +29,12 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
                 };
 
                 fetchedFees.forEach((fee) => {
-                    const { member, date } = fee;
+                    const { member, date, invoice } = fee;
+                    const { status } = invoice;
                     const feeId = fee['_id'];
 
                     const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date);
-                    if (memberIdsMap[member] && isDateInDateRange) {
+                    if (memberIdsMap[member] && isDateInDateRange && (status === UNPAID_FEE_STATUS)) {
                         deleteRequests.push(sendDeleteRequestPromise(feeId));
                     }
                 });