Merge pull request #1391 from ivanB1975/master

Add workbook and datasource name attributes to JobItem Model

Author: jacalata

tableauserverclient/models/job_item.py

@@ -33,6 +33,8 @@ def __init__(
         datasource_id: Optional[str] = None,
         flow_run: Optional[FlowRunItem] = None,
         updated_at: Optional[datetime.datetime] = None,
+        workbook_name: Optional[str] = None,
+        datasource_name: Optional[str] = None,
     ):
         self._id = id_
         self._type = job_type
@@ -47,6 +49,8 @@ def __init__(
         self._datasource_id = datasource_id
         self._flow_run = flow_run
         self._updated_at = updated_at
+        self._workbook_name = workbook_name
+        self._datasource_name = datasource_name
 
     @property
     def id(self) -> str:
@@ -117,6 +121,14 @@ def flow_run(self, value):
     def updated_at(self) -> Optional[datetime.datetime]:
         return self._updated_at
 
+    @property
+    def workbook_name(self) -> Optional[str]:
+        return self._workbook_name
+
+    @property
+    def datasource_name(self) -> Optional[str]:
+        return self._datasource_name
+
     def __str__(self):
         return (
             "<Job#{_id} {_type} created_at({_created_at}) started_at({_started_at}) updated_at({_updated_at}) completed_at({_completed_at})"
@@ -148,8 +160,10 @@ def _parse_element(cls, element, ns):
         mode = element.get("mode", None)
         workbook = element.find(".//t:workbook[@id]", namespaces=ns)
         workbook_id = workbook.get("id") if workbook is not None else None
+        workbook_name = workbook.get("name") if workbook is not None else None
         datasource = element.find(".//t:datasource[@id]", namespaces=ns)
         datasource_id = datasource.get("id") if datasource is not None else None
+        datasource_name = datasource.get("name") if datasource is not None else None
         flow_run = None
         updated_at = parse_datetime(element.get("updatedAt", None))
         for flow_job in element.findall(".//t:runFlowJobType", namespaces=ns):
@@ -172,6 +186,8 @@ def _parse_element(cls, element, ns):
             datasource_id,
             flow_run,
             updated_at,
+            workbook_name,
+            datasource_name,
         )
 
 

test/test_job.py

@@ -120,3 +120,19 @@ def test_get_job_workbook_id(self) -> None:
             m.get(f"{self.baseurl}/{job_id}", text=response_xml)
             job = self.server.jobs.get_by_id(job_id)
         self.assertEqual(job.workbook_id, "5998aaaf-1abe-4d38-b4d9-bc53e85bdd13")
+
+    def test_get_job_workbook_name(self) -> None:
+        response_xml = read_xml_asset(GET_BY_ID_WORKBOOK)
+        job_id = "bb1aab79-db54-4e96-9dd3-461d8f081d08"
+        with requests_mock.mock() as m:
+            m.get(f"{self.baseurl}/{job_id}", text=response_xml)
+            job = self.server.jobs.get_by_id(job_id)
+        self.assertEqual(job.workbook_name, "Superstore")
+
+    def test_get_job_datasource_name(self) -> None:
+        response_xml = read_xml_asset(GET_BY_ID_FAILED_XML)
+        job_id = "777bf7c4-421d-4b2c-a518-11b90187c545"
+        with requests_mock.mock() as m:
+            m.get(f"{self.baseurl}/{job_id}", text=response_xml)
+            job = self.server.jobs.get_by_id(job_id)
+        self.assertEqual(job.datasource_name, "World Indicators")