Merge pull request #453 from fasrc/cp_approvedby

add approvedby field to allocation change request table on AllocationDetail page

Author: claire-peters

coldfront/core/allocation/templates/allocation/allocation_detail.html

@@ -420,6 +420,7 @@ <h3 class="d-inline">
             <tr>
               <th scope="col">Date Requested</th>
               <th scope="col">Status</th>
+              <th scope="col">Approved By</th>
               <th scope="col">Justification</th>
               <th scope="col">Actions</th>
             </tr>
@@ -435,6 +436,11 @@ <h3 class="d-inline">
                 {% else %}
                   <td class="text-info">{{ change_request.status.name }}</td>
                 {% endif %}
+                {% if change_request.approved_by %}
+                  <td>{{ change_request.approved_by.get_full_name|default:change_request.approved_by.username }}</td>
+                {% else %}
+                  <td>-</td>
+                {% endif %}
                 {% if change_request.justification %}
                   <td>{{change_request.justification}}</td>
                 {% else %}

coldfront/core/allocation/views.py

@@ -201,6 +201,21 @@ def get_context_data(self, **kwargs):
         attributes = list(alloc_attr_set)
 
         allocation_changes = allocation_obj.allocationchangerequest_set.all().order_by('-pk')
+        allocation_changes = list(allocation_changes)
+        approved_status = AllocationChangeStatusChoice.objects.get(name='Approved')
+        approved_by_lookup = {}
+        if allocation_changes:
+            change_request_ids = [change.pk for change in allocation_changes]
+            history_model = AllocationChangeRequest.history.model
+            approved_histories = history_model.objects.filter(
+                id__in=change_request_ids,
+                status=approved_status,
+            ).exclude(history_user__isnull=True).order_by('id', '-history_date')
+            for history_entry in approved_histories:
+                if history_entry.id not in approved_by_lookup:
+                    approved_by_lookup[history_entry.id] = history_entry.history_user
+        for allocation_change in allocation_changes:
+            allocation_change.approved_by = approved_by_lookup.get(allocation_change.pk)
 
         guage_data = []
         invalid_attributes = []
@@ -411,7 +426,7 @@ def post(self, request, *args, **kwargs):
                         return HttpResponseRedirect(reverse('allocation-detail', kwargs={'pk': pk}))
                     logger.info(
                         "Auto-created allocation during approval. "
-                        "requesting_user=%s,allocation_pk=%s,project=%s,size=%s",
+                        "requesting_user=%s allocation_pk=%s project=%s size=%s",
                         request.user, allocation_obj.pk, allocation_obj.project.title, allocation_obj.size,
                         extra={'category': 'integration', 'status': 'success'},
                     )
@@ -1003,7 +1018,7 @@ def post(self, request, *args, **kwargs):
                     )
                     logger.info(
                         'added user to slurm account. '
-                        'requesting_user=%s,user=%s,account=%s,cluster=%s',
+                        'requesting_user=%s user=%s account=%s cluster=%s',
                         requester_uname, username, allocation_obj.project.title, cluster,
                         extra={
                             'username': username,
@@ -1032,7 +1047,8 @@ def post(self, request, *args, **kwargs):
                     )
                 except Exception as e:
                     logger.exception(
-                        "signal processes for allocationuser activation failed. allocationuser_pk=%s,project_title=%s,resource_name=%s,error=%s",
+                        "signal processes for allocationuser activation failed. "
+                        "allocationuser_pk=%s project_title=%s resource_name=%s error=%s",
                         allocation_user_obj.pk, allocation_obj.project.title,
                         allocation_obj.get_parent_resource.name, e
                     )
@@ -1142,7 +1158,10 @@ def post(self, request, *args, **kwargs):
                     raw_share=form_data['value']
                 )
             except Exception as e:
-                logger.exception(f'error encountered while trying to update allocationuser {allocation_obj}:{allocationuser_obj} rawshare: {e}')
+                logger.exception(
+                    'allocationuser rawshare update failed. user=%s allocation_pk=%s error=%s',
+                    allocationuser_obj.user.username, allocation_obj.pk, e
+                )
                 messages.error(request, f'error encountered while trying to update allocationuser {allocation_obj}:{allocationuser_obj} rawshare: {e}')
                 return HttpResponseRedirect(
                     reverse('allocation-edit-user', kwargs=self.kwargs)
@@ -1266,15 +1285,15 @@ def post(self, request, *args, **kwargs):
                     error_message = f"You can't remove this AllocationUser ({user_form_data.get('username')}) while they are running a job using this account. Try again after the job has been completed or cancelled."
                     logger.exception(
                         'could not remove user from slurm account. '
-                        'requesting_user=%s,username=%s,error=%s',
+                        'requesting_user=%s username=%s error=%s',
                         requester_uname, user_form_data.get('username'), e,
                         extra={'category': 'integration:slurmrest', 'status': 'failure'})
                     messages.error(request, error_message)
                 except Exception as e:
                     error_message = f"An error occurred while trying to remove AllocationUser ({user_form_data.get('username')}): {e}"
                     logger.exception(
                         'could not remove user from slurm account. '
-                        'requesting_user=%s,username=%s,error=%s',
+                        'requesting_user=%s username=%s error=%s',
                         requester_uname, user_form_data.get('username'), e,
                         extra={'category': 'integration:slurmrest', 'status': 'failure'}
                     )
@@ -1284,8 +1303,9 @@ def post(self, request, *args, **kwargs):
             msg = f'Removed {remove_users_count} {user_plural} from allocation.'
             messages.success(request, msg)
             logger.info(
-                "Removed %s %s from allocation %s",
-                remove_users_count, user_plural, allocation_obj.pk
+                "Removed allocationusers. user_count=%s allocation_pk=%s project=%s resource=%s",
+                remove_users_count, allocation_obj.pk, allocation_obj.project.title,
+                allocation_obj.get_parent_resource.name
             )
         else:
             for error in formset.errors:
@@ -1585,7 +1605,8 @@ def post(self, request, *args, **kwargs):
                         cluster = allocation.get_parent_resource.get_attribute('slurm_cluster')
                         try:
                             logger.info(
-                                "Triggered update of Slurm user %s rawshare from %s to %s via account %s on cluster %s",
+                                "Triggered update of Slurm user rawshare. target_user=%s "
+                                "old_rawshare=%s new_rawshare=%s account=%s cluster=%s",
                                 username, allocuser_current_rawshare_val,
                                 allocuser_new_rawshare_val, account, cluster
                             )
@@ -2478,7 +2499,7 @@ def post(self, request, *args, **kwargs):
                     except Exception as e:
                         logger.exception(
                             'Auto-update of allocation quota failed. '
-                            'requesting_user=%s,allocation_pk=%s,change_request_pk=%s,error=%s',
+                            'requesting_user=%s allocation_pk=%s change_request_pk=%s error=%s',
                             request.user, alloc_change_obj.allocation.pk,
                             alloc_change_obj.pk, str(e),
                             extra={'category': 'integration', 'status': 'error'}