From fd069541b7778da7bb51cba5cc26f441c0976ef9 Mon Sep 17 00:00:00 2001 From: BigTava Date: Fri, 27 Dec 2024 09:20:42 +0000 Subject: [PATCH 1/2] RESEARCH-315: small fixes in cds parsing --- .../community_datasheet/community_datasheet_parser.py | 1 + gsy_framework/community_datasheet/row_converters.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gsy_framework/community_datasheet/community_datasheet_parser.py b/gsy_framework/community_datasheet/community_datasheet_parser.py index 5f2ac3de..aad100f3 100644 --- a/gsy_framework/community_datasheet/community_datasheet_parser.py +++ b/gsy_framework/community_datasheet/community_datasheet_parser.py @@ -22,6 +22,7 @@ "PV": "power_profile", "SmartMeter": "smart_meter_profile", "ScmStorage": "prosumption_kWh_profile", + "ScmHeatPump": "consumption_kWh_profile", } diff --git a/gsy_framework/community_datasheet/row_converters.py b/gsy_framework/community_datasheet/row_converters.py index 8bf1def2..64c9d48f 100644 --- a/gsy_framework/community_datasheet/row_converters.py +++ b/gsy_framework/community_datasheet/row_converters.py @@ -42,6 +42,8 @@ "Enable grid export fee": "enable_grid_export_fee_const", "Enable taxes surcharges": "enable_taxes_surcharges", "Enable marketplace monthly fee": "enable_marketplace_monthly_fee", + "Enable electricity tax": "enable_electricity_tax", + "Enable fixed monthly fee": "enable_fixed_monthly_fee", "Enable assistance monthly fee": "enable_assistance_monthly_fee", "Enable service monthly fee": "enable_service_monthly_fee", "Enable contracted power monthly fee": "enable_contracted_power_monthly_fee", @@ -185,7 +187,7 @@ def create_member_dict( geo_tag_location = AssetCoordinatesBuilder().get_member_coordinates( {"address": address, "zip_code": zip_code} ) - print("electricity_tax", electricity_tax) + return { "email": email, "uuid": member_uuid, From 75fc376637080301a469059484f08f6c990ecdea Mon Sep 17 00:00:00 2001 From: BigTava Date: Fri, 27 Dec 2024 09:23:45 +0000 Subject: [PATCH 2/2] RESEARCH-315: fix test --- .../test_community_datasheet/test_community_datasheet_parser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_community_datasheet/test_community_datasheet_parser.py b/tests/test_community_datasheet/test_community_datasheet_parser.py index 0d9593dc..81056d21 100644 --- a/tests/test_community_datasheet/test_community_datasheet_parser.py +++ b/tests/test_community_datasheet/test_community_datasheet_parser.py @@ -537,6 +537,8 @@ def test_parse(_uuid_mock, asset_coordinates_builder_cls_mock): "enable_grid_export_fee_const": False, "enable_grid_import_fee_const": False, "enable_marketplace_monthly_fee": False, + "enable_electricity_tax": False, + "enable_fixed_monthly_fee": False, "enable_service_monthly_fee": False, "enable_taxes_surcharges": False, }