Merge branch '7-login-error'

This commit is contained in:
Santiago L 2021-06-08 10:39:29 +02:00
commit 5281e9595e
3 changed files with 45 additions and 11 deletions

View File

@ -34,6 +34,8 @@ class OrchestraModel:
Args: Args:
data: A JSON dict, as converted from the JSON in the orchestra API. data: A JSON dict, as converted from the JSON in the orchestra API.
""" """
if data is None:
return cls()
json_data = data.copy() json_data = data.copy()
if kwargs: if kwargs:

View File

@ -1,3 +1,4 @@
from collections import defaultdict
from django.conf import settings from django.conf import settings
@ -5,10 +6,15 @@ def getsetting(name):
value = getattr(settings, name, None) value = getattr(settings, name, None)
return value or DEFAULTS.get(name) return value or DEFAULTS.get(name)
# provide a default value allowing to overwrite it for each type of account
def allowed_resources_default_factory():
return {'mailbox': 2}
DEFAULTS = { DEFAULTS = {
# allowed resources limit hardcoded because cannot be retrieved from the API. # allowed resources limit hardcoded because cannot be retrieved from the API.
"ALLOWED_RESOURCES": { "ALLOWED_RESOURCES": defaultdict(
allowed_resources_default_factory,
{
'INDIVIDUAL': 'INDIVIDUAL':
{ {
# 'disk': 1024, # 'disk': 1024,
@ -20,7 +26,8 @@ DEFAULTS = {
# 'traffic': 20 * 1024, # 'traffic': 20 * 1024,
'mailbox': 10, 'mailbox': 10,
} }
}, }
),
"URL_DB_PHPMYADMIN": "https://phpmyadmin.pangea.org/", "URL_DB_PHPMYADMIN": "https://phpmyadmin.pangea.org/",
"URL_MAILTRAIN": "https://mailtrain.org/", "URL_MAILTRAIN": "https://mailtrain.org/",
"URL_SAAS_GITLAB": "https://gitlab.pangea.org/", "URL_SAAS_GITLAB": "https://gitlab.pangea.org/",

View File

@ -62,6 +62,31 @@ class UserAccountTest(TestCase):
account = UserAccount.new_from_json(data) account = UserAccount.new_from_json(data)
self.assertIsNone(account.last_login) self.assertIsNone(account.last_login)
def test_user_without_billcontact(self):
data = {
'billcontact': None,
'date_joined': '2020-03-05T09:49:21Z',
'full_name': 'David Rock',
'id': 2,
'is_active': True,
'language': 'CA',
'last_login': '2020-03-19T10:21:49.504266Z',
'resources': [{'allocated': None,
'name': 'disk',
'unit': 'GiB',
'used': '0.000'},
{'allocated': None,
'name': 'traffic',
'unit': 'GiB',
'used': '0.000'}],
'short_name': '',
'type': 'STAFF',
'url': 'https://example.org/api/accounts/2/',
'username': 'drock'
}
account = UserAccount.new_from_json(data)
self.assertIsNotNone(account.billing)
class GetBootstrapedPercentTest(TestCase): class GetBootstrapedPercentTest(TestCase):
BS_WIDTH = [0, 25, 50, 100] BS_WIDTH = [0, 25, 50, 100]