From f4af053c9197a08ff2d31ece1bab51a59f86a88e Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 10 Feb 2020 01:42:28 +0000 Subject: [PATCH] Calculate status the same way as old portal --- apiserver/apiserver/api/tests.py | 8 ++++++++ apiserver/apiserver/api/utils.py | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apiserver/apiserver/api/tests.py b/apiserver/apiserver/api/tests.py index 6ba6df2..58cd3ae 100644 --- a/apiserver/apiserver/api/tests.py +++ b/apiserver/apiserver/api/tests.py @@ -142,6 +142,14 @@ class TestCalcStatus(TestCase): self.assertEqual(status, 'Current') self.assertEqual(former, False) + def test_calc_member_status_1_month(self): + expire_date = utils.today_alberta_tz() + relativedelta.relativedelta(months=1) + + status, former = utils.calc_member_status(expire_date) + + self.assertEqual(status, 'Current') + self.assertEqual(former, False) + def test_calc_member_status_90_days(self): expire_date = utils.today_alberta_tz() + datetime.timedelta(days=90) diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py index c97de64..0ac90fc 100644 --- a/apiserver/apiserver/api/utils.py +++ b/apiserver/apiserver/api/utils.py @@ -52,8 +52,7 @@ def calc_member_status(expire_date, fake_date=None): difference = num_months_difference(expire_date, today) - #if today + datetime.timedelta(days=29) < expire_date: - if difference >= 1: + if today + timedelta(days=29) < expire_date: return 'Prepaid', False elif difference <= -3: return 'Overdue', True