IVS-874 - Fix for Django Admin actions

backend/apps/ifc_validation/management/commands/revalidate_request.py

@@ -0,0 +1,53 @@
+import logging
+
+from django.core.management.base import BaseCommand
+
+from apps.ifc_validation_models.models import ValidationRequest
+from apps.ifc_validation_models.decorators import requires_django_user_context
+from apps.ifc_validation.tasks.task_runner import ifc_file_validation_task
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+
+    help = (
+        'Revalidate a specific Validation Request by its ID. This command resets the status of the request and re-queues it for validation.',
+        'Note: archived or deleted requests cannot be revalidated.'
+    )
+
+    def add_arguments(self, parser):
+
+        parser.add_argument(
+            '--validation_request_id', '-id',       
+            type=int,
+            required=True,
+            help='ID of the Validation Request to revalidate.'
+        )
+
+
+    @requires_django_user_context
+    def handle(self, *args, **options):
+        id = options['validation_request_id']
+
+        try:
+            request = ValidationRequest.objects.get(id=id)
+        except ValidationRequest.DoesNotExist:
+            logger.error(f"Validation Request with id={id} not found.")
+            return
+
+        # don't requeue deleted/archived requests
+        if request.deleted:
+            logger.warning(f"Validation Request with id={id} is deleted and cannot be revalidated.")
+            return
+
+        if request.file == None or request.file_removed:
+            logger.warning(f"Validation Request with id={id} is archived and cannot be revalidated.")
+            return
+
+        # reset status and requeue for validation
+        request.mark_as_pending(reason='Resubmitted for processing via Django Management Command')
+        if request.model:
+            request.model.reset_status()
+        ifc_file_validation_task.delay(request.id, request.file_name)
+        logger.info(f"Task 'ifc_file_validation_task' re-submitted for id:{request.id} file_name: {request.file_name}")

backend/apps/ifc_validation/templates/admin/assign_company_intermediate.html

@@ -31,13 +31,13 @@ <h2>
         {% for users in detected_users.items %}
             {% if users.0 == company.pk %}
                 {% for user in users.1 %}
-                    <input type="checkbox" name="user_{{ user.pk }}" value="{{ company.pk }}" checked>
-                    <label for="user_{{ user.pk }}">#{{ user.pk }} - {{ user.get_full_name }} - {{ user.email }} {% if user.useradditionalinfo.company %}<b> -&gt; current company: {{ user.useradditionalinfo.company }}{% endif %}</b></label><br>
+                    <input type="checkbox" name="user_{{ user.pk|cut:"," }}" value="{{ company.pk|cut:"," }}" checked>
+                    <label for="user_{{ user.pk|cut:"," }}">#{{ user.pk }} - {{ user.get_full_name }} - {{ user.email }} {% if user.useradditionalinfo.company %}<b> -&gt; current company: {{ user.useradditionalinfo.company }}{% endif %}</b></label><br>
                 {% endfor %}
             {% endif %}
         {% endfor %}
     </p>
-    <input type="hidden" name="_selected_action" value="{{ company.pk }}" />
+    <input type="hidden" name="_selected_action" value="{{ company.pk|cut:"," }}" />
   {% endfor %}
 
   <input type="hidden" name="action" value="assign_users_action" />

backend/apps/ifc_validation/templates/admin/hard_delete_intermediate.html

@@ -23,7 +23,7 @@ <h1>
     <p>
       {{ val_request }}
     </p>
-    <input type="hidden" name="_selected_action" value="{{ val_request.pk }}" />
+    <input type="hidden" name="_selected_action" value="{{ val_request.pk|cut:"," }}" />
   {% endfor %}
 
   <input type="hidden" name="action" value="hard_delete_action" />

backend/apps/ifc_validation/templates/admin/restart_processing_intermediate.html

@@ -23,11 +23,11 @@ <h1>
 
   {% for val_request in val_requests %}
     <p>
-      <input type="checkbox" name="valreq_{{ val_request.pk }}" value="{{ val_request.pk }}" {% if val_request.deleted %}disabled{% else %}checked{% endif %}>
-      <label for="valreq_{{ val_request.pk }}">#{{ val_request.pk }} - {{ val_request.public_id }} - {{ val_request.file.name }} {% if val_request.deleted %}<b> (DELETED){% endif %}</b></label>
+      <input type="checkbox" name="valreq_{{ val_request.pk|cut:"," }}" value="{{ val_request.pk|cut:"," }}" {% if val_request.deleted %}disabled{% else %}checked{% endif %}>
+      <label for="valreq_{{ val_request.pk|cut:"," }}">#{{ val_request.pk }} - {{ val_request.public_id }} - {{ val_request.file.name }} {% if val_request.deleted %}<b> (DELETED){% endif %}</b></label>
       <br>
     </p>
-    <input type="hidden" name="_selected_action" value="{{ val_request.pk }}" />
+    <input type="hidden" name="_selected_action" value="{{ val_request.pk|cut:"," }}" />
   {% endfor %}
 
   <br />