Merge pull request #376 from MrCreosote/master

Handle at_least toggle in api translation layer
kbase · Jul 23, 2020 · be83158 · be83158
2 parents 1aa7501 + 2300954
commit be83158
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/SampleService/core/api_translation.py b/lib/SampleService/core/api_translation.py
@@ -389,7 +389,8 @@ def acl_delta_from_dict(d: Dict[str, Any]) -> SampleACLDelta:
         _get_acl(d, 'write'),
         _get_acl(d, 'read'),
         _get_acl(d, 'remove'),
-        pub)
+        pub,
+        bool(d.get('at_least')))
 
 
 def _get_acl(acls, type_):

diff --git a/test/core/api_translation_test.py b/test/core/api_translation_test.py
@@ -650,14 +650,18 @@ def _acls_from_dict_fail(d, expected):
 
 def test_acl_delta_from_dict():
     assert acl_delta_from_dict({}) == SampleACLDelta()
-    assert acl_delta_from_dict({'public_read': 0}) == SampleACLDelta()
-    assert acl_delta_from_dict({'public_read': 1}) == SampleACLDelta(public_read=True)
-    assert acl_delta_from_dict({'public_read': -1}) == SampleACLDelta(public_read=False)
-    assert acl_delta_from_dict({'public_read': -50}) == SampleACLDelta(public_read=False)
+    assert acl_delta_from_dict({'public_read': 0, 'at_least': 0}) == SampleACLDelta()
+    assert acl_delta_from_dict({'public_read': 1, 'at_least': None}) == SampleACLDelta(
+        public_read=True)
+    assert acl_delta_from_dict({'public_read': -1, 'at_least': 1}) == SampleACLDelta(
+        public_read=False, at_least=True)
+    assert acl_delta_from_dict({'public_read': -50, 'at_least': -50}) == SampleACLDelta(
+        public_read=False, at_least=True)
     assert acl_delta_from_dict({
         'read': [],
         'admin': ['whee', 'whoo'],
-        'public_read': None}) == SampleACLDelta([UserID('whee'), UserID('whoo')])
+        'public_read': None,
+        'at_least': 100}) == SampleACLDelta([UserID('whee'), UserID('whoo')], at_least=True)
     assert acl_delta_from_dict({
         'read': ['a', 'b'],
         'write': ['c'],