From 46dd173a1203f8f010f5db286645f603140b298c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Thu, 16 Dec 2021 14:00:54 +0100
Subject: [PATCH] fixing tests

---
 .../resources/documents/documents.py             |  6 ++++--
 tests/test_documents.py                          | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ereuse_devicehub/resources/documents/documents.py b/ereuse_devicehub/resources/documents/documents.py
index 45148588..83d8ebf5 100644
--- a/ereuse_devicehub/resources/documents/documents.py
+++ b/ereuse_devicehub/resources/documents/documents.py
@@ -120,8 +120,10 @@ class DevicesDocumentView(DeviceView):
     @cache(datetime.timedelta(minutes=1))
     def find(self, args: dict):
         query = self.query(args)
-        filters = json.loads(request.args.get('filter', {}))
-        ids = filters.get('ids', [])
+        ids = []
+        if 'filter' in request.args:
+            filters = json.loads(request.args.get('filter', {}))
+            ids = filters.get('ids', [])
         query = self.query(args).filter(Device.id.in_(ids))
         return self.generate_post_csv(query)
 
diff --git a/tests/test_documents.py b/tests/test_documents.py
index da031c98..bf11bb4a 100644
--- a/tests/test_documents.py
+++ b/tests/test_documents.py
@@ -97,20 +97,21 @@ def test_erasure_certificate_wrong_id(client: Client):
 def test_export_csv_permitions(user: UserClient, user2: UserClient, client: Client):
     """test export device information in a csv file with others users."""
     snapshot, _ = user.post(file('basic.snapshot'), res=Snapshot)
+    dev_id = snapshot['device']['id']
     csv_user, _ = user.get(res=documents.DocumentDef.t,
                            item='devices/',
                            accept='text/csv',
-                           query=[('filter', {'type': ['Computer']})])
+                           query=[('filter', {'type': ['Computer'], 'ids': [dev_id]})])
 
     csv_user2, _ = user2.get(res=documents.DocumentDef.t,
                              item='devices/',
                              accept='text/csv',
-                             query=[('filter', {'type': ['Computer']})])
+                             query=[('filter', {'type': ['Computer'], 'ids': [dev_id]})])
 
     _, res = client.get(res=documents.DocumentDef.t,
                         item='devices/',
                         accept='text/csv',
-                        query=[('filter', {'type': ['Computer']})], status=401)
+                        query=[('filter', {'type': ['Computer'], 'ids': [dev_id]})], status=401)
     assert res.status_code == 401
 
     assert len(csv_user) > 0
@@ -215,10 +216,11 @@ def test_live_example2(user: UserClient, client: Client, app: Devicehub):
 def test_export_basic_snapshot(user: UserClient):
     """Test export device information in a csv file."""
     snapshot, _ = user.post(file('basic.snapshot'), res=Snapshot)
+    dev_id = snapshot['device']['id']
     csv_str, _ = user.get(res=documents.DocumentDef.t,
                           item='devices/',
                           accept='text/csv',
-                          query=[('filter', {'type': ['Computer']})])
+                          query=[('filter', {'type': ['Computer'], 'ids': [dev_id]})])
 
     f = StringIO(csv_str)
     obj_csv = csv.reader(f, f, delimiter=';', quotechar='"')
@@ -266,16 +268,18 @@ def test_export_extended(app: Devicehub, user: UserClient):
     """Test a export device with all information and a lot of components."""
     snapshot1, _ = user.post(file('real-eee-1001pxd.snapshot.12'), res=Snapshot, status=201)
     snapshot2, _ = user.post(file('complete.export.snapshot'), res=Snapshot, status=201)
+    dev1_id = snapshot1['device']['id']
+    dev2_id = snapshot2['device']['id']
     with app.app_context():
         # Create a pc with a tag
-        pc = d.Device.query.filter_by(id=snapshot1['device']['id']).first()
+        pc = d.Device.query.filter_by(id=dev1_id).first()
         db.session.add(pc)
         db.session.commit()
 
     csv_str, _ = user.get(res=documents.DocumentDef.t,
                           item='devices/',
                           accept='text/csv',
-                          query=[('filter', {'type': ['Computer']})])
+                          query=[('filter', {'type': ['Computer'], 'ids': [dev1_id, dev2_id]})])
 
     f = StringIO(csv_str)
     obj_csv = csv.reader(f, f, delimiter=';', quotechar='"')