From e92182724b29bc93e190ef546d2176f5fe9dd4fc Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 20 Jan 2020 00:46:07 +0000 Subject: [PATCH] Fix fake missing membership tests --- apiserver/apiserver/api/tests.py | 16 ++++++++-------- apiserver/apiserver/api/utils.py | 2 +- apiserver/import_old_portal.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apiserver/apiserver/api/tests.py b/apiserver/apiserver/api/tests.py index 1cf9683..6d21ef5 100644 --- a/apiserver/apiserver/api/tests.py +++ b/apiserver/apiserver/api/tests.py @@ -195,33 +195,33 @@ class TestFakeMonths(TestCase): testing_member.current_start_date = datetime.date(2018, 6, 6) testing_member.expire_date = datetime.date(2018, 7, 6) - tx = utils.fake_missing_membership_months(testing_member) + tx, count = utils.fake_missing_membership_months(testing_member) - self.assertEqual(tx.number_of_membership_months, 1) + self.assertEqual(count, 1) def test_fake_missing_membership_months_one_and_half_month(self): testing_member.current_start_date = datetime.date(2018, 6, 1) testing_member.expire_date = datetime.date(2018, 7, 15) - tx = utils.fake_missing_membership_months(testing_member) + tx, count = utils.fake_missing_membership_months(testing_member) - self.assertEqual(tx.number_of_membership_months, 1) + self.assertEqual(count, 1) def test_fake_missing_membership_months_one_year(self): testing_member.current_start_date = datetime.date(2018, 6, 6) testing_member.expire_date = datetime.date(2019, 6, 6) - tx = utils.fake_missing_membership_months(testing_member) + tx, count = utils.fake_missing_membership_months(testing_member) - self.assertEqual(tx.number_of_membership_months, 12) + self.assertEqual(count, 12) def test_fake_missing_membership_months_same_month(self): testing_member.current_start_date = datetime.date(2018, 6, 6) testing_member.expire_date = datetime.date(2018, 6, 16) - tx = utils.fake_missing_membership_months(testing_member) + tx, count = utils.fake_missing_membership_months(testing_member) - self.assertEqual(tx.number_of_membership_months, 0) + self.assertEqual(count, 0) class TestTallyMembership(TestCase): diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py index 58447bb..b119b5c 100644 --- a/apiserver/apiserver/api/utils.py +++ b/apiserver/apiserver/api/utils.py @@ -77,7 +77,7 @@ def fake_missing_membership_months(member): date=add_months(start_date, i), ) - return tx + return tx, missing_months def tally_membership_months(member, fake_date=None): ''' diff --git a/apiserver/import_old_portal.py b/apiserver/import_old_portal.py index 450553e..f5187cc 100755 --- a/apiserver/import_old_portal.py +++ b/apiserver/import_old_portal.py @@ -141,7 +141,7 @@ for m in members: if not m.current_start_date: continue import_date = datetime.date(2020, 1, 3) - tx = utils.fake_missing_membership_months(m) + tx, _ = utils.fake_missing_membership_months(m) utils.tally_membership_months(m, import_date) if tx: