Merge pull request #67 from FodT/permissions-fix

Permissions fix

Author: pswaminathan

terminalone/models/permission.py

@@ -49,8 +49,8 @@ def _change_access(self, entity_access, id_to_change, add):
             raise ClientError('Must be one of {}!'.format(entity_hierarchy))
         if add:
             if self.properties[entity_access] is None:
-                self.properties[entity_access] = "placeholder"
-            self.properties[entity_access][id_to_change] = {}
+                self.properties[entity_access] = {}
+            self.properties[entity_access][id_to_change] = "placeholder"
         else:
             self.properties[entity_access].pop(id_to_change)
             depth = entity_hierarchy.index(entity_access)
@@ -86,7 +86,10 @@ def _generate_save_data(self, data=None):
         data.pop('organization', None)
         data.pop('agency', None)
         data.pop('advertiser', None)
-        data['advertiser_id'] = self.properties['advertiser'].keys()
-        data['agency_id'] = self.properties['agency'].keys()
-        data['organization_id'] = self.properties['organization'].keys()
+        if self.properties['advertiser'] is not None:
+            data['advertiser_id'] = self.properties['advertiser'].keys()
+        if self.properties['agency'] is not None:
+            data['agency_id'] = self.properties['agency'].keys()
+        if self.properties['organization'] is not None:
+            data['organization_id'] = self.properties['organization'].keys()
         return data

terminalone/models/user.py

@@ -60,6 +60,9 @@ class User(Entity):
         'view_organizations': int,
     })
     _readonly = Entity._readonly.copy()
+    _readonly.update({
+        'last_login_on',
+    })
 
     def __init__(self, session, properties=None, **kwargs):
         super(User, self).__init__(session, properties, **kwargs)

tests/fixtures/permissions_none.xml

@@ -0,0 +1,21 @@
+<?xml version='1.0' ?>
+<result>
+  <permissions>
+    <flags>
+      <access type="edit_data_definition" value="0" />
+      <access type="view_data_definition" value="1" />
+      <access type="edit_segments" value="0" />
+      <access type="edit_campaigns" value="0" />
+      <access type="access_internal_fees" value="0" />
+      <access type="edit_margins_and_performance" value="0" />
+      <access type="view_organizations" value="1" />
+      <access type="view_segments" value="1" />
+      <access type="view_dmp_reports" value="1" />
+      <access type="type" value="INTERNAL" />
+      <access type="role" value="USER" />
+      <access type="scope" value="GLOBAL" />
+    </flags>
+  </permissions>
+  <status code="ok" />
+  <user name="dummyuser" id="10000" type="user" />
+</result>

tests/test_permissions.py

@@ -135,3 +135,19 @@ def test_it_should_add_entity_ids_on_save(self):
         p.add('organization', 10)
         data = p._generate_save_data()
         assert sorted(data['organization_id']) == [1, 2, 10], data['organization_id']
+
+    @responses.activate
+    def test_it_should_add_access_to_empty_permissions(self):
+        self.setup()
+        with open('tests/fixtures/permissions_none.xml') as f:
+            fixture = f.read()
+        responses.add(responses.GET,
+                      'https://api.mediamath.com/api/v2.0/users/10000/permissions',
+                      body=fixture,
+                      content_type='application/xml',
+                      match_querystring=True)
+
+        p = self.t1.get('users', 10000, child='permissions')
+        p.add('organization', 10)
+        data = p._generate_save_data()
+        assert sorted(data['organization_id']) == [10], data['organization_id']