+ To test the validity of multiple Project IDs, put each on its own line. +
+ + + + + +{% endblock %} \ No newline at end of file diff --git a/coldfront/core/billing/tests/test_commands/test_billing_ids.py b/coldfront/core/billing/tests/test_commands/test_billing_ids.py index 6e0e3d28c..f138d8490 100644 --- a/coldfront/core/billing/tests/test_commands/test_billing_ids.py +++ b/coldfront/core/billing/tests/test_commands/test_billing_ids.py @@ -106,6 +106,28 @@ def test_create_success(self): billing_activity = get_billing_activity_from_full_id(billing_id) self.assertTrue(isinstance(billing_activity, BillingActivity)) + def test_validate_success(self): + """Test that, given a variety of billing IDs, the + 'validate' outputs correctly.""" + + malformed_billing_id = '12345-67' + self.assertFalse(is_billing_id_well_formed(malformed_billing_id)) + + invalid_billing_id = '123456-789' + self.assertTrue(is_billing_id_well_formed(invalid_billing_id)) + self.assertFalse(is_billing_id_valid(invalid_billing_id)) + + valid_billing_id = '123456-788' + self.assertTrue(is_billing_id_well_formed(valid_billing_id)) + self.assertTrue(is_billing_id_valid(valid_billing_id)) + + output, error = self.command.validate( + [malformed_billing_id, invalid_billing_id, valid_billing_id]) + + self.assertIn(malformed_billing_id + ': Malformed', error) + self.assertIn(invalid_billing_id + ': Invalid', error) + self.assertIn(valid_billing_id + ': Valid', output) + # TODO: test_list @enable_deployment('LRC') @@ -402,6 +424,15 @@ def create(self, billing_id, **flags): args = ['create', billing_id] self._add_flags_to_args(args, **flags) return self.call_subcommand(*args) + + def validate(self, billing_ids, **flags): + """Call the 'validate' subcommand with the given billing IDs, and + flag values.""" + args = ['validate'] + for billing_id in billing_ids: + args.append(billing_id) + self._add_flags_to_args(args, **flags) + return self.call_subcommand(*args) def set_project_default(self, project_name, billing_id, **flags): """Call the 'project_default' subcommand of the 'set' subcommand diff --git a/coldfront/core/billing/tests/test_views/test_billing_id_validate_view.py b/coldfront/core/billing/tests/test_views/test_billing_id_validate_view.py new file mode 100644 index 000000000..e7d6ea413 --- /dev/null +++ b/coldfront/core/billing/tests/test_views/test_billing_id_validate_view.py @@ -0,0 +1,75 @@ +from django.urls import reverse +from django.contrib.messages import get_messages + +from coldfront.core.billing.tests.test_billing_base import TestBillingBase +from coldfront.core.billing.tests.test_commands.test_billing_ids import BillingIdsCommand +from coldfront.core.billing.utils.queries import get_billing_activity_from_full_id +from coldfront.core.billing.utils.queries import is_billing_id_well_formed +from coldfront.core.billing.utils.validation import is_billing_id_valid + +from http import HTTPStatus + +class TestBillingIDValidateView(TestBillingBase): + """A class for testing BillingIDValidateView.""" + + def setUp(self): + """Set up test data.""" + super().setUp() + self.create_test_user() + self.sign_user_access_agreement(self.user) + self.client.login(username=self.user.username, password=self.password) + + self.url = reverse('billing-id-validate') + + self.command = BillingIdsCommand() + + def test_permissions_get(self): + """Test that the correct users have permissions to perform GET + requests.""" + + # Unauthenticated user. + self.client.logout() + response = self.client.get(self.url) + self.assert_redirects_to_login(response, next_url=self.url) + + # Non superuser + self.client.login(username=self.user.username, password=self.password) + response = self.client.get(self.url) + self.assertEqual(response.status_code, HTTPStatus.FORBIDDEN) + + # Superuser + self.user.is_superuser = True + self.user.save() + response = self.client.get(self.url) + self.assertEqual(response.status_code, HTTPStatus.OK) + self.user.is_superuser = False + self.user.save() + + def test_billing_ids_correctness(self): + """Test that, given a variety of billing IDs, the + 'validate' outputs correctly.""" + + self.user.is_superuser = True + self.user.save() + + malformed_billing_id = '12345-67' + self.assertFalse(is_billing_id_well_formed(malformed_billing_id)) + + invalid_billing_id = '123456-789' + self.assertTrue(is_billing_id_well_formed(invalid_billing_id)) + self.assertFalse(is_billing_id_valid(invalid_billing_id)) + + valid_billing_id = '123456-788' + self.assertTrue(is_billing_id_well_formed(valid_billing_id)) + self.assertTrue(is_billing_id_valid(valid_billing_id)) + + billing_ids = malformed_billing_id + '\n' + invalid_billing_id + \ + '\n' + valid_billing_id + response = self.client.post(self.url, data={'billing_ids': billing_ids}) + messages = list(get_messages(response.wsgi_request)) + + self.assertEqual(len(messages), 1) + + self.assertIn(malformed_billing_id + ': Malformed', messages[0].message) + self.assertIn(invalid_billing_id + ': Invalid', messages[0].message) + self.assertIn(valid_billing_id + ': Valid', messages[0].message) diff --git a/coldfront/core/billing/urls.py b/coldfront/core/billing/urls.py index c2c5a7214..07472ecfb 100644 --- a/coldfront/core/billing/urls.py +++ b/coldfront/core/billing/urls.py @@ -17,6 +17,9 @@ path('usages/', admin_views.BillingIDUsagesSearchView.as_view(), name='billing-id-usages'), + path('validate/', + admin_views.BillingIDValidateView.as_view(), + name='billing-id-validate'), ] diff --git a/coldfront/core/billing/views/admin_views.py b/coldfront/core/billing/views/admin_views.py index 69c79d9aa..8958fb844 100644 --- a/coldfront/core/billing/views/admin_views.py +++ b/coldfront/core/billing/views/admin_views.py @@ -10,8 +10,10 @@ from django.urls import reverse from django.views.generic.base import TemplateView from django.views.generic.edit import FormView +from django.utils.safestring import mark_safe from coldfront.core.billing.forms import BillingIDCreationForm +from coldfront.core.billing.forms import BillingIDValidateManyForm from coldfront.core.billing.forms import BillingIDSetProjectDefaultForm from coldfront.core.billing.forms import BillingIDSetRechargeForm from coldfront.core.billing.forms import BillingIDSetUserAccountForm @@ -21,7 +23,10 @@ from coldfront.core.billing.utils.billing_activity_managers import ProjectUserBillingActivityManager from coldfront.core.billing.utils.billing_activity_managers import UserBillingActivityManager from coldfront.core.billing.utils.queries import get_billing_id_usages +from coldfront.core.billing.utils.queries import is_billing_id_well_formed +from coldfront.core.billing.utils.queries import get_billing_activity_from_full_id from coldfront.core.billing.utils.queries import get_or_create_billing_activity_from_full_id +from coldfront.core.billing.utils.validation import is_billing_id_valid from coldfront.core.project.models import Project from coldfront.core.project.models import ProjectUser @@ -308,3 +313,41 @@ def get_context_data(self, **kwargs): context['next_url_parameter'] = urlencode({'next': next_url}) return context + +class BillingIDValidateView(LoginRequiredMixin, UserPassesTestMixin, FormView): + + form_class = BillingIDValidateManyForm + template_name = 'billing/billing_id_validate.html' + + def test_func(self): + return self.request.user.is_superuser + + def form_valid(self, form): + billing_ids = form.cleaned_data.get('billing_ids') + + validation_results = '' + if billing_ids: + separated_billing_ids = [s.strip() for s in billing_ids.split('\n')] + exists_malformed_or_invalid = False + for full_id in separated_billing_ids: + if is_billing_id_well_formed(full_id): + if is_billing_id_valid(full_id): + append_str = "Valid" + else: + append_str = "Invalid" + exists_malformed_or_invalid = True + else: + append_str = "Malformed" + exists_malformed_or_invalid = True + + validation_results += f'{full_id}: {append_str}Select an existing user to be a Principal Investigator of the project. You may search for the user in the selection field. If the desired user is not listed, you may skip this step and specify information for a new PI in the next step.
-{% flag_enabled 'LRC_ONLY' as lrc_only %} -{% if lrc_only %} -Note: Only LBL employees, users with an "@lbl.gov" email, can be selected as a PI.
-{% endif %} +Select a user to be a Principal Investigator (PI) of the project. Please review the instructions below.
-{% if allowance_is_one_per_pi %} -Note: Each PI may only have one {{ computing_allowance.name }} at a time, so any that have pending requests or active allocations are not selectable.
-{% endif %} +