Add UUID field to FlowStart

rapidpro · Jun 26, 2017 · 16c7577 · 16c7577
1 parent 3242300
commit 16c7577
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/temba_client/v2/__init__.py b/temba_client/v2/__init__.py
@@ -138,14 +138,14 @@ def get_flows(self, uuid=None):
         """
         return self._get_query('flows', self._build_params(uuid=uuid), Flow)
 
-    def get_flow_starts(self, id=None):
+    def get_flow_starts(self, uuid=None):
         """
         Gets all matching flows starts
 
-        :param id: flow start id
+        :param uuid: flow start UUID
         :return: flow start query
         """
-        return self._get_query('flow_starts', self._build_params(id=id), FlowStart)
+        return self._get_query('flow_starts', self._build_params(uuid=uuid), FlowStart)
 
     def get_groups(self, uuid=None, name=None):
         """

diff --git a/temba_client/v2/tests.py b/temba_client/v2/tests.py
@@ -426,7 +426,7 @@ def test_get_flow_starts(self, mock_request):
         self.assertRequest(mock_request, 'get', 'flow_starts')
         self.assertEqual(len(results), 2)
 
-        self.assertEqual(results[0].id, 15051)
+        self.assertEqual(results[0].uuid, "93a624ad-5440-415e-b49f-17bf42754acb")
         self.assertEqual(results[0].flow.uuid, "f5901b62-ba76-4003-9c62-72fdacc1b7b7")
         self.assertEqual(results[0].flow.name, "Registration")
         self.assertEqual(len(results[0].groups), 1)
@@ -442,9 +442,9 @@ def test_get_flow_starts(self, mock_request):
         self.assertEqual(results[0].modified_on, datetime.datetime(2015, 9, 26, 10, 4, 9, 737686, pytz.utc))
 
         # check with all params
-        self.client.get_flow_starts(id=15051).all()
+        self.client.get_flow_starts(uuid="93a624ad-5440-415e-b49f-17bf42754acb").all()
 
-        self.assertRequest(mock_request, 'get', 'flow_starts', params={'id': 15051})
+        self.assertRequest(mock_request, 'get', 'flow_starts', params={'uuid': "93a624ad-5440-415e-b49f-17bf42754acb"})
 
     def test_get_groups(self, mock_request):
         # check no params
@@ -622,6 +622,7 @@ def test_get_runs(self, mock_request):
         self.assertEqual(results[0].flow.name, "Water Survey")
         self.assertEqual(results[0].contact.uuid, "d33e9ad5-5c35-414c-abd4-e7451c69ff1d")
         self.assertEqual(results[0].contact.name, "Frank McFlow")
+        self.assertEqual(results[0].start.uuid, "93a624ad-5440-415e-b49f-17bf42754acb")
         self.assertEqual(results[0].responded, True)
         self.assertEqual(len(results[0].path), 4)
         self.assertEqual(results[0].path[0].node, "27a86a1b-6cc4-4ae3-b73d-89650966a82f")
@@ -761,7 +762,7 @@ def test_create_flow_start(self, mock_request):
             'restart_participants': False,
             'extra': {'day': "Monday"}
         })
-        self.assertEqual(start.id, 15051)
+        self.assertEqual(start.uuid, "93a624ad-5440-415e-b49f-17bf42754acb")
 
     def test_create_group(self, mock_request):
         mock_request.return_value = MockResponse(201, self.read_json('groups', extract_result=0))

diff --git a/temba_client/v2/types.py b/temba_client/v2/types.py
@@ -135,7 +135,7 @@ class Runs(TembaObject):
 
 
 class FlowStart(TembaObject):
-    id = IntegerField()
+    uuid = SimpleField()
     flow = ObjectField(item_class=ObjectRef)
     groups = ObjectListField(item_class=ObjectRef)
     contacts = ObjectListField(item_class=ObjectRef)
@@ -206,6 +206,9 @@ class ResthookSubscriber(TembaObject):
 
 
 class Run(TembaObject):
+    class StartRef(TembaObject):
+        uuid = SimpleField()
+
     class Step(TembaObject):
         node = SimpleField()
         time = DatetimeField()
@@ -219,6 +222,7 @@ class Value(TembaObject):
     id = IntegerField()
     flow = ObjectField(item_class=ObjectRef)
     contact = ObjectField(item_class=ObjectRef)
+    start = ObjectField(item_class=StartRef)
     responded = BooleanField()
     path = ObjectListField(item_class=Step)
     values = ObjectDictField(item_class=Value)

diff --git a/test_files/v2/flow_starts.json b/test_files/v2/flow_starts.json
@@ -3,7 +3,7 @@
     "previous": null,
     "results": [
         {
-            "id": 15051,
+            "uuid": "93a624ad-5440-415e-b49f-17bf42754acb",
             "flow": {"uuid": "f5901b62-ba76-4003-9c62-72fdacc1b7b7", "name": "Registration"},
             "groups": [
                 {"uuid": "04a4752b-0f49-480e-ae60-3a3f2bea485c", "name": "The A-Team"}
@@ -19,7 +19,7 @@
             "modified_on": "2015-09-26T10:04:09.737686Z"
         },
         {
-            "id": 15050,
+            "uuid": "ed209f7d-ba00-4fb7-af82-e97b3c56842f",
             "flow": {"uuid": "f5901b62-ba76-4003-9c62-72fdacc1b7b7", "name": "Thrift Shop"},
             "groups": [
                 {"uuid": "f5901b62-ba76-4003-9c62-72fdacc1b7b7", "name": "Ryan & Macklemore"}

diff --git a/test_files/v2/runs.json b/test_files/v2/runs.json
@@ -6,6 +6,7 @@
             "id": 4092373,
             "flow": {"uuid": "ffce0fbb-4fe1-4052-b26a-91beb2ebae9a", "name": "Water Survey"},
             "contact": {"uuid": "d33e9ad5-5c35-414c-abd4-e7451c69ff1d", "name": "Frank McFlow"},
+            "start": {"uuid": "93a624ad-5440-415e-b49f-17bf42754acb"},
             "responded": true,
             "path": [
                 {"node": "27a86a1b-6cc4-4ae3-b73d-89650966a82f", "time": "2015-11-11T13:05:50.457742Z"},
@@ -36,6 +37,7 @@
             "id": 2504278,
             "flow": {"uuid": "7b75bcb0-3c86-482f-bdce-06a3d6cd5cf7", "name": "Test"},
             "contact": {"uuid": "d33e9ad5-5c35-414c-abd4-e7451c69ff1d", "name": "Frank McFlow"},
+            "start": null,
             "responded": false,
             "path": [],
             "values": {},