From 0a2f01c9d8873e7fd9064bd5d126367bc87772f2 Mon Sep 17 00:00:00 2001
From: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
Date: Mon, 2 Nov 2020 13:15:03 +0300
Subject: [PATCH] fix: keep unsubscribed donors as isDonating (#40103)

---
 api-server/server/utils/donation.js      | 11 +----------
 api-server/server/utils/donation.test.js |  5 +----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/api-server/server/utils/donation.js b/api-server/server/utils/donation.js
index c0beee7ab5d..c8d0103e8a9 100644
--- a/api-server/server/utils/donation.js
+++ b/api-server/server/utils/donation.js
@@ -149,22 +149,13 @@ export async function cancelDonation(body, app) {
   const {
     resource: { id, status_update_time = new Date(Date.now()).toISOString() }
   } = body;
-  const { User, Donation } = app.models;
+  const { Donation } = app.models;
   Donation.findOne({ where: { subscriptionId: id } }, (err, donation) => {
     if (err || !donation) throw Error(err);
-    const userId = donation.userId;
     log(`Updating donation record: ${donation.subscriptionId}`);
     donation.updateAttributes({
       endDate: new Date(status_update_time).toISOString()
     });
-
-    User.findOne({ where: { id: userId } }, (err, user) => {
-      if (err || !user || !user.donationEmails) throw Error(err);
-      log('Updating user record for donation cancellation');
-      user.updateAttributes({
-        isDonating: false
-      });
-    });
   });
 }
 
diff --git a/api-server/server/utils/donation.test.js b/api-server/server/utils/donation.test.js
index e53e67a976a..28949a39c23 100644
--- a/api-server/server/utils/donation.test.js
+++ b/api-server/server/utils/donation.test.js
@@ -157,10 +157,7 @@ describe('donation', () => {
       expect(updateDonationAttr).toHaveBeenCalledWith({
         endDate: new Date(status_update_time).toISOString()
       });
-
-      expect(updateUserAttr).toHaveBeenCalledWith({
-        isDonating: false
-      });
+      expect(updateUserAttr).not.toHaveBeenCalled();
     });
   });
 });