From 2baf64d5149f3dc4f1cc9db7d38dd67d157d0dcc Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.elbert.li@gmail.com>
Date: Mon, 24 Jun 2024 15:31:31 -0700
Subject: [PATCH 01/12] Provide clearer guidance for new project request PI
 selection step

---
 .../savio/project_existing_pi.html            | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/coldfront/core/project/templates/project/project_request/savio/project_existing_pi.html b/coldfront/core/project/templates/project/project_request/savio/project_existing_pi.html
index 921bdd830..2c68eb445 100644
--- a/coldfront/core/project/templates/project/project_request/savio/project_existing_pi.html
+++ b/coldfront/core/project/templates/project/project_request/savio/project_existing_pi.html
@@ -27,15 +27,28 @@ <h1>{{ PRIMARY_CLUSTER_NAME }}: Principal Investigator</h1><hr>
   <li>Allocation Period: {{ allocation_period.name }}</li>
 </ol>
 
-<p>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.</p>
-{% flag_enabled 'LRC_ONLY' as lrc_only %}
-{% if lrc_only %}
-  <p>Note: Only LBL employees, users with an "@lbl.gov" email, can be selected as a PI.</p>
-{% endif %}
+<p>Select a user to be a Principal Investigator (PI) of the project. <b>Please review the instructions below.</b></p>
 
-{% if allowance_is_one_per_pi %}
-  <p>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.</p>
-{% endif %}
+<ul>
+  <li>If your PI is not listed, leave the field blank and provide information about your PI in the next step.</li>
+
+  {% flag_enabled 'LRC_ONLY' as lrc_only %}
+  {% if allowance_is_one_per_pi or lrc_only %}
+  <li>
+    If your PI is listed but not selectable, this may be for one of the following reasons:
+    <ul>
+      {% if allowance_is_one_per_pi %}
+      <li>A PI may only have one {{ computing_allowance.name }} at a time. Any PI with an existing {{ computing_allowance.name }} project or a pending request to create one is not selectable.</li>
+      {% endif %}
+      {% if lrc_only %}
+      <li>The PI must be an LBL employee. Any user who does not have an "@lbl.gov" email is not selectable.</li>
+      {% endif %}
+    </ul>
+  </li>
+  {% endif %}
+
+  <li>If you are not the PI, please do not select yourself.</li>
+</ul>
 
 <form action="" method="post">
   {% csrf_token %}
@@ -50,6 +63,15 @@ <h1>{{ PRIMARY_CLUSTER_NAME }}: Principal Investigator</h1><hr>
       {{ wizard.form|crispy }}
     {% endif %}
   </table>
+
+    <script>
+    $('select').selectize({
+      create: false,
+      sortField: 'text',
+      placeholder: 'Type to search. If your PI is not listed or selectable, please review the instructions above.'
+    })
+  </script>
+
   {% if wizard.steps.prev %}
     <button
         class="btn btn-secondary"

From cb110f1c72cf916fcac539ce15ecbffda068bd0e Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Wed, 10 Jul 2024 12:12:12 -0700
Subject: [PATCH 02/12] CLI validation of billings-ids

---
 .../management/commands/billing_ids.py        | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/coldfront/core/billing/management/commands/billing_ids.py b/coldfront/core/billing/management/commands/billing_ids.py
index 9602092d7..da74a5123 100644
--- a/coldfront/core/billing/management/commands/billing_ids.py
+++ b/coldfront/core/billing/management/commands/billing_ids.py
@@ -23,7 +23,7 @@
 
 class Command(BaseCommand):
 
-    help = 'Create and set billing IDs.'
+    help = 'Create, set, or validate billing IDs.'
 
     logger = logging.getLogger(__name__)
 
@@ -37,6 +37,7 @@ def add_arguments(self, parser):
         self._add_create_subparser(subparsers)
         self._add_list_subparser(subparsers)
         self._add_set_subparser(subparsers)
+        self._add_validate_subparser(subparsers)
 
     def handle(self, *args, **options):
         """Call the handler for the provided subcommand."""
@@ -104,6 +105,17 @@ def _add_set_subparser(parsers):
         add_ignore_invalid_argument(user_account_parser)
         add_argparse_dry_run_argument(user_account_parser)
 
+    @staticmethod
+    def _add_validate_subparser(parsers):
+        parser = parsers.add_parser(
+            'validate', help=('Takes a billing ID as input and prints out "Valid" or "Invalid."'))
+
+        parser.add_argument(
+            'billings_ids', 
+            help=('A space-separated list of billings ids (e.g., 123456-789) to be validated.'),
+            nargs='+',
+            type=str)
+
     @staticmethod
     def _get_billing_activity_or_error(full_id):
         """Return the BillingActivity corresponding to the given
@@ -262,6 +274,18 @@ def _handle_set(self, *args, **options):
             user = self._get_user_or_error(options['username'])
             self._handle_set_user_account(
                 user, billing_activity, dry_run=dry_run)
+            
+    def _handle_validate(self, *args, **options):
+        """Handle the 'validate' subcommand."""
+        for full_id in options['billings_ids']:
+            if is_billing_id_well_formed(full_id):
+                billing_activity = self._get_billing_activity_or_error(full_id)
+                append_str = 'Valid'
+                if not is_billing_id_valid(billing_activity.full_id()):
+                    append_str = 'Invalid'
+                print(billing_activity.full_id() + ':', append_str)
+            else:
+                raise CommandError(f'Billing ID {full_id} is malformed.')
 
     def _handle_set_project_default(self, project, billing_activity,
                                     dry_run=False):

From 187702873f88087e3b7f9c356718d393d579c523 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Wed, 10 Jul 2024 16:47:50 -0700
Subject: [PATCH 03/12] UI method to validate project ids

---
 coldfront/core/billing/forms.py               | 12 ++++++-
 .../billing/billing_id_validate.html          | 28 +++++++++++++++
 coldfront/core/billing/urls.py                |  3 ++
 coldfront/core/billing/views/admin_views.py   | 36 +++++++++++++++++++
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 coldfront/core/billing/templates/billing/billing_id_validate.html

diff --git a/coldfront/core/billing/forms.py b/coldfront/core/billing/forms.py
index 6b3a71f93..ab2e8823c 100644
--- a/coldfront/core/billing/forms.py
+++ b/coldfront/core/billing/forms.py
@@ -66,7 +66,17 @@ def clean_billing_id(self):
         self.validate_billing_id(
             billing_id, ignore_invalid=not self.enforce_validity)
         return billing_id
-
+    
+class BillingIDValidateManyForm(forms.Form):
+    billing_ids = forms.CharField(
+        help_text='Example: \n123456-789',
+        label='Project IDs',
+        required=True,
+        widget=forms.Textarea)
+    
+    def clean(self):
+        cleaned_data = super().clean()
+        return cleaned_data
 
 class BillingIDCreationForm(BillingIDValidityMixin, forms.Form):
 
diff --git a/coldfront/core/billing/templates/billing/billing_id_validate.html b/coldfront/core/billing/templates/billing/billing_id_validate.html
new file mode 100644
index 000000000..7f97772d8
--- /dev/null
+++ b/coldfront/core/billing/templates/billing/billing_id_validate.html
@@ -0,0 +1,28 @@
+{% extends "common/base.html" %}
+{% load common_tags %}
+{% load crispy_forms_tags %}
+{% load static %}
+
+{% block title %}
+  Validate LBL Project IDs
+{% endblock %}
+
+{% block content %}
+
+<h1>Validate LBL Project IDs</h1>
+<p>Put each Project ID on its own line.</p>
+<hr>
+
+<form method="post">
+  {% csrf_token %}
+  {{ form|crispy }}
+  <input type="submit" class="btn btn-primary" value="Validate">
+</form>
+
+<script>
+  $("#navbar-main > ul > li.active").removeClass("active");
+  $("#navbar-admin").addClass("active");
+  $("#navbar-billing-id-usages").addClass("active");
+</script>
+
+{% endblock %}
\ No newline at end of file
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..73b3dc8d8 100644
--- a/coldfront/core/billing/views/admin_views.py
+++ b/coldfront/core/billing/views/admin_views.py
@@ -12,6 +12,7 @@
 from django.views.generic.edit import FormView
 
 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 +22,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 +312,35 @@ 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')]
+            for full_id in separated_billing_ids:
+                append_str = "Malformed"
+                if is_billing_id_well_formed(full_id):
+                    billing_activity = get_billing_activity_from_full_id(full_id)
+                    if isinstance(billing_activity, BillingActivity) and \
+                            is_billing_id_valid(billing_activity.full_id()):
+                        append_str = "Valid"
+                    else:
+                        append_str = "Invalid"
+
+                validation_results += ( f'{full_id}: {append_str}, ' )
+        messages.success(self.request, validation_results)
+        return super().form_valid(form)
+
+
+    def get_success_url(self):
+        return '/billing/validate/'
\ No newline at end of file

From bc42b40b698dc855b2c5f425aca600c835659b03 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Wed, 10 Jul 2024 17:02:01 -0700
Subject: [PATCH 04/12] add button in billings usage that links to validate
 view

---
 .../billing/templates/billing/billing_id_usages_search.html   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/coldfront/core/billing/templates/billing/billing_id_usages_search.html b/coldfront/core/billing/templates/billing/billing_id_usages_search.html
index 14b79541f..90df02b8b 100644
--- a/coldfront/core/billing/templates/billing/billing_id_usages_search.html
+++ b/coldfront/core/billing/templates/billing/billing_id_usages_search.html
@@ -20,6 +20,10 @@ <h1>LBL Project ID Usages</h1>
   <i class="fas fa-plus" aria-hidden="true"></i>
   Create
 </a>
+<a class="class btn btn-primary" href="{% url 'billing-id-validate' %}">
+  <i class="fas" aria-hidden="true"></i>
+  Validate
+</a>
 <hr>
 {% endif %}
 

From a56a1fbabd8e2ba571bc8a6696186d644b522093 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Wed, 10 Jul 2024 17:37:31 -0700
Subject: [PATCH 05/12] Basic Unit Testing

---
 .../tests/test_commands/test_billing_ids.py   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

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..df28204ca 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_malformed(self):
+        """Test that, when the given billing ID is malformed, the
+        'validate' subcommand raises an error."""
+        billing_id = '12345-67'
+        self.assertIsNone(get_billing_activity_from_full_id(billing_id))
+        self.assertFalse(is_billing_id_well_formed(billing_id))
+
+        with self.assertRaises(CommandError) as cm:
+            self.command.validate([billing_id])
+        self.assertIn('is malformed', str(cm.exception))
+
+    def test_validate_nonexistant(self):
+        """Test that, when the given billing ID does not exist, the
+        'validate' subcommand raises an error."""
+        billing_id = '123456-789'
+        self.assertIsNone(get_billing_activity_from_full_id(billing_id))
+        self.assertTrue(is_billing_id_well_formed(billing_id))
+
+        with self.assertRaises(CommandError) as cm:
+            self.command.validate([billing_id])
+        self.assertIn('does not exist', str(cm.exception))
+
     # 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

From df63831fad76f51bb74ce1ad4d26f279c78ae9e2 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Thu, 11 Jul 2024 10:10:04 -0700
Subject: [PATCH 06/12] remove final comma

---
 coldfront/core/billing/views/admin_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coldfront/core/billing/views/admin_views.py b/coldfront/core/billing/views/admin_views.py
index 73b3dc8d8..bbf509e53 100644
--- a/coldfront/core/billing/views/admin_views.py
+++ b/coldfront/core/billing/views/admin_views.py
@@ -338,7 +338,7 @@ def form_valid(self, form):
                         append_str = "Invalid"
 
                 validation_results += ( f'{full_id}: {append_str}, ' )
-        messages.success(self.request, validation_results)
+        messages.success(self.request, validation_results.strip(', '))
         return super().form_valid(form)
 
 

From 9fdecc7650f11abeb6294943ee710777a6a5f9c7 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Thu, 11 Jul 2024 12:29:18 -0700
Subject: [PATCH 07/12] update view

---
 coldfront/core/billing/forms.py                   |  7 +++++--
 .../templates/billing/billing_id_validate.html    |  6 +++++-
 coldfront/core/billing/views/admin_views.py       | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/coldfront/core/billing/forms.py b/coldfront/core/billing/forms.py
index ab2e8823c..e7c0902f8 100644
--- a/coldfront/core/billing/forms.py
+++ b/coldfront/core/billing/forms.py
@@ -3,6 +3,7 @@
 from django.contrib.auth.models import User
 from django.core.validators import MinLengthValidator
 from django.core.validators import RegexValidator
+from django.utils.safestring import mark_safe
 
 from coldfront.core.billing.models import BillingActivity
 from coldfront.core.billing.utils.queries import get_billing_activity_from_full_id
@@ -69,10 +70,12 @@ def clean_billing_id(self):
     
 class BillingIDValidateManyForm(forms.Form):
     billing_ids = forms.CharField(
-        help_text='Example: \n123456-789',
+        help_text=mark_safe('Example:<br />123456-789<br />987654-321'),
         label='Project IDs',
         required=True,
-        widget=forms.Textarea)
+        widget=forms.Textarea(
+            attrs={'placeholder': 'Put each Project ID on its own line.'}
+        ))
     
     def clean(self):
         cleaned_data = super().clean()
diff --git a/coldfront/core/billing/templates/billing/billing_id_validate.html b/coldfront/core/billing/templates/billing/billing_id_validate.html
index 7f97772d8..bac2d67b5 100644
--- a/coldfront/core/billing/templates/billing/billing_id_validate.html
+++ b/coldfront/core/billing/templates/billing/billing_id_validate.html
@@ -10,7 +10,11 @@
 {% block content %}
 
 <h1>Validate LBL Project IDs</h1>
-<p>Put each Project ID on its own line.</p>
+<p>
+    To test the validity of multiple Project IDs, put each on its own line. The form checks whether
+    each Project ID is well-formed, and if it is well-formed, it checks the validity of each ID. Do
+    not put extra text or spaces, else the form will consider the ID malformed.
+</p>
 <hr>
 
 <form method="post">
diff --git a/coldfront/core/billing/views/admin_views.py b/coldfront/core/billing/views/admin_views.py
index bbf509e53..6b6ef9630 100644
--- a/coldfront/core/billing/views/admin_views.py
+++ b/coldfront/core/billing/views/admin_views.py
@@ -10,6 +10,7 @@
 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
@@ -327,8 +328,8 @@ def form_valid(self, form):
         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:
-                append_str = "Malformed"
                 if is_billing_id_well_formed(full_id):
                     billing_activity = get_billing_activity_from_full_id(full_id)
                     if isinstance(billing_activity, BillingActivity) and \
@@ -336,9 +337,17 @@ def form_valid(self, form):
                         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}<br />' )
+        if exists_malformed_or_invalid:
+            messages.error(self.request, mark_safe(validation_results))
+        else:
+            messages.success(self.request, mark_safe(validation_results))
 
-                validation_results += ( f'{full_id}: {append_str}, ' )
-        messages.success(self.request, validation_results.strip(', '))
         return super().form_valid(form)
 
 

From ab30bc43ea3229be96250400cf013ffaa194e931 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Thu, 11 Jul 2024 16:52:59 -0700
Subject: [PATCH 08/12] Basic testing of permissions and correctness for view
 and form

---
 .../test_billing_id_validate_many_form.py     | 57 +++++++++++++++++++
 .../test_billing_id_validate_view.py          | 39 +++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py
 create mode 100644 coldfront/core/billing/tests/test_views/test_billing_id_validate_view.py

diff --git a/coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py b/coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py
new file mode 100644
index 000000000..442024ded
--- /dev/null
+++ b/coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py
@@ -0,0 +1,57 @@
+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
+
+class TestBillingIDValidateManyForm(TestBillingBase):
+    """A class for testing BillingIDValidateManyForm."""
+
+    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.user.is_superuser = True
+        self.user.save()
+
+        self.command = BillingIdsCommand()
+
+    def test_malformed_billing_ids(self):
+        malformed_billing_id = "12345-78"
+        response = self.client.post("/billing/validate/", data={"billing_ids": malformed_billing_id})
+        messages = list(get_messages(response.wsgi_request))
+        
+        self.assertEqual(len(messages), 1)
+
+        self.assertIn(malformed_billing_id + ": Malformed", messages[0].message)
+
+    def test_billing_ids_correctness(self):
+        unused_id = "123456-789"
+        self.assertIsNone(get_billing_activity_from_full_id(unused_id))
+
+        used_id_invalid = "123456-001"
+        self.assertIsNone(get_billing_activity_from_full_id(used_id_invalid))
+        _, error = self.command.create(used_id_invalid, ignore_invalid=True)
+        self.assertFalse(error)
+
+        used_id_valid = "123456-002"
+        self.assertIsNone(get_billing_activity_from_full_id(used_id_valid))
+        _, error = self.command.create(used_id_valid)
+        self.assertFalse(error)
+
+        billing_ids = unused_id + '\n' + used_id_invalid + '\n' + used_id_valid
+        response = self.client.post("/billing/validate/", data={"billing_ids": billing_ids})
+        messages = list(get_messages(response.wsgi_request))
+        
+        self.assertEqual(len(messages), 1)
+
+        self.assertIn(unused_id + ": Invalid", messages[0].message)
+        self.assertIn(used_id_invalid + ": Invalid", messages[0].message)
+        self.assertIn(used_id_valid + ": Valid", messages[0].message)
+
+
+
+
+
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..9d9120a19
--- /dev/null
+++ b/coldfront/core/billing/tests/test_views/test_billing_id_validate_view.py
@@ -0,0 +1,39 @@
+from coldfront.core.utils.tests.test_base import TestBase
+
+from http import HTTPStatus
+
+class TestBillingIDValidateView(TestBase):
+    """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)
+
+    def test_permissions_get(self):
+        """Test that the correct users have permissions to perform GET
+        requests."""
+
+        url = "/billing/validate/"
+
+        # Unauthenticated user.
+        self.client.logout()
+        response = self.client.get(url)
+        self.assert_redirects_to_login(response, next_url=url)
+
+        # Non superuser
+        self.client.login(username=self.user.username, password=self.password)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.FORBIDDEN)
+
+        # Superuser
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.user.is_superuser = False
+        self.user.save()
+
+

From ecba5388d8cf78ab0603fc6d4391b786eb77d5e8 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Wed, 17 Jul 2024 11:14:15 -0700
Subject: [PATCH 09/12] Add check mark + correct assumption that valid PID
 could have no billing activity object associated

---
 coldfront/core/billing/management/commands/billing_ids.py    | 5 ++---
 .../billing/templates/billing/billing_id_usages_search.html  | 2 +-
 coldfront/core/billing/views/admin_views.py                  | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/coldfront/core/billing/management/commands/billing_ids.py b/coldfront/core/billing/management/commands/billing_ids.py
index da74a5123..67628f05e 100644
--- a/coldfront/core/billing/management/commands/billing_ids.py
+++ b/coldfront/core/billing/management/commands/billing_ids.py
@@ -279,11 +279,10 @@ def _handle_validate(self, *args, **options):
         """Handle the 'validate' subcommand."""
         for full_id in options['billings_ids']:
             if is_billing_id_well_formed(full_id):
-                billing_activity = self._get_billing_activity_or_error(full_id)
                 append_str = 'Valid'
-                if not is_billing_id_valid(billing_activity.full_id()):
+                if not is_billing_id_valid(full_id):
                     append_str = 'Invalid'
-                print(billing_activity.full_id() + ':', append_str)
+                print(full_id + ':', append_str)
             else:
                 raise CommandError(f'Billing ID {full_id} is malformed.')
 
diff --git a/coldfront/core/billing/templates/billing/billing_id_usages_search.html b/coldfront/core/billing/templates/billing/billing_id_usages_search.html
index 90df02b8b..781487bff 100644
--- a/coldfront/core/billing/templates/billing/billing_id_usages_search.html
+++ b/coldfront/core/billing/templates/billing/billing_id_usages_search.html
@@ -21,7 +21,7 @@ <h1>LBL Project ID Usages</h1>
   Create
 </a>
 <a class="class btn btn-primary" href="{% url 'billing-id-validate' %}">
-  <i class="fas" aria-hidden="true"></i>
+  <i class="fas fa-check" aria-hidden="true"></i>
   Validate
 </a>
 <hr>
diff --git a/coldfront/core/billing/views/admin_views.py b/coldfront/core/billing/views/admin_views.py
index 6b6ef9630..b93cc6af0 100644
--- a/coldfront/core/billing/views/admin_views.py
+++ b/coldfront/core/billing/views/admin_views.py
@@ -331,9 +331,7 @@ def form_valid(self, form):
             exists_malformed_or_invalid = False
             for full_id in separated_billing_ids:
                 if is_billing_id_well_formed(full_id):
-                    billing_activity = get_billing_activity_from_full_id(full_id)
-                    if isinstance(billing_activity, BillingActivity) and \
-                            is_billing_id_valid(billing_activity.full_id()):
+                    if is_billing_id_valid(full_id):
                         append_str = "Valid"
                     else:
                         append_str = "Invalid"

From 8dcf7e83ec29ba69d2239d251548080809843d41 Mon Sep 17 00:00:00 2001
From: Alastair Deng <adeng27@stanford.edu>
Date: Wed, 17 Jul 2024 14:57:42 -0700
Subject: [PATCH 10/12] Requested changes for correctness and style

---
 .../management/commands/billing_ids.py        | 21 +++----
 .../billing/billing_id_validate.html          |  7 +--
 .../tests/test_commands/test_billing_ids.py   | 38 +++++++------
 .../test_billing_id_validate_many_form.py     | 57 -------------------
 .../test_billing_id_validate_view.py          | 52 ++++++++++++++---
 coldfront/core/billing/views/admin_views.py   |  2 +-
 6 files changed, 79 insertions(+), 98 deletions(-)
 delete mode 100644 coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py

diff --git a/coldfront/core/billing/management/commands/billing_ids.py b/coldfront/core/billing/management/commands/billing_ids.py
index 67628f05e..c7d738397 100644
--- a/coldfront/core/billing/management/commands/billing_ids.py
+++ b/coldfront/core/billing/management/commands/billing_ids.py
@@ -108,11 +108,12 @@ def _add_set_subparser(parsers):
     @staticmethod
     def _add_validate_subparser(parsers):
         parser = parsers.add_parser(
-            'validate', help=('Takes a billing ID as input and prints out "Valid" or "Invalid."'))
-
+            'validate', help=(
+                'Check whether one or more billing IDs are valid.'))
+        
         parser.add_argument(
-            'billings_ids', 
-            help=('A space-separated list of billings ids (e.g., 123456-789) to be validated.'),
+            'billing_ids', 
+            help=('A space-separated list of billing IDs.'),
             nargs='+',
             type=str)
 
@@ -277,14 +278,14 @@ def _handle_set(self, *args, **options):
             
     def _handle_validate(self, *args, **options):
         """Handle the 'validate' subcommand."""
-        for full_id in options['billings_ids']:
+        for full_id in options['billing_ids']:
             if is_billing_id_well_formed(full_id):
-                append_str = 'Valid'
-                if not is_billing_id_valid(full_id):
-                    append_str = 'Invalid'
-                print(full_id + ':', append_str)
+                if is_billing_id_valid(full_id):
+                    self.stdout.write(self.style.SUCCESS(full_id + ': Valid'))
+                else:
+                    self.stdout.write(self.style.ERROR(full_id + ': Invalid'))
             else:
-                raise CommandError(f'Billing ID {full_id} is malformed.')
+                self.stdout.write(self.style.ERROR(full_id + ': Malformed'))
 
     def _handle_set_project_default(self, project, billing_activity,
                                     dry_run=False):
diff --git a/coldfront/core/billing/templates/billing/billing_id_validate.html b/coldfront/core/billing/templates/billing/billing_id_validate.html
index bac2d67b5..61c7f962e 100644
--- a/coldfront/core/billing/templates/billing/billing_id_validate.html
+++ b/coldfront/core/billing/templates/billing/billing_id_validate.html
@@ -10,12 +10,11 @@
 {% block content %}
 
 <h1>Validate LBL Project IDs</h1>
+<hr>
+
 <p>
-    To test the validity of multiple Project IDs, put each on its own line. The form checks whether
-    each Project ID is well-formed, and if it is well-formed, it checks the validity of each ID. Do
-    not put extra text or spaces, else the form will consider the ID malformed.
+    To test the validity of multiple Project IDs, put each on its own line. 
 </p>
-<hr>
 
 <form method="post">
   {% csrf_token %}
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 df28204ca..cb2a4eb3a 100644
--- a/coldfront/core/billing/tests/test_commands/test_billing_ids.py
+++ b/coldfront/core/billing/tests/test_commands/test_billing_ids.py
@@ -106,27 +106,29 @@ def test_create_success(self):
         billing_activity = get_billing_activity_from_full_id(billing_id)
         self.assertTrue(isinstance(billing_activity, BillingActivity))
 
-    def test_validate_malformed(self):
-        """Test that, when the given billing ID is malformed, the
-        'validate' subcommand raises an error."""
-        billing_id = '12345-67'
-        self.assertIsNone(get_billing_activity_from_full_id(billing_id))
-        self.assertFalse(is_billing_id_well_formed(billing_id))
+    def test_validate_success(self):
+        """Test that, given a variety of billing IDs, the
+        'validate' outputs correctly."""
 
-        with self.assertRaises(CommandError) as cm:
-            self.command.validate([billing_id])
-        self.assertIn('is malformed', str(cm.exception))
+        malformed_billing_id = '12345-67'
+        self.assertFalse(is_billing_id_well_formed(malformed_billing_id))
 
-    def test_validate_nonexistant(self):
-        """Test that, when the given billing ID does not exist, the
-        'validate' subcommand raises an error."""
-        billing_id = '123456-789'
-        self.assertIsNone(get_billing_activity_from_full_id(billing_id))
-        self.assertTrue(is_billing_id_well_formed(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))
 
-        with self.assertRaises(CommandError) as cm:
-            self.command.validate([billing_id])
-        self.assertIn('does not exist', str(cm.exception))
+        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.assertFalse(error)
+
+        self.assertIn(malformed_billing_id + ": Malformed", output)
+        self.assertIn(invalid_billing_id + ": Invalid", output)
+        self.assertIn(valid_billing_id + ": Valid", output)
 
     # TODO: test_list
 
diff --git a/coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py b/coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py
deleted file mode 100644
index 442024ded..000000000
--- a/coldfront/core/billing/tests/test_forms/test_billing_id_validate_many_form.py
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-
-class TestBillingIDValidateManyForm(TestBillingBase):
-    """A class for testing BillingIDValidateManyForm."""
-
-    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.user.is_superuser = True
-        self.user.save()
-
-        self.command = BillingIdsCommand()
-
-    def test_malformed_billing_ids(self):
-        malformed_billing_id = "12345-78"
-        response = self.client.post("/billing/validate/", data={"billing_ids": malformed_billing_id})
-        messages = list(get_messages(response.wsgi_request))
-        
-        self.assertEqual(len(messages), 1)
-
-        self.assertIn(malformed_billing_id + ": Malformed", messages[0].message)
-
-    def test_billing_ids_correctness(self):
-        unused_id = "123456-789"
-        self.assertIsNone(get_billing_activity_from_full_id(unused_id))
-
-        used_id_invalid = "123456-001"
-        self.assertIsNone(get_billing_activity_from_full_id(used_id_invalid))
-        _, error = self.command.create(used_id_invalid, ignore_invalid=True)
-        self.assertFalse(error)
-
-        used_id_valid = "123456-002"
-        self.assertIsNone(get_billing_activity_from_full_id(used_id_valid))
-        _, error = self.command.create(used_id_valid)
-        self.assertFalse(error)
-
-        billing_ids = unused_id + '\n' + used_id_invalid + '\n' + used_id_valid
-        response = self.client.post("/billing/validate/", data={"billing_ids": billing_ids})
-        messages = list(get_messages(response.wsgi_request))
-        
-        self.assertEqual(len(messages), 1)
-
-        self.assertIn(unused_id + ": Invalid", messages[0].message)
-        self.assertIn(used_id_invalid + ": Invalid", messages[0].message)
-        self.assertIn(used_id_valid + ": Valid", messages[0].message)
-
-
-
-
-
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
index 9d9120a19..e7d6ea413 100644
--- 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
@@ -1,8 +1,15 @@
-from coldfront.core.utils.tests.test_base import TestBase
+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(TestBase):
+class TestBillingIDValidateView(TestBillingBase):
     """A class for testing BillingIDValidateView."""
 
     def setUp(self):
@@ -12,28 +19,57 @@ def setUp(self):
         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."""
 
-        url = "/billing/validate/"
-
         # Unauthenticated user.
         self.client.logout()
-        response = self.client.get(url)
-        self.assert_redirects_to_login(response, next_url=url)
+        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(url)
+        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(url)
+        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/views/admin_views.py b/coldfront/core/billing/views/admin_views.py
index b93cc6af0..8958fb844 100644
--- a/coldfront/core/billing/views/admin_views.py
+++ b/coldfront/core/billing/views/admin_views.py
@@ -340,7 +340,7 @@ def form_valid(self, form):
                     append_str = "Malformed"
                     exists_malformed_or_invalid = True
 
-                validation_results += ( f'{full_id}: {append_str}<br />' )
+                validation_results += f'{full_id}: {append_str}<br />' 
         if exists_malformed_or_invalid:
             messages.error(self.request, mark_safe(validation_results))
         else:

From 3f2510b0d2867966bdd0bf89e0bd55b1e163f04d Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.elbert.li@gmail.com>
Date: Fri, 2 Aug 2024 10:56:02 -0700
Subject: [PATCH 11/12] Write to stderr if validation fails

---
 coldfront/core/billing/management/commands/billing_ids.py | 4 ++--
 .../core/billing/tests/test_commands/test_billing_ids.py  | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/coldfront/core/billing/management/commands/billing_ids.py b/coldfront/core/billing/management/commands/billing_ids.py
index c7d738397..68143863d 100644
--- a/coldfront/core/billing/management/commands/billing_ids.py
+++ b/coldfront/core/billing/management/commands/billing_ids.py
@@ -283,9 +283,9 @@ def _handle_validate(self, *args, **options):
                 if is_billing_id_valid(full_id):
                     self.stdout.write(self.style.SUCCESS(full_id + ': Valid'))
                 else:
-                    self.stdout.write(self.style.ERROR(full_id + ': Invalid'))
+                    self.stderr.write(self.style.ERROR(full_id + ': Invalid'))
             else:
-                self.stdout.write(self.style.ERROR(full_id + ': Malformed'))
+                self.stderr.write(self.style.ERROR(full_id + ': Malformed'))
 
     def _handle_set_project_default(self, project, billing_activity,
                                     dry_run=False):
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 cb2a4eb3a..f138d8490 100644
--- a/coldfront/core/billing/tests/test_commands/test_billing_ids.py
+++ b/coldfront/core/billing/tests/test_commands/test_billing_ids.py
@@ -123,12 +123,10 @@ def test_validate_success(self):
 
         output, error = self.command.validate(
             [malformed_billing_id, invalid_billing_id, valid_billing_id])
-        
-        self.assertFalse(error)
 
-        self.assertIn(malformed_billing_id + ": Malformed", output)
-        self.assertIn(invalid_billing_id + ": Invalid", output)
-        self.assertIn(valid_billing_id + ": Valid", output)
+        self.assertIn(malformed_billing_id + ': Malformed', error)
+        self.assertIn(invalid_billing_id + ': Invalid', error)
+        self.assertIn(valid_billing_id + ': Valid', output)
 
     # TODO: test_list
 

From f611f59adf1a631436fe264115278ec03b317c6e Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.elbert.li@gmail.com>
Date: Thu, 8 Aug 2024 10:30:30 -0700
Subject: [PATCH 12/12] Document that overrides.yml may be used to override
 settings

---
 bootstrap/development/docker/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap/development/docker/README.md b/bootstrap/development/docker/README.md
index 6eac59504..eaf6ee622 100644
--- a/bootstrap/development/docker/README.md
+++ b/bootstrap/development/docker/README.md
@@ -33,6 +33,7 @@ Note that these steps must be run from the root directory of the repo.
    Notes:
      - This step may be performed multiple times.
      - The `main.yml` file does not need to be modified in any way, despite indications within it. Its pre-defined values will be overridden and added to based on the other YML files in the directory.
+     - Settings may be added or overridden by specifying them in an `overrides.yml` file in the directory.
 
 5. Generate a `.env` file with environment variables that will be passed to `docker-compose.yml`. You must provide a deployment name ("BRC" or "LRC"), as well as a port where the web service will be available ("8880", "8881", "8882", or "8883").