Merge pull request #800 from umccr/fix(wfm)/create-portal-run-id

Fix(WFM): Portal Run Id Creation

Author: williamputraintan

lib/workload/stateless/stacks/workflow-manager/workflow_manager/management/commands/generate_analysis_for_metadata.py

@@ -8,6 +8,7 @@
 
 from workflow_manager.models import Workflow, WorkflowRun, Analysis, AnalysisContext, AnalysisRun, \
                                     Library, LibraryAssociation, State, Status
+from workflow_manager.models.utils import create_portal_run_id
 from workflow_manager.tests.factories import PayloadFactory, LibraryFactory
 
 # https://docs.djangoproject.com/en/5.0/howto/custom-management-commands/
@@ -512,6 +513,3 @@ def create_workflowrun_for_analysis(analysis_run: AnalysisRun):
                     ready_state.save()
 
 
-def create_portal_run_id() -> str:
-    date = datetime.now(timezone.utc)
-    return f"{date.year}{date.month}{date.day}{str(uuid.uuid4())[:8]}"

lib/workload/stateless/stacks/workflow-manager/workflow_manager/models/utils.py

@@ -146,4 +146,4 @@ def get_latest_state(states: List[State]) -> State:
 
 def create_portal_run_id() -> str:
     date = datetime.now(timezone.utc)
-    return f"{date.year}{date.month}{date.day}{str(uuid.uuid4())[:8]}"
+    return f"{date.year:04}{date.month:02}{date.day:02}{str(uuid.uuid4())[:8]}"

lib/workload/stateless/stacks/workflow-manager/workflow_manager/tests/test_models.py

@@ -1,9 +1,11 @@
 import logging
+import time
 from unittest import skip
 
 from django.test import TestCase
 
 from workflow_manager.models import Library
+from workflow_manager.models.utils import create_portal_run_id
 from workflow_manager.models.workflow import Workflow
 
 logger = logging.getLogger()
@@ -26,7 +28,6 @@ def test_save_workflow(self):
 
         self.assertEqual(1, Workflow.objects.count())
 
-
     def test_save_library(self):
         """
         python manage.py test workflow_manager.tests.test_models.WorkflowModelTests.test_save_library
@@ -39,7 +40,6 @@ def test_save_library(self):
         logger.info(lib)
         self.assertEqual(1, Library.objects.count())
 
-
     def test_save_library_with_orcabus_id(self):
         """
         python manage.py test workflow_manager.tests.test_models.WorkflowModelTests.test_save_library_with_orcabus_id
@@ -52,3 +52,17 @@ def test_save_library_with_orcabus_id(self):
         lib.save()
         logger.info(lib)
         self.assertEqual(1, Library.objects.count())
+
+    def test_create_portal_run_id(self):
+        """
+        python manage.py test workflow_manager.tests.test_models.WorkflowModelTests.test_create_portal_run_id
+        """
+        portal_run_id_1 = create_portal_run_id()
+
+        # making sure portal_run_id is different generated in different time
+        time.sleep(1)
+        portal_run_id_2 = create_portal_run_id()
+
+        self.assertIsNotNone(portal_run_id_1)
+        self.assertEqual(len(portal_run_id_1), 16)
+        self.assertNotEqual(portal_run_id_1, portal_run_id_2)