From b902ca1e9213e4fbdbce4aae127a8904c4993e4d Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Tue, 29 Jun 2021 11:13:05 +0200 Subject: [PATCH] Update valid product states, update subscription duration --- server/oauth/hep_client.py | 5 ++++- server/users/licenses.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/oauth/hep_client.py b/server/oauth/hep_client.py index 6db11da7..14381fdf 100644 --- a/server/oauth/hep_client.py +++ b/server/oauth/hep_client.py @@ -12,6 +12,9 @@ from core.logger import get_logger logger = get_logger(__name__) +VALID_PRODUCT_STATES = ['waiting', 'paid', 'completed', 'shipped'] + + class HepClientException(Exception): pass @@ -157,7 +160,7 @@ class HepClient: def filter_valid_products(product): - if product['status'] not in ['paid', 'new']: + if product['status'] not in VALID_PRODUCT_STATES: return False expiry_delta = product['activated'] + timedelta(product['license']['duration']) diff --git a/server/users/licenses.py b/server/users/licenses.py index 4ec25f5c..57447d7c 100644 --- a/server/users/licenses.py +++ b/server/users/licenses.py @@ -9,7 +9,7 @@ MYSKILLBOX_LICENSES = { }, "978-3-0355-1860-3": { 'edition': STUDENT_KEY, - 'duration': 365, + 'duration': 455, 'name': 'Student 1 year' }, "978-3-0355-1862-7": { @@ -24,7 +24,7 @@ MYSKILLBOX_LICENSES = { }, "978-3-0355-1823-8": { 'edition': TEACHER_KEY, - 'duration': 365, + 'duration': 455, 'name': 'Teacher 1 year' } }