Merge pull request #257 from BEMServer/core_0.20.0

Support/require bemserver-core 0.20.0

Author: lafrech

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
   "flask_smorest>=0.43.0,<0.44",
   "apispec>=6.1.0,<7.0",
   "authlib>=1.3.0,<2.0",
-  "bemserver-core>=0.18.1,<0.20",
+  "bemserver-core>=0.20.0,<0.21",
 ]
 
 [project.urls]

requirements/install.txt

@@ -20,7 +20,7 @@ async-timeout==4.0.3
     # via redis
 authlib==1.3.1
     # via bemserver-api (pyproject.toml)
-bemserver-core==0.18.1
+bemserver-core==0.20.0
     # via bemserver-api (pyproject.toml)
 billiard==4.2.0
     # via celery

tests/resources/test_input_output.py

@@ -96,7 +96,7 @@ def test_sites_csv_post(self, app, user, users, campaigns):
 
     @pytest.mark.usefixtures("site_properties")
     @pytest.mark.usefixtures("building_properties")
-    def test_sites_csv_post_sites_buildings(self, app, users, campaigns):
+    def test_sites_csv_post_update(self, app, users, campaigns):
         campaign_1_id = campaigns[0]
 
         creds = users["Chuck"]["creds"]
@@ -134,6 +134,31 @@ def test_sites_csv_post_sites_buildings(self, app, users, campaigns):
             assert ret.status_code == 200
             assert len(ret.json) == 2
 
+        sites_csv = "Name,Description,IFC_ID,Area\n" "Site 2,Greatest site 2,,3000\n"
+        buildings_csv = (
+            "Name,Description,Site,IFC_ID,Area\n"
+            "Building 2,Greatest building 2,Site 2,,3000\n"
+        )
+
+        with auth_context:
+            ret = client.post(
+                INPUT_OUTPUT_SITES_URL,
+                query_string={
+                    "campaign_id": campaign_1_id,
+                },
+                data={
+                    "sites_csv": (io.BytesIO(sites_csv.encode()), "sites.csv"),
+                    "buildings_csv": (
+                        io.BytesIO(buildings_csv.encode()),
+                        "buildings.csv",
+                    ),
+                },
+            )
+            assert ret.status_code == 201
+            ret = client.get(BUILDINGS_URL)
+            assert ret.status_code == 200
+            assert len(ret.json) == 2
+
     def test_sites_csv_post_invalid_encoding(self, app, users, campaigns):
         campaign_1_id = campaigns[0]
 
@@ -161,8 +186,6 @@ def test_sites_csv_post_invalid_encoding(self, app, users, campaigns):
             "Name,Description,Site",
             # Missing column in row
             "Name,Description,Site,IFC_ID\nBuilding 1,,",
-            # Duplicate building
-            "Name,Description,Site,IFC_ID\nBuilding 3,,Site 1,\nBuilding 3,,Site 1,",
             # Unknown site
             "Name,Description,Site,IFC_ID\nBuilding 1,,Dummy",
         ),
@@ -273,6 +296,74 @@ def test_timeseries_csv_post(self, app, user, users, campaigns):
                 assert ret.status_code == 200
                 assert len(ret.json) == 2
 
+    @pytest.mark.usefixtures("sites")
+    @pytest.mark.usefixtures("buildings")
+    @pytest.mark.usefixtures("storeys")
+    @pytest.mark.usefixtures("spaces")
+    @pytest.mark.usefixtures("zones")
+    @pytest.mark.usefixtures("campaign_scopes")
+    def test_timeseries_csv_post_update(self, app, users, campaigns):
+        campaign_1_id = campaigns[0]
+
+        creds = users["Chuck"]["creds"]
+        auth_context = AuthHeader(creds)
+
+        client = app.test_client()
+
+        timeseries_csv = (
+            "Name,Description,Unit,Campaign scope,Site,Building,"
+            "Storey,Space,Zone,Min,Max\n"
+            "Space_1_Temp,Temperature,°C,Campaign 1 - Scope 1,Site 1,Building 1,"
+            "Storey 1,Space 1,Zone 1,-10,60\n"
+            "Space_2_Temp,Temperature,°C,Campaign 1 - Scope 1,Site 1,Building 1,"
+            "Storey 1,Space 1,Zone 1,-10,60\n"
+        )
+
+        with auth_context:
+            ret = client.post(
+                INPUT_OUTPUT_TIMESERIES_URL,
+                query_string={
+                    "campaign_id": campaign_1_id,
+                },
+                data={
+                    "timeseries_csv": (
+                        io.BytesIO(timeseries_csv.encode()),
+                        "timeseries.csv",
+                    ),
+                },
+            )
+            assert ret.status_code == 201
+            ret = client.get(TIMESERIES_URL)
+            assert ret.status_code == 200
+            assert len(ret.json) == 2
+
+        timeseries_csv = (
+            "Name,Description,Unit,Campaign scope,Site,Building,"
+            "Storey,Space,Zone,Min,Max\n"
+            "Space_1_Temp,Temperature 1,°C,Campaign 1 - Scope 1,Site 1,Building 1,"
+            "Storey 1,Space 1,Zone 1,-10,60\n"
+            "Space_2_Temp,Temperature 2,°C,Campaign 1 - Scope 1,Site 1,Building 1,"
+            ",,,-15,65\n"
+        )
+
+        with auth_context:
+            ret = client.post(
+                INPUT_OUTPUT_TIMESERIES_URL,
+                query_string={
+                    "campaign_id": campaign_1_id,
+                },
+                data={
+                    "timeseries_csv": (
+                        io.BytesIO(timeseries_csv.encode()),
+                        "timeseries.csv",
+                    ),
+                },
+            )
+            assert ret.status_code == 201
+            ret = client.get(TIMESERIES_URL)
+            assert ret.status_code == 200
+            assert len(ret.json) == 2
+
     @pytest.mark.usefixtures("campaign_scopes")
     def test_timeseries_csv_post_invalid_encoding(self, app, users, campaigns):
         campaign_1_id = campaigns[0]
@@ -305,12 +396,6 @@ def test_timeseries_csv_post_invalid_encoding(self, app, users, campaigns):
                 "Name,Description,Unit,Campaign scope,\n"
                 "Space_1_Temp,Temperature,°C,Campaign 1 - Scope 1,,,,,\n"
             ),
-            # Duplicate timeseries
-            (
-                "Name,Description,Unit,Campaign scope,Site,Building,Storey,Space,Zone\n"
-                "Space_1_Temp,Temperature,°C,Campaign 1 - Scope 1,,,,,\n"
-                "Space_1_Temp,Temperature,°C,Campaign 1 - Scope 1,,,,,\n"
-            ),
             # Unknown site
             (
                 "Name,Description,Unit,Campaign scope,Site,Building,Storey,Space,Zone\n"