Fix get_users

mila-iqia · Mar 27, 2024 · fde7114 · fde7114
1 parent ea499f8
commit fde7114
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/sarc/ldap/api.py b/sarc/ldap/api.py
@@ -59,7 +59,7 @@ def get_users(query=None, query_options: dict | None = None, latest=True) -> lis
         query_options = {}
 
     if query is None:
-        return {}
+        query = {}
 
     if latest:
         query = {
@@ -69,7 +69,7 @@ def get_users(query=None, query_options: dict | None = None, latest=True) -> lis
             ]
         }
 
-    results = users_collection().find_by(query, query_options)
+    results = users_collection().find_by(query, **query_options)
 
     return list(results)
 

diff --git a/tests/unittests/ldap/test_api.py b/tests/unittests/ldap/test_api.py
@@ -15,38 +15,36 @@
             ({}, {}),
         ],
         [
-            {"query":"q"},
-            {"kwarg1":1, "kwarg2":2},
+            {"query": "q"},
+            {"kwarg1": 1, "kwarg2": 2},
             False,
             None,
         ],
         [
-            {"query":"q"},
+            {"query": "q"},
             {},
             True,
             (
                 {
                     "$and": [
                         query_latest_records(),
-                        {"query":"q"},
+                        {"query": "q"},
                     ]
                 },
-                {}
+                {},
             ),
         ],
-    ]
+    ],
 )
 def test_get_users(query, query_options, latest, expected, monkeypatch):
     if expected is None:
         expected = (query, query_options)
 
-    monkeypatch.setattr(
-        "sarc.ldap.api.config", lambda:MagicMock()
-    )
+    monkeypatch.setattr("sarc.ldap.api.config", lambda: MagicMock())
     user_repository_mock = MagicMock()
     user_repository_mock.find_by.return_value = tuple()
     monkeypatch.setattr(
-        "sarc.ldap.api.UserRepository", lambda*_args,**_kwargs:user_repository_mock
+        "sarc.ldap.api.UserRepository", lambda *_args, **_kwargs: user_repository_mock
     )
     result = get_users(query, query_options, latest)
     assert isinstance(result, list)