Search sensors in API by asset

flexmeasures/api/v3_0/sensors.py

@@ -6,7 +6,7 @@
 from flask import current_app, url_for
 from flask_classful import FlaskView, route
 from flask_json import as_json
-from flask_security import auth_required
+from flask_security import auth_required, current_user
 from marshmallow import fields, ValidationError
 import marshmallow.validate as validate
 from rq.job import Job, NoSuchJobError
@@ -155,7 +155,6 @@ def index(
         :status 422: UNPROCESSABLE_ENTITY
         """
         account_ids: list = [account.id]
-        accounts: list = [account]
 
         if asset is not None:
             child_assets = (
@@ -170,10 +169,14 @@ def index(
             filter_statement = GenericAsset.account_id.in_(account_ids)
 
         if all_accessible:
-            consultancy_account_ids: list = [
-                acc.consultancy_account_id for acc in accounts
-            ]
-            account_ids.extend(consultancy_account_ids)
+            if current_user.has_role("consultant"):
+                consultancy_accounts = (
+                    db.session.query(Account)
+                    .filter(Account.consultancy_account_id == account.id)
+                    .all()
+                )
+                consultancy_account_ids: list = [acc.id for acc in consultancy_accounts]
+                account_ids.extend(consultancy_account_ids)
 
         if asset and asset.account_id not in account_ids:
             return {"message": "Asset does not belong to the account"}, 422

flexmeasures/api/v3_0/tests/test_sensors_api.py

@@ -20,7 +20,7 @@
 
 
 @pytest.mark.parametrize(
-    "requesting_user, search_by, search_value, exp_sensor_name, exp_num_results, all_accessible, use_pagination",
+    "requesting_user, search_by, search_value, exp_sensor_name, exp_num_results, all_accessible, use_pagination, asset",
     [
         (
             "test_supplier_user_4@seita.nl",
@@ -30,6 +30,7 @@
             2,
             True,
             False,
+            5,
         ),
         (
             "test_supplier_user_4@seita.nl",
@@ -39,6 +40,7 @@
             1,
             True,
             False,
+            None,
         ),
         (
             "test_supplier_user_4@seita.nl",
@@ -48,6 +50,7 @@
             3,
             True,
             True,
+            None,
         ),
         (
             "test_supplier_user_4@seita.nl",
@@ -57,6 +60,7 @@
             1,
             False,
             False,
+            None,
         ),
     ],
     indirect=["requesting_user"],
@@ -71,6 +75,7 @@ def test_fetch_sensors(
     exp_num_results,
     all_accessible,
     use_pagination,
+    asset,
 ):
     """
     Retrieve all sensors.
@@ -91,6 +96,9 @@ def test_fetch_sensors(
     if all_accessible:
         query["all_accessible"] = True
 
+    if asset:
+        query["asset_id"] = asset
+
     response = client.get(
         url_for("SensorAPI:index"),
         query_string=query,
@@ -110,6 +118,9 @@ def test_fetch_sensors(
         assert response.json[0]["name"] == exp_sensor_name
         assert len(response.json) == exp_num_results
 
+        if asset:
+            assert response.json[0]["generic_asset_id"] == asset
+
         if search_by == "unit":
             assert response.json[0]["unit"] == search_value