Requests to Join: User requests to join the project must be approved by a PI. - {% if is_allowed_to_update_project %} - - Update Project settings - - - {% endif %}
diff --git a/coldfront/core/project/templates/project/project_request/savio/project_request_list.html b/coldfront/core/project/templates/project/project_request/savio/project_request_list.html index 1d9a78faa..cc8f8797a 100644 --- a/coldfront/core/project/templates/project/project_request/savio/project_request_list.html +++ b/coldfront/core/project/templates/project/project_request/savio/project_request_list.html @@ -5,7 +5,7 @@ {% block title %} -Savio Project {{ request_filter|title }} Requests +{{ PRIMARY_CLUSTER_NAME }} Project {{ request_filter|title }} Requests {% endblock %} diff --git a/coldfront/core/project/views.py b/coldfront/core/project/views.py index 6f1cc08e5..09a78d50c 100644 --- a/coldfront/core/project/views.py +++ b/coldfront/core/project/views.py @@ -1210,7 +1210,6 @@ def project_update_email_notification(request): class ProjectReviewView(LoginRequiredMixin, UserPassesTestMixin, TemplateView): template_name = 'project/project_review.html' - login_url = "/" # redirect URL if fail test_func def test_func(self): """ UserPassesTestMixin Tests""" @@ -1320,7 +1319,6 @@ def test_func(self): class ProjectReviewCompleteView(LoginRequiredMixin, UserPassesTestMixin, View): - login_url = "/" def test_func(self): """ UserPassesTestMixin Tests""" @@ -1354,7 +1352,6 @@ def get(self, request, project_review_pk): class ProjectReivewEmailView(LoginRequiredMixin, UserPassesTestMixin, FormView): form_class = ProjectReviewEmailForm template_name = 'project/project_review_email.html' - login_url = "/" def test_func(self): """ UserPassesTestMixin Tests""" diff --git a/coldfront/core/project/views_/addition_views/approval_views.py b/coldfront/core/project/views_/addition_views/approval_views.py index 34310db01..8eaf4da98 100644 --- a/coldfront/core/project/views_/addition_views/approval_views.py +++ b/coldfront/core/project/views_/addition_views/approval_views.py @@ -40,7 +40,6 @@ class AllocationAdditionRequestDetailView(LoginRequiredMixin, model = AllocationAdditionRequest template_name = 'project/project_allocation_addition/request_detail.html' - login_url = '/' context_object_name = 'addition_request' request_obj = None @@ -196,7 +195,6 @@ class AllocationAdditionRequestListView(LoginRequiredMixin, Service Units under Projects.""" template_name = 'project/project_allocation_addition/request_list.html' - login_url = '/' completed = False def get_context_data(self, **kwargs): @@ -271,7 +269,6 @@ class AllocationAdditionReviewBase(LoginRequiredMixin, UserPassesTestMixin, """A base class for views for reviewing an AllocationAdditionRequest.""" - login_url = '/' error_message = 'Unexpected failure. Please contact an administrator.' request_obj = None diff --git a/coldfront/core/project/views_/addition_views/request_views.py b/coldfront/core/project/views_/addition_views/request_views.py index 6aacbdf11..49b4ac25e 100644 --- a/coldfront/core/project/views_/addition_views/request_views.py +++ b/coldfront/core/project/views_/addition_views/request_views.py @@ -44,7 +44,6 @@ class AllocationAdditionRequestLandingView(LoginRequiredMixin, Recharge.""" template_name = 'project/project_allocation_addition/request_landing.html' - login_url = '/' project_obj = None @@ -131,7 +130,6 @@ class AllocationAdditionRequestView(LoginRequiredMixin, UserPassesTestMixin, form_class = SavioProjectRechargeExtraFieldsForm template_name = 'project/project_allocation_addition/request_form.html' - login_url = '/' project_obj = None diff --git a/coldfront/core/project/views_/join_views/request_views.py b/coldfront/core/project/views_/join_views/request_views.py index 9f058e04b..c99c2f71c 100644 --- a/coldfront/core/project/views_/join_views/request_views.py +++ b/coldfront/core/project/views_/join_views/request_views.py @@ -35,7 +35,6 @@ class ProjectJoinView(LoginRequiredMixin, UserPassesTestMixin, TemplateView): - login_url = '/' logger = logging.getLogger(__name__) diff --git a/coldfront/core/project/views_/new_project_views/approval_views.py b/coldfront/core/project/views_/new_project_views/approval_views.py index d46e688d0..9d42339bb 100644 --- a/coldfront/core/project/views_/new_project_views/approval_views.py +++ b/coldfront/core/project/views_/new_project_views/approval_views.py @@ -56,7 +56,6 @@ class SavioProjectRequestListView(LoginRequiredMixin, TemplateView): template_name = 'project/project_request/savio/project_request_list.html' - login_url = '/' # Show completed requests if True; else, show pending requests. completed = False @@ -196,7 +195,6 @@ class SavioProjectRequestDetailView(LoginRequiredMixin, UserPassesTestMixin, SavioProjectRequestMixin, DetailView): model = SavioProjectAllocationRequest template_name = 'project/project_request/savio/project_request_detail.html' - login_url = '/' logger = logging.getLogger(__name__) @@ -484,7 +482,6 @@ class SavioProjectReviewEligibilityView(LoginRequiredMixin, form_class = ReviewStatusForm template_name = ( 'project/project_request/savio/project_review_eligibility.html') - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -552,7 +549,6 @@ class SavioProjectReviewReadinessView(LoginRequiredMixin, UserPassesTestMixin, form_class = ReviewStatusForm template_name = ( 'project/project_request/savio/project_review_readiness.html') - login_url = '/' logger = logging.getLogger(__name__) @@ -630,7 +626,6 @@ class SavioProjectReviewMemorandumSignedView(LoginRequiredMixin, form_class = MemorandumSignedForm template_name = ( 'project/project_request/savio/project_review_memorandum_signed.html') - login_url = '/' logger = logging.getLogger(__name__) @@ -699,7 +694,6 @@ class SavioProjectReviewSetupView(LoginRequiredMixin, UserPassesTestMixin, SavioProjectRequestMixin, FormView): form_class = SavioProjectReviewSetupForm template_name = 'project/project_request/savio/project_review_setup.html' - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -785,7 +779,6 @@ class SavioProjectReviewDenyView(LoginRequiredMixin, UserPassesTestMixin, form_class = ReviewDenyForm template_name = ( 'project/project_request/savio/project_review_deny.html') - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -844,7 +837,6 @@ def get_success_url(self): class SavioProjectUndenyRequestView(LoginRequiredMixin, UserPassesTestMixin, SavioProjectRequestMixin, View): - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -905,7 +897,6 @@ def get(self, request, *args, **kwargs): class VectorProjectRequestListView(LoginRequiredMixin, TemplateView): template_name = 'project/project_request/vector/project_request_list.html' - login_url = '/' # Show completed requests if True; else, show pending requests. completed = False @@ -995,7 +986,6 @@ class VectorProjectRequestDetailView(LoginRequiredMixin, UserPassesTestMixin, model = VectorProjectAllocationRequest template_name = ( 'project/project_request/vector/project_request_detail.html') - login_url = '/' context_object_name = 'vector_request' logger = logging.getLogger(__name__) @@ -1125,7 +1115,6 @@ class VectorProjectReviewEligibilityView(LoginRequiredMixin, form_class = ReviewStatusForm template_name = ( 'project/project_request/vector/project_review_eligibility.html') - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -1190,7 +1179,6 @@ class VectorProjectReviewSetupView(LoginRequiredMixin, UserPassesTestMixin, VectorProjectRequestMixin, FormView): form_class = VectorProjectReviewSetupForm template_name = 'project/project_request/vector/project_review_setup.html' - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -1272,7 +1260,6 @@ def get_success_url(self): class VectorProjectUndenyRequestView(LoginRequiredMixin, UserPassesTestMixin, VectorProjectRequestMixin, View): - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" diff --git a/coldfront/core/project/views_/new_project_views/request_views.py b/coldfront/core/project/views_/new_project_views/request_views.py index c292996fd..d38fdd7bd 100644 --- a/coldfront/core/project/views_/new_project_views/request_views.py +++ b/coldfront/core/project/views_/new_project_views/request_views.py @@ -645,7 +645,6 @@ class VectorProjectRequestView(LoginRequiredMixin, UserPassesTestMixin, FormView): form_class = VectorProjectDetailsForm template_name = 'project/project_request/vector/project_details.html' - login_url = '/' logger = logging.getLogger(__name__) diff --git a/coldfront/core/project/views_/removal_views.py b/coldfront/core/project/views_/removal_views.py index 6bc61b68d..79ad39184 100644 --- a/coldfront/core/project/views_/removal_views.py +++ b/coldfront/core/project/views_/removal_views.py @@ -52,7 +52,7 @@ def test_func(self): def dispatch(self, request, *args, **kwargs): project_obj = get_object_or_404(Project, pk=self.kwargs.get('pk')) - if project_obj.status.name not in ['Active', 'New', ]: + if project_obj.status.name not in ['Active', 'Inactive', 'New', ]: messages.error( request, 'You cannot remove users from an archived project.') return HttpResponseRedirect(reverse('project-detail', kwargs={'pk': project_obj.pk})) @@ -203,7 +203,6 @@ class ProjectRemovalRequestListView(LoginRequiredMixin, UserPassesTestMixin, ListView): template_name = 'project/project_removal/project_removal_request_list.html' - login_url = '/' completed = False paginate_by = 30 context_object_name = "project_removal_request_list" @@ -345,7 +344,6 @@ def get_context_data(self, **kwargs): class ProjectRemovalRequestUpdateStatusView(LoginRequiredMixin, UserPassesTestMixin, FormView): form_class = ProjectRemovalRequestUpdateStatusForm - login_url = '/' template_name = \ 'project/project_removal/project_removal_request_update_status.html' @@ -408,7 +406,6 @@ class ProjectRemovalRequestCompleteStatusView(LoginRequiredMixin, UserPassesTestMixin, FormView): form_class = ProjectRemovalRequestCompletionForm - login_url = '/' template_name = \ 'project/project_removal/project_removal_request_complete_status.html' diff --git a/coldfront/core/project/views_/renewal_views/approval_views.py b/coldfront/core/project/views_/renewal_views/approval_views.py index 316465c9f..c58418efc 100644 --- a/coldfront/core/project/views_/renewal_views/approval_views.py +++ b/coldfront/core/project/views_/renewal_views/approval_views.py @@ -43,7 +43,6 @@ class AllocationRenewalRequestListView(LoginRequiredMixin, TemplateView): template_name = 'project/project_renewal/project_renewal_request_list.html' - login_url = '/' completed = False def get_queryset(self): @@ -111,9 +110,11 @@ def get_service_units_to_allocate(self): num_service_units = Decimal( ComputingAllowanceInterface().service_units_from_name( self.computing_allowance_obj.get_name())) - return prorated_allocation_amount( - num_service_units, self.request_obj.request_time, - self.allocation_period_obj) + if self.computing_allowance_obj.are_service_units_prorated(): + num_service_units = prorated_allocation_amount( + num_service_units, self.request_obj.request_time, + self.allocation_period_obj) + return num_service_units def set_common_context_data(self, context): """Given a dictionary of context variables to include in the @@ -138,7 +139,6 @@ class AllocationRenewalRequestDetailView(LoginRequiredMixin, model = AllocationRenewalRequest template_name = ( 'project/project_renewal/project_renewal_request_detail.html') - login_url = '/' error_message = 'Unexpected failure. Please contact an administrator.' request_obj = None @@ -335,7 +335,6 @@ class AllocationRenewalRequestReviewEligibilityView(LoginRequiredMixin, FormView): form_class = ReviewStatusForm template_name = 'project/project_renewal/review_eligibility.html' - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -411,7 +410,6 @@ class AllocationRenewalRequestReviewDenyView(LoginRequiredMixin, FormView): form_class = ReviewDenyForm template_name = 'project/project_renewal/review_deny.html' - login_url = '/' def test_func(self): """UserPassesTestMixin tests.""" @@ -488,7 +486,6 @@ def get_success_url(self): # UserPassesTestMixin, # AllocationRenewalRequestMixin, # View): -# login_url = '/' # # def test_func(self): # """UserPassesTestMixin tests.""" diff --git a/coldfront/core/resource/utils_/allowance_utils/computing_allowance.py b/coldfront/core/resource/utils_/allowance_utils/computing_allowance.py index 51b88d8b7..08868dc83 100644 --- a/coldfront/core/resource/utils_/allowance_utils/computing_allowance.py +++ b/coldfront/core/resource/utils_/allowance_utils/computing_allowance.py @@ -43,6 +43,15 @@ def has_infinite_service_units(self): allowance_names.append(LRCAllowances.LR) allowance_names.append(LRCAllowances.RECHARGE) return self._name in allowance_names + + def is_condo(self): + """Return whether the allowance is a condo allocation.""" + allowance_names = [] + if flag_enabled('BRC_ONLY'): + allowance_names.append(BRCAllowances.CO) + if flag_enabled('LRC_ONLY'): + allowance_names.append(LRCAllowances.LR) + return self._name in allowance_names def is_instructional(self): """Return whether the allowance is for a course.""" diff --git a/coldfront/core/socialaccount/adapter.py b/coldfront/core/socialaccount/adapter.py index ce9f9d3eb..3f1c5c200 100644 --- a/coldfront/core/socialaccount/adapter.py +++ b/coldfront/core/socialaccount/adapter.py @@ -35,8 +35,8 @@ def populate_user(self, request, sociallogin, data): user_uid = 'unknown' if provider == 'cilogon': - first_name = data.get('first_name') - last_name = data.get('last_name') + first_name = data.get('first_name', '') + last_name = data.get('last_name', '') email = data.get('email') validated_email = valid_email_or_none(email) diff --git a/coldfront/core/statistics/views.py b/coldfront/core/statistics/views.py index 91a46775f..948fb0ee7 100644 --- a/coldfront/core/statistics/views.py +++ b/coldfront/core/statistics/views.py @@ -29,7 +29,6 @@ class SlurmJobListView(LoginRequiredMixin, ListView): template_name = 'job_list.html' - login_url = '/' paginate_by = 30 context_object_name = 'job_list' diff --git a/coldfront/core/user/templates/user/user_profile.html b/coldfront/core/user/templates/user/user_profile.html index 82090b203..7b660ba1c 100644 --- a/coldfront/core/user/templates/user/user_profile.html +++ b/coldfront/core/user/templates/user/user_profile.html @@ -298,22 +298,24 @@diff --git a/coldfront/core/user/utils_/host_user_utils.py b/coldfront/core/user/utils_/host_user_utils.py index 358685365..ba0ae51ac 100644 --- a/coldfront/core/user/utils_/host_user_utils.py +++ b/coldfront/core/user/utils_/host_user_utils.py @@ -1,6 +1,6 @@ from django.contrib.auth.models import User -from coldfront.core.user.models import EmailAddress +from allauth.account.models import EmailAddress def eligible_host_project_users(project): @@ -35,7 +35,7 @@ def lbl_email_address(user): if user.email.endswith(email_domain): return user.email email_addresses = EmailAddress.objects.filter( - user=user, is_verified=True, email__endswith=email_domain).order_by( + user=user, verified=True, email__endswith=email_domain).order_by( 'email') if not email_addresses.exists(): return None diff --git a/coldfront/core/user/views.py b/coldfront/core/user/views.py index cdd7cad9a..cbbe59801 100644 --- a/coldfront/core/user/views.py +++ b/coldfront/core/user/views.py @@ -24,6 +24,8 @@ from django.views.generic import CreateView, ListView, TemplateView from django.views.generic.edit import FormView +from allauth.account.models import EmailAddress as EmailAddress_LRC + from coldfront.core.allocation.utils import has_cluster_access from coldfront.core.project.models import Project, ProjectUser from coldfront.core.user.models import IdentityLinkingRequest, IdentityLinkingRequestStatusChoice @@ -426,14 +428,26 @@ def get_queryset(self): users = users.filter(username__icontains=data.get('username')) if data.get('email'): - _users = EmailAddress.objects.filter(is_primary=False, email__icontains=data.get('email'))\ - .order_by('user').values_list('user__id') - users = users.filter(Q(email__icontains=data.get('email')) | Q(id__in=_users)) + users = self._filter_users_by_email(users, data) else: users = User.objects.all().order_by(order_by) return users.distinct() + @staticmethod + def _filter_users_by_email(users, data): + if flag_enabled('LRC_ONLY'): + _users = EmailAddress_LRC.objects.filter(primary=False, email__icontains=data.get('email'))\ + .order_by('user').values_list('user__id') + users = users.filter( + Q(email__icontains=data.get('email')) | Q(id__in=_users)) + else: + _users = EmailAddress.objects.filter(is_primary=False, email__icontains=data.get('email'))\ + .order_by('user').values_list('user__id') + users = users.filter( + Q(email__icontains=data.get('email')) | Q(id__in=_users)) + return users + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) user_count = self.get_queryset().count() @@ -546,28 +560,46 @@ def form_valid(self, form): class UserLoginView(View): """Redirect to the Basic Auth. login view or the SSO login view - based on enabled flags.""" + based on enabled flags, retaining any provided next URL. If the user + is authenticated, redirect to the next URL or the home page.""" def dispatch(self, request, *args, **kwargs): - basic_auth_enabled = 'BASIC_AUTH_ENABLED' - if flag_enabled(basic_auth_enabled): - return redirect(reverse('basic-auth-login')) - sso_enabled = 'SSO_ENABLED' - if flag_enabled(sso_enabled): - return redirect(reverse('sso-login')) - raise ImproperlyConfigured( - f'One of the following flags must be enabled: ' - f'{basic_auth_enabled}, {sso_enabled}.') + next_url = request.GET.get('next') + + if request.user.is_authenticated: + return redirect(next_url or reverse('home')) + + basic_auth_enabled = flag_enabled('BASIC_AUTH_ENABLED') + sso_enabled = flag_enabled('SSO_ENABLED') + if not basic_auth_enabled ^ sso_enabled: + raise ImproperlyConfigured( + 'One of the following flags must be enabled: ' + 'BASIC_AUTH_ENABLED, SSO_ENABLED.') + if basic_auth_enabled: + redirect_url = reverse('basic-auth-login') + else: + redirect_url = reverse('sso-login') + + if next_url: + redirect_url = self._url_with_next(redirect_url, next_url) + return redirect(redirect_url) + + @staticmethod + def _url_with_next(url, next_url): + """Return the given URL, with a next parameter set to the given + next URL.""" + return f'{url}?next={next_url}' class SSOLoginView(TemplateView): """Display the template for SSO login. If the user is authenticated, - redirect to the home page.""" + redirect to the provided next URL or the home page.""" template_name = 'user/sso_login.html' def dispatch(self, request, *args, **kwargs): if request.user.is_authenticated: - return redirect(reverse('home')) + redirect_url = request.GET.get('next') or reverse('home') + return redirect(redirect_url) return super().dispatch(request, *args, **kwargs) @@ -847,7 +879,6 @@ class UpdatePrimaryEmailAddressView(LoginRequiredMixin, FormView): form_class = PrimaryEmailAddressSelectionForm template_name = 'user/user_update_primary_email_address.html' - login_url = '/' error_message = 'Unexpected failure. Please contact an administrator.' @@ -928,7 +959,6 @@ def get(self, request, *args, **kwargs): @method_decorator(login_required, name='dispatch') class IdentityLinkingRequestView(UserPassesTestMixin, View): - login_url = '/' pending_status = None def test_func(self): diff --git a/coldfront/core/utils/management/commands/audit_data.py b/coldfront/core/utils/management/commands/audit_data.py new file mode 100644 index 000000000..2d2176d43 --- /dev/null +++ b/coldfront/core/utils/management/commands/audit_data.py @@ -0,0 +1,318 @@ +''' +Add a command audit_data to ensure that certain invariants hold. These include, +but are not limited to: + - Allocations have the expected start_date and end_date values. + - Inactive Projects have "Expired" Allocations and zero SUs. + - Each Project has at least one PI. + - Users with a cluster UID should be associated with at least one Project. +TODO: Lawrencium features don't work and need to be further developed. +LRC only: + - Each UserProfile with access to Lawrencium should have a billing_activity. + - Each Recharge Allocation that has access to Lawrencium should have a + "Billing Activity"-typed AllocationAttribute. + - Each Recharge AllocationUser that has access to Lawrencium should have a + "Billing Activity"-typed AllocationUserAttribute. + - From Enforce that LRC PIs are LBL employees #392, each PI of a Project on + Lawrencium must be an LBL employee. + +''' + +from flags.state import flag_enabled + +from django.core.management.base import BaseCommand +from django.db.models import Q + +from coldfront.core.allocation.models import Allocation, \ + AllocationPeriod, \ + AllocationUser +from coldfront.core.project.models import Project, \ + ProjectUser +from coldfront.core.user.models import UserProfile +from coldfront.core.allocation.models import AllocationAttribute + +from coldfront.core.project.utils_.renewal_utils import \ + get_current_allowance_year_period +from coldfront.core.resource.utils_.allowance_utils.computing_allowance import \ + ComputingAllowance +from coldfront.core.utils.common import display_time_zone_current_date + +class Command(BaseCommand): + help = 'Audit data to ensure that certain invariants hold.' + + def add_arguments(self, parser): + parser.add_argument('--all', action='store_true', + help='Run all non-LRC-only checks') + parser.add_argument('--allocation-date', action='store_true', + help='Check that allocations have the expected start_date and ' + 'end_date values') + parser.add_argument('--project-inactive', action='store_true', + help='Check that inactive projects have "Expired" allocations and ' + 'zero SUs') + parser.add_argument('--project-pi', action='store_true', + help='Check that projects have at least one PI') + parser.add_argument('--user-project', action='store_true', + help='Check that users with a cluster UID should be associated ' + 'with at least one Project') + + parser.add_argument('--lrc-user-billing', action='store_true', + help='Check that LRC users have a billing_activity') + parser.add_argument('--lrc-recharge-allocation-billing', + action='store_true', + help='Check that LRC Recharge Allocations have a ' + '"Billing Activity"-typed AllocationAttribute') + parser.add_argument('--lrc-recharge-allocation-user-billing', + action='store_true', + help='Check that LRC Recharge AllocationUsers have a ' + '"Billing Activity"-typed AllocationUserAttribute') + parser.add_argument('--lrc-pis-lbl-employee', action='store_true', + help='Check that LRC PIs are LBL employees') + + + def handle(self, *args, **options): + if options['all']: + options['allocation_date'] = True + options['project_inactive'] = True + options['project_pi'] = True + options['user_project'] = True + # TODO: Uncomment when Lawrencium features are ready. + # options['lrc_all'] = flag_enabled('LRC_ONLY') + if options.get('lrc_all', False): + options['lrc_user_billing'] = True + options['lrc_recharge_allocation_billing'] = True + options['lrc_recharge_allocation_user_billing'] = True + options['lrc_pis_lbl_employee'] = True + for option in options: + if isinstance(options[option], bool) and options[option] and \ + option not in ('all', 'lrc_all'): + self.stdout.write(self.style.SUCCESS(f'Running {option}...')) + getattr(self, f'handle_{option}')() + self.stdout.write(self.style.SUCCESS('Audit complete.') + '\n\n') + + def handle_allocation_date(self): + ''' + Assert that all compute allocations have the expected start_date + and end_date values. + - Allocation end date is after the start date + - FCAs and PCAs: + FCAs and PCAs are valid within a so-called “Allowance Year” + (June 1st - May 31st for BRC, October 1st - September 30th for LRC): + - Inactive ones (ones that were not renewed) should have a start + date set to the start of the current allowance year + AllocationPeriod, but no end date. + - Active ones (ones that were renewed, or were created during + this allowance year) should have a start before and an end date + equal to that of the current allowance year AllocationPeriod. + ICAs (Instructional Computing Allowances) are valid within a + particular UC Berkeley semester. + - Inactive ones should have a start date, but no end date. + - Active ones (currently none on production) should match a current + (has started, but has not ended) instructional AllocationPeriod. + Recharge and Condo may/should have start dates, but don’t have end + dates, as they don’t end. + ''' + allocations = Allocation.objects.select_related('project', + 'project__status').prefetch_related('resources') \ + .filter(resources__name__endswith='Compute') \ + .order_by('resources__name', 'project__name', + 'project__status__name', 'start_date', 'end_date') + YEARLY_ALLOCATION_PERIOD = get_current_allowance_year_period() + INSTRUCTIONAL_ALLOCATION_PERIODS = AllocationPeriod.objects.filter( + Q(end_date__gt=display_time_zone_current_date()) + & (Q(name__startswith='Fall Semester') + | Q(name__startswith='Spring Semester') + | Q(name__startswith='Summer Sessions') \ + )).all() + + for allocation in allocations: + id = allocation.id + start_date = allocation.start_date + end_date = allocation.end_date + project_status = allocation.project.status.name + project = allocation.project.name + try: + resource = allocation.resources.first() + resource_name = resource.name + except AttributeError as e: + self.stdout.write(self.style.ERROR(f'Allocation {id} has no ' + 'resource')) + continue + + if end_date is not None and end_date < start_date: + self.stdout.write(self.style.ERROR(f'{resource_name} {id} ' + f'for {project_status.lower()} project {project} has an end ' + f'date before its start date.')) + + if ComputingAllowance(resource).is_yearly(): + if start_date < YEARLY_ALLOCATION_PERIOD.start_date: + self.stdout.write(self.style.ERROR(f'{resource_name} {id} ' + f'for {project_status.lower()} FCA or PCA project {project}' + f' has a start date of {start_date} that is before its ' + f'allocation period\'s ' + f'({YEARLY_ALLOCATION_PERIOD.start_date} for ' + f'{YEARLY_ALLOCATION_PERIOD}).')) + if project_status == 'Active' and \ + end_date != YEARLY_ALLOCATION_PERIOD.end_date: + self.stdout.write(self.style.ERROR(f'{resource_name} {id} ' + f'for active FCA or PCA project {project} has an end ' + f'date of {end_date} that is different than ' + f'its allocation period\'s ' + f'({YEARLY_ALLOCATION_PERIOD.end_date} for ' + f'{YEARLY_ALLOCATION_PERIOD}).')) + + elif ComputingAllowance(resource).is_instructional(): + if project_status == 'Inactive' and end_date is not None: + self.stdout.write(self.style.ERROR(f'{resource_name} {id} ' + f'for inactive ICA project {project} has an end date ' + f'(it shouldn\'t as it\'s inactive).')) + if project_status == 'Active' \ + and not any(end_date != ica.end_date \ + for ica in INSTRUCTIONAL_ALLOCATION_PERIODS): + self.stdout.write(self.style.ERROR(f'{resource_name} {id} ' + f'for {project_status.lower()} ICA project ' + f'{project} has an end date that is different from all ICA ' + f'allocation periods.')) + # Condo or Recharge + elif ComputingAllowance(resource).is_recharge() or \ + ComputingAllowance(resource).is_condo(): + if end_date is not None: + self.stdout.write(self.style.ERROR(f'{resource_name} {id} ' + f'for {project_status.lower()} Recharge or Condo ' + f'allocation project {project} has an end date. ' + f'(it shouldn\'t)')) + + def handle_project_inactive(self): + ''' + Assert that inactive Projects have "Expired" allocations and zero SUs. + ''' + inactive_projects = Project.objects \ + .prefetch_related('allocation_set__status', + 'allocation_set__resources', + 'allocation_set__allocationattribute_set') \ + .filter(status__name='Inactive') \ + .order_by('name') + + for project in inactive_projects: + for allocation in project.allocation_set \ + .select_related('status') \ + .prefetch_related('allocationattribute_set', + 'resources'): + try: + resource = allocation.resources.first().name + style = (lambda x: + self.style.WARNING('CURRENTLY EXPECTED BEHAVIOR: ') \ + + self.style.WARNING(x)) if \ + resource.endswith('Directory') \ + else self.style.ERROR + if allocation.status.name != 'Expired': + self.stdout.write(style(f'Project {project.name} is ' + f'inactive and has an unexpired ' + f'{resource} allocation {allocation.id}.')) + except AttributeError as e: + pass + try: + allocation_attribute = allocation.allocationattribute_set \ + .get(allocation_attribute_type__name='Service Units') + if float(allocation_attribute.value) != 0: + self.stdout.write(self.style.ERROR( + f'Project {project.name} is inactive and has ' + f'non-zero SUs.')) + except AllocationAttribute.DoesNotExist as e: + pass + + def handle_project_pi(self): + ''' + Assert that all projects have at least one PI. + ''' + projects = Project.objects \ + .select_related('status') \ + .order_by('status__name', 'name') + for project in projects: + if not project.pis().exists(): + self.stdout.write(self.style.ERROR( f'{project.status.name} ' + f'Project {project.name} has no PIs.')) + + def handle_user_project(self): + ''' + Assert that all users with a cluster UID should be associated with + at least one Project. + ''' + userprofiles = UserProfile.objects.filter(cluster_uid__isnull=False) \ + .select_related('user') \ + .order_by('user__is_active', 'user__username') \ + .only('id', 'user__first_name', 'user__last_name', + 'user__email', 'user__username', 'user__is_active') + + for userprofile in userprofiles: + user = userprofile.user + user_project_exists = ProjectUser.objects \ + .filter(user=user).exists() + if not user_project_exists: + self.stdout.write(self.style.ERROR( + f'{("Inactive", "Active")[user.is_active]} User ' + f'{user.username} ({user.first_name} ' + f'{user.last_name}, {user.email}) ' + f'has a cluster UID but is not associated with any projects.')) + + def handle_lrc_user_billing(self): + ''' + TODO: Lawrencium features don't work and need to be further developed. + Assert that all LRC users have a billing_activity. + ''' + userprofiles = UserProfile.objects.filter(cluster_uid__isnull=False) \ + .only('id', 'billing_activity', 'user__first_name', + 'user__last_name', 'user__email') + for userprofile in userprofiles: + user = userprofile.user + if userprofile.billing_activity is None: + self.stdout.write(self.style.ERROR( + f'{("Inactive", "Active")[user.is_active]} User ' + f'{user.username} ({user.first_name} ' + f'{user.last_name}, {user.email}) ' + f'has a cluster UID but is not associated with any billing ' + f'activity.')) + + def handle_lrc_recharge_allocation_billing(self): + ''' + TODO: Lawrencium features don't work and need to be further developed. + Assert that all LRC Recharge Allocations have a "Billing Activity"-typed + AllocationAttribute. + ''' + allocations = Allocation.objects \ + .prefetch_related('resources') \ + .filter(resources__name__endswith='Compute') + for allocation in allocations: + if allocation.allocationattribute_set \ + .filter(type='Billing Activity').count() == 0: + self.stdout.write(self.style.ERROR( + f'{allocation.resources.name} Allocation {allocation.id}' + f' has no "Billing Activity"-typed AllocationAttribute.')) + + def handle_lrc_recharge_allocation_user_billing(self): + ''' + TODO: Lawrencium features don't work and need to be further developed. + Assert that all LRC Recharge AllocationUsers have a + "Billing Activity"-typed AllocationUserAttribute. + ''' + allocation_users = AllocationUser.objects \ + .filter(allocation_resources__name__endswith='Compute') + for allocation_user in allocation_users: + if allocation_user.allocationuserattribute_set.filter( + type='Billing Activity').count() == 0: + self.stdout.write(self.style.ERROR( + f'AllocationUser {allocation_user.id} ' + f'({allocation_user.user.first_name} ' + f'{allocation_user.user.last_name}, ' + f'{allocation_user.user.email}) ' + 'has no "Billing Activity"-typed AllocationUserAttribute.')) + + def handle_lrc_pis_lbl_employee(self): + ''' + TODO: Lawrencium features don't work and need to be further developed. + Assert that all LRC PIs are LBL employees. + ''' + pis = UserProfile.objects.filter(cluster_uid__isnull=False, is_pi=True) + for pi in pis: + if not pi.is_lbl_employee(): + self.stdout.write(self.style.ERROR( + f'User {pi.id} ({pi.user.first_name} {pi.user.last_name}, ' + f'{pi.user.email}) is not an LBL employee.')) diff --git a/requirements.txt b/requirements.txt index 20420398e..be92d8b90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ oauth2client==4.1.3 openpyxl==3.0.9 pandas==1.1.5 phonenumbers==8.12.23 -psycopg2-binary==2.8.3 +psycopg2-binary==2.9.5 pylint==2.12.2 pylint-django==2.5.2 pyparsing==2.4.7