WorkflowEvent: changed job_id to condor_job_id and added

workflow_request_id field

shared/workspaces/src/workspaces/schema.py

@@ -90,8 +90,9 @@ class WorkflowEvent:
 
     def __init__(
         self,
+        workflow_request_id: int,
         job_name: str,
-        job_id: str,
+        condor_job_id: str,
         event_type: WorkflowEventType,
         timestamp: str,
         log: str,
@@ -99,8 +100,9 @@ class WorkflowEvent:
     ):
         # NOTE: when you modify the properties here, also update the schema
         # in the .json package.
+        self.workflow_request_id = workflow_request_id
         self.job_name = job_name
-        self.job_id = str(job_id)
+        self.condor_job_id = str(condor_job_id)
         self.type = event_type
         self.timestamp = timestamp
         self.log = log
@@ -108,6 +110,7 @@ class WorkflowEvent:
 
     def json(self) -> str:
         d = {
+            "workflow_request_id": self.workflow_request_id,
             "job_name": self.job_name,
             "type": str(self.type),
             "timestamp": self.timestamp,
@@ -125,7 +128,7 @@ class WorkflowEvent:
     def __eq__(self, other):
         return (
             self.job_name == other.job_name
-            and self.job_id == other.job_id
+            and self.condor_job_id == other.condor_job_id
             and self.type == other.type
             and self.timestamp == other.timestamp
             and self.log == other.log