zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-17 01:57:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Rachid Mrad 2024-06-12 23:17:00 -04:00
parent 0a58ea39a9
commit 86ef6e24c3
No known key found for this signature in database
1 changed files with 54 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/registrar/admin.py
View file

@ -1827,54 +1827,8 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
# Process each log entry to filter based on the change criteria # Process each log entry to filter based on the change criteria
for log_entry in audit_log_entries: for log_entry in audit_log_entries:
changes = log_entry.changes entry = self.process_log_entry(log_entry)
status_changed = "status" in changes if entry:
rejection_reason_changed = "rejection_reason" in changes
action_needed_reason_changed = "action_needed_reason" in changes
# Check if the log entry meets the filtering criteria
if status_changed or (
not status_changed and (rejection_reason_changed or action_needed_reason_changed)
):
entry = {}
# Handle status change
if status_changed:
status_value = changes.get("status", [None, None])[1]
if status_value:
entry["status"] = DomainRequest.DomainRequestStatus(status_value).label
# Handle rejection reason change
if rejection_reason_changed:
rejection_reason_value = changes.get("rejection_reason", [None, None])[1]
if rejection_reason_value:
entry["rejection_reason"] = (
""
if rejection_reason_value == "None"
else DomainRequest.RejectionReasons(rejection_reason_value).label
)
# Handle case where rejection reason changed but not status
if not status_changed:
entry["status"] = DomainRequest.DomainRequestStatus.REJECTED.label
# Handle action needed reason change
if action_needed_reason_changed:
action_needed_reason_value = changes.get("action_needed_reason", [None, None])[1]
if action_needed_reason_value:
entry["action_needed_reason"] = (
""
if action_needed_reason_value == "None"
else DomainRequest.ActionNeededReasons(action_needed_reason_value).label
)
# Handle case where action needed reason changed but not status
if not status_changed:
entry["status"] = DomainRequest.DomainRequestStatus.ACTION_NEEDED.label
# Add actor and timestamp information
entry["actor"] = log_entry.actor
entry["timestamp"] = log_entry.timestamp
# Append the filtered entry to the list
filtered_entries.append(entry) filtered_entries.append(entry)
except ObjectDoesNotExist as e: except ObjectDoesNotExist as e:
@ -1886,13 +1840,63 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
filtered_entries.reverse() filtered_entries.reverse()
# Initialize extra_context and add filtered entries # Initialize extra_context and add filtered entries
if extra_context is None: extra_context = extra_context or {}
extra_context = {}
extra_context["filtered_entries"] = filtered_entries extra_context["filtered_entries"] = filtered_entries
# Call the superclass method with updated extra_context # Call the superclass method with updated extra_context
return super().change_view(request, object_id, form_url, extra_context) return super().change_view(request, object_id, form_url, extra_context)
def process_log_entry(self, log_entry):
"""Process a log entry and return filtered entry dictionary if applicable."""
changes = log_entry.changes
status_changed = "status" in changes
rejection_reason_changed = "rejection_reason" in changes
action_needed_reason_changed = "action_needed_reason" in changes
# Check if the log entry meets the filtering criteria
if status_changed or (not status_changed and (rejection_reason_changed or action_needed_reason_changed)):
entry = {}
# Handle status change
if status_changed:
status_value = changes.get("status", [None, None])[1]
if status_value:
entry["status"] = DomainRequest.DomainRequestStatus(status_value).label
# Handle rejection reason change
if rejection_reason_changed:
rejection_reason_value = changes.get("rejection_reason", [None, None])[1]
if rejection_reason_value:
entry["rejection_reason"] = (
""
if rejection_reason_value == "None"
else DomainRequest.RejectionReasons(rejection_reason_value).label
)
# Handle case where rejection reason changed but not status
if not status_changed:
entry["status"] = DomainRequest.DomainRequestStatus.REJECTED.label
# Handle action needed reason change
if action_needed_reason_changed:
action_needed_reason_value = changes.get("action_needed_reason", [None, None])[1]
if action_needed_reason_value:
entry["action_needed_reason"] = (
""
if action_needed_reason_value == "None"
else DomainRequest.ActionNeededReasons(action_needed_reason_value).label
)
# Handle case where action needed reason changed but not status
if not status_changed:
entry["status"] = DomainRequest.DomainRequestStatus.ACTION_NEEDED.label
# Add actor and timestamp information
entry["actor"] = log_entry.actor
entry["timestamp"] = log_entry.timestamp
return entry
return None
class TransitionDomainAdmin(ListHeaderAdmin): class TransitionDomainAdmin(ListHeaderAdmin):
"""Custom transition domain admin class.""" """Custom transition domain admin class."""