Merge pull request #46 from mbelang/random-ids

Generate random client and contact ids

Author: Pascal Boutin

fake_ubersmith/api/methods/client.py

@@ -15,6 +15,7 @@
 from fake_ubersmith.api.base import Base
 from fake_ubersmith.api.ubersmith import FakeUbersmithError
 from fake_ubersmith.api.utils.response import response
+from fake_ubersmith.api.utils.utils import a_random_id
 
 
 class Client(Base):
@@ -67,7 +68,7 @@ def client_add(self, form_data):
 
         client_data = form_data.copy()
         client_data["clientid"] = client_id
-        client_data["contact_id"] = str(0)
+        client_data["contact_id"] = str(a_random_id())
 
         if client_data.get("uber_login"):
             client_data["login"] = client_data.get("uber_login")
@@ -108,7 +109,7 @@ def client_get(self, form_data):
             )
 
     def contact_add(self, form_data):
-        contact_id = str(len(self.data_store.contacts) + 1)
+        contact_id = str(a_random_id())
 
         contact_data = form_data.copy()
         contact_data["contact_id"] = contact_id

fake_ubersmith/api/utils/utils.py

@@ -0,0 +1,5 @@
+from random import randint
+
+
+def a_random_id():
+    return randint(100000, 999999)

tests/integration/test_ubersmith_client.py

@@ -1,13 +1,13 @@
 # Copyright 2017 Internap.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an 'AS IS' BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
@@ -25,27 +25,26 @@ def test_client_creation_works(self):
 
         result = self.ub_client.client.contact_list(client_id=client_id)
 
-        self.assertEqual(result.get('1').get("client_id"), client_id)
-        self.assertEqual(result.get('1').get("description"), 'Primary Contact')
+        contacts = list(result.values())
+
+        self.assertEqual(contacts[0].get('client_id'), client_id)
+        self.assertEqual(contacts[0].get('description'), 'Primary Contact')
 
     def test_list_all_contacts_works(self):
         self.ub_client.client.contact_add(client_id='1234')
         self.ub_client.client.contact_add(client_id='1234')
         self.ub_client.client.contact_add(client_id='1235')
 
         result = self.ub_client.client.contact_list(client_id='1234')
+        contacts = list(result.values())
 
-        self.assertDictEqual(
-            result,
-            {
-                '2': {'client_id': '1234', 'contact_id': '2'},
-                '3': {'client_id': '1234', 'contact_id': '3'}
-            }
-        )
+        self.assertEqual(len(contacts), 2)
+        self.assertEqual(contacts[0].get('client_id'), '1234')
+        self.assertEqual(contacts[1].get('client_id'), '1234')
 
     def test_list_all_contacts_raises_if_client_id_not_found(self):
         with self.assertRaises(UbersmithException) as exc:
             self.ub_client.client.contact_list(client_id='1234')
 
         self.assertEqual(exc.exception.code, 1)
-        self.assertEqual(exc.exception.message, "Invalid client_id specified.")
+        self.assertEqual(exc.exception.message, 'Invalid client_id specified.')

tests/unit/api/methods/test_client.py

@@ -59,7 +59,7 @@ def test_client_add_creates_a_client(self):
             }
         )
         self.assertEqual(self.data_store.clients[0]["login"], "john")
-        self.assertEqual(self.data_store.contacts[0]["contact_id"], "1")
+        self.assertIsInstance(self.data_store.contacts[0]["contact_id"], str)
         self.assertEqual(self.data_store.contacts[0]["client_id"], body.get("data"))
         self.assertEqual(self.data_store.contacts[0]["description"], "Primary Contact")
 
@@ -144,16 +144,12 @@ def test_client_contact_add_creates_a_contact(self):
                 }
             )
 
+        body = json.loads(resp.data.decode('utf-8'))
         self.assertEqual(resp.status_code, 200)
-        self.assertEqual(
-            json.loads(resp.data.decode('utf-8')),
-            {
-                "data": "1",
-                "error_code": None,
-                "error_message": "",
-                "status": True
-            }
-        )
+        self.assertIsNone(body.get("error_code"))
+        self.assertTrue(body.get("status"))
+        self.assertEqual(body.get("error_message"), "")
+        self.assertIsInstance(body.get("data"), str)
 
     def test_client_contact_get_returns_error_when_empty_payload_provided(self):
         with self.app.test_client() as c: