From 9d9fd9bd5c411f38bad21f55143b0b2b096633d4 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Wed, 23 Sep 2020 18:28:41 +0200 Subject: [PATCH] refactoring --- src/blueprints/Routes.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/blueprints/Routes.py b/src/blueprints/Routes.py index 5141120..da2271f 100644 --- a/src/blueprints/Routes.py +++ b/src/blueprints/Routes.py @@ -46,19 +46,20 @@ def construct_blueprint(settings): sensorParams = RequestValidator.validate_parameters(sensor, SensorParameters.get_values(), f'sensor "{sensor}"') - - sensorName = sensorParams[SensorParameters.NAME.value] - sensorType = sensorParams[SensorParameters.TYPE.value] - sensorValue = sensorParams[SensorParameters.VALUE.value] - - sensor = database.get_sensor(device[0], sensorName) - if sensor: - database.update_sensor(device, sensorName, sensorType, sensorValue) - else: - database.add_sensor(device, sensorName, sensorType, sensorValue) + __add_or_update_sensor(database, device, sensorParams) except ValidationError as e: return e.response, 400 return "" + def __add_or_update_sensor(database, device, sensorParams): + sensorName = sensorParams[SensorParameters.NAME.value] + sensorType = sensorParams[SensorParameters.TYPE.value] + sensorValue = sensorParams[SensorParameters.VALUE.value] + sensor = database.get_sensor(device[0], sensorName) + if sensor: + database.update_sensor(device, sensorName, sensorType, sensorValue) + else: + database.add_sensor(device, sensorName, sensorType, sensorValue) + return routes -- GitLab