Skip to content

daily log data: fix units #3379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 5 commits into from
May 21, 2026
Merged

daily log data: fix units #3379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cf2b20
fix units
LKuemmel May 21, 2026
cba138a
fix
LKuemmel May 21, 2026
bdf7269
flake8
LKuemmel May 21, 2026
0417b69
fix
LKuemmel May 21, 2026
585a944
floating point
LKuemmel May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/helpermodules/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

from helpermodules.broker import BrokerClient
from helpermodules.data_migration.data_migration import MigrateData
from helpermodules.measurement_logging.process_log import get_daily_log, get_monthly_log, get_yearly_log
from helpermodules.measurement_logging.process_log import (convert_legacy_units, get_daily_log, get_monthly_log,
get_yearly_log)
from helpermodules.messaging import MessageType, pub_user_message
from helpermodules.mosquitto_dynsec.mosquitto_dynsec import (generate_password_reset_token, get_user_email,
send_password_reset_to_server, verify_password_reset_token)
Expand Down Expand Up @@ -822,15 +823,15 @@ def getChargeLog(self, connection_id: str, payload: dict) -> None:

def getDailyLog(self, connection_id: str, payload: dict) -> None:
Pub().pub(f'openWB/set/log/daily/{payload["data"]["date"]}',
get_daily_log(payload["data"]["date"]))
convert_legacy_units(get_daily_log(payload["data"]["date"])))

def getMonthlyLog(self, connection_id: str, payload: dict) -> None:
Pub().pub(f'openWB/set/log/monthly/{payload["data"]["date"]}',
get_monthly_log(payload["data"]["date"]))
convert_legacy_units(get_monthly_log(payload["data"]["date"])))

def getYearlyLog(self, connection_id: str, payload: dict) -> None:
Pub().pub(f'openWB/set/log/yearly/{payload["data"]["date"]}',
get_yearly_log(payload["data"]["date"]))
convert_legacy_units(get_yearly_log(payload["data"]["date"])))
Comment on lines 824 to +834
Comment on lines 824 to +834
Comment on lines 828 to +834
Comment on lines 824 to +834

def initCloud(self, connection_id: str, payload: dict) -> None:
parent_file = Path(__file__).resolve().parents[2]
Expand Down
23 changes: 23 additions & 0 deletions packages/helpermodules/command_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from control.chargepoint.chargepoint_state_update import ChargepointStateUpdate
import dataclass_utils
from helpermodules.command import Command
from helpermodules.measurement_logging import process_log
from helpermodules.subdata import SubData
from modules.chargepoints.external_openwb.config import OpenWBSeries
from modules.chargepoints.internal_openwb.config import (InternalOpenWB, InternalOpenWBConfiguration,
Expand All @@ -14,6 +15,9 @@
from modules.chargepoints.internal_openwb.chargepoint_module import ChargepointModule as ChargepointModuleInternal


pytest_plugins = ["helpermodules.measurement_logging.process_log_testdata", "helpermodules.command_test_data"]


@pytest.fixture
def subdata_fixture() -> None:
SubData(*([Mock()]*16))
Expand Down Expand Up @@ -51,3 +55,22 @@ def test_check_max_num_of_internal_chargepoints(additional_cp_mode, config, expe

# evaluation
assert msg == expected_msg


def test_getDailyLog(regular_daily_log_entry,
regular_daily_log_entry_processed_legacy_converted,
mock_pub,
monkeypatch):
Comment on lines +60 to +63
# setup
c = Command(Mock())
mock_pub.reset_mock()
collect_daily_log_data_mock = Mock(return_value=regular_daily_log_entry)
monkeypatch.setattr(process_log, "_collect_daily_log_data", collect_daily_log_data_mock)

# execution
c.getDailyLog("test", {"data": {"date": "20250616"}})

# evaluation
assert len(mock_pub.method_calls) == 1
assert mock_pub.method_calls[0][1][0] == 'openWB/set/log/daily/20250616'
assert mock_pub.method_calls[0][1][1] == regular_daily_log_entry_processed_legacy_converted
157 changes: 157 additions & 0 deletions packages/helpermodules/command_test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
import pytest


@pytest.fixture()
def regular_daily_log_entry_processed_legacy_converted():
return {'entries': [{'bat': {'all': {'energy_exported': 0,
'energy_imported': 0,
'exported': 3195.13,
'fault_state': 0,
'imported': 629.37,
'power_average': 0,
'power_exported': 0,
'power_imported': 0,
'soc': 48},
'bat2': {'energy_exported': 0,
'energy_imported': 0,
'exported': 3195.13,
'fault_state': 0,
'imported': 629.37,
'power_average': 0,
'power_exported': 0,
'power_imported': 0,
'soc': 48}},
'counter': {'counter0': {'energy_exported': 0.772,
'energy_imported': 0,
'exported': 26029.945,
'fault_state': 0,
'grid': True,
'imported': 2728.572,
'power_average': -9.3,
'power_exported': 9.3,
'power_imported': 0}},
'cp': {'all': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0,
'exported': 0,
'fault_state': 0,
'imported': 12639.11,
'power_average': 0,
'power_exported': 0,
'power_imported': 0},
'cp3': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0,
'exported': 0,
'fault_state': 0,
'imported': 12639.11,
'power_average': 0,
'power_exported': 0,
'power_imported': 0},
'cp4': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0,
'exported': 0,
'fault_state': 0,
'imported': 0,
'power_average': 0,
'power_exported': 0,
'power_imported': 0},
'cp5': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0,
'exported': 0,
'fault_state': 0,
'imported': 0,
'power_average': 0,
'power_exported': 0,
'power_imported': 0}},
'date': '14:25',
'energy_source': {'bat': 0.0, 'cp': 0.0, 'grid': 0.0, 'pv': 1.0},
'ev': {'ev0': {'soc': None}},
'hc': {'all': {'energy_exported': 0,
'energy_imported': 0.037,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0.037,
'fault_state': 0,
'imported': 2324.001611140539,
'power_average': 0.448,
'power_exported': 0,
'power_imported': 0.448}},
'prices': {'bat': 0.0002, 'grid': 0.0003, 'pv': 0.00015},
'pv': {'all': {'energy_exported': 0.809,
'energy_imported': 0,
'exported': 35827,
'fault_state': 0,
'power_average': -9.74,
'power_exported': 9.74,
'power_imported': 0},
'pv1': {'energy_exported': 0.809,
'energy_imported': 0,
'exported': 35827,
'fault_state': 0,
'power_average': -9.74,
'power_exported': 9.74,
'power_imported': 0}},
'sh': {},
'timestamp': 1750767902}],
'message': '',
'names': {'bat2': 'MQTT-Speicher',
'counter0': 'MQTT-Zähler',
'counter2': 'Test-Zähler',
'cp3': 'MQTT-Ladepunkt',
'cp4': 'MQTT-Ladepunkt',
'cp5': 'MQTT-Ladepunkt',
'ev0': 'Standard-Fahrzeug',
'pv1': 'MQTT-Wechselrichter'},
'totals': {'bat': {'all': {'energy_exported': 0, 'energy_imported': 0},
'bat2': {'energy_exported': 0, 'energy_imported': 0}},
'counter': {'counter0': {'energy_exported': 772.41,
'energy_imported': 0,
'grid': True}},
'cp': {'all': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0},
'cp3': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0},
'cp4': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0},
'cp5': {'energy_exported': 0,
'energy_imported': 0,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 0}},
'hc': {'all': {'energy_imported': 37.177,
'energy_imported_bat': 0,
'energy_imported_cp': 0,
'energy_imported_grid': 0,
'energy_imported_pv': 37.177}},
'pv': {'all': {'energy_exported': 809},
'pv1': {'energy_exported': 809}},
'sh': {}}}
Loading
Loading