Data service code cleanup and commented out data service tests for now

src/data_service.py

@@ -6,28 +6,11 @@
 
 Functions
 ---------
-handle_temperature_data(data, url, jwt, time_format)
-    Summarizing collected temperature data and forwarding result to cloud service.
-handle_load_data(data, url, jwt, time_format)
-    Summarizing load temperature data and forwarding result to cloud service.
-handle_fuel_data(data, limit, url, jwt, time_format)
-    Filtering collected temperature data and forwarding result to cloud service.
-parse_incoming_data(data, type)
-    Parsing all types of data that come from sources
+handle_protocol_data(protocol_data_entity, data, time_format)
+    Summarizing collected protocol data and forwarding result to cloud service.
 
 Constants
 ---------
-DATA_PATTERN
-    Request body data pattern.
-
-QOS
-    Quality of Service of MQTT broker.
-TEMP_ALARM_TOPIC: str
-    MQTT alarm topic for temperature alarms.
-LOAD_ALARM_TOPIC: str
-    MQTT alarm topic for load alarms.
-FUEL_ALARM_TOPIC: str
-    MQTT alarm topic for fuel alarms.
 EMPTY_PAYLOAD: dict
     Empty dictionary that is returned if there is some kind of error
     in data processing.
@@ -40,49 +23,9 @@
 errorLogger = logging.getLogger('customErrorLogger')
 customLogger = logging.getLogger('customConsoleLogger')
 
-DATA_PATTERN = "[ value={} , time={} , unit={} ]"
-
-QOS = 2
-TEMP_ALARM_TOPIC = "alarms/temperature"
-LOAD_ALARM_TOPIC = "alarms/load"
-FUEL_ALARM_TOPIC = "alarms/fuel"
-
 EMPTY_PAYLOAD = {}
 
 
-def parse_incoming_data(data, data_type):
-    """
-    Parsing all types of data that come from sources
-
-    Args:
-    ----
-        data: str
-            Data to be parsed
-        data_type: str
-            Data type (Temperature, Load, Fuel) for console output
-
-    Returns:
-    -------
-        data_sum: double
-            Parsed data value
-        unit: str
-            Unit of the parsed data
-    """
-    data_sum = 0.0
-    # summarizing collected data
-    try:
-        tokens = data.split(" ")
-        data_sum += float(tokens[1].split("=")[1])
-    except BaseException:
-        errorLogger.error("Invalid " + data_type + " data format! - " + data)
-    unit = "unknown"
-    try:
-        unit = data.split(" ")[6].split("=")[1]
-    except BaseException:
-        errorLogger.error("Invalid " + data_type + " data format! - " + data)
-    return data_sum, unit
-
-
 def handle_protocol_data(protocol_data_entity, data, time_format):
     """
     Processes protocol data and generates a summarized payload based on the aggregation method.
@@ -134,96 +77,3 @@ def handle_protocol_data(protocol_data_entity, data, time_format):
         case 'SUM': return {"dataId": protocol_data_entity.id, "value": data_sum, "time": time_value}
         case 'MIN': return {"dataId": protocol_data_entity.id, "value": min_value, "time": time_value}
         case 'MAX': return {"dataId": protocol_data_entity.id, "value": max_value, "time": time_value}
-
-
-def handle_temperature_data(data, time_format):
-    """
-    Summarizes collected temperature data and forms payload.
-
-    Triggered periodically.
-
-    Parameters
-    ----------
-    data: list
-        Collected temperature data.
-    time_format: str
-        Cloud services' time format.
-
-    Returns
-    -------
-    payload: dict
-    """
-    data_sum = 0.0
-    unit = "Unknown"
-    for info in data:
-        data_value, parsed_unit = parse_incoming_data(info, "temperature")
-        unit = parsed_unit
-        data_sum += data_value
-
-    time_value = time.strftime(time_format, time.localtime())
-    payload = {"value": round(data_sum / len(data), 2), "time": time_value, "unit": unit}
-    return payload
-
-
-def handle_load_data(data, time_format):
-    """
-    Summarizes collected load data and forms payload.
-
-    Triggered periodically  (variable interval).
-
-    Parameters
-    ----------
-    data: list
-        Collected load data.
-    time_format: str
-        Cloud services' time format.
-
-    Returns
-    -------
-    payload: dict
-    """
-    data_sum = 0.0
-    unit = "Unknown"
-    for info in data:
-        data_value, parsed_unit = parse_incoming_data(info, "load")
-        unit = parsed_unit
-        data_sum += data_value
-
-    time_value = time.strftime(time_format, time.localtime())
-    payload = {"value": round(data_sum, 2), "time": time_value, "unit": unit}
-    return payload
-
-
-def handle_fuel_data(data, limit, time_format, alarm_client):
-    """
-
-    Summarizes collected fuel, forms payload and sends alarm.
-
-    Triggered periodically.
-
-    Parameters
-    ----------
-    data: list
-     Collected load data.
-    limit: double
-     Critical fuel level.
-    time_format: str
-     Cloud services' time format.
-    alarm_client: MQTTClient
-     MQTT broker alarm client
-
-    Returns
-    -------
-    http status code
-    """
-    value, unit = parse_incoming_data(str(data), "fuel")
-    if value == 0.0:
-        return EMPTY_PAYLOAD
-    if value <= limit:
-        customLogger.info("Fuel is below the designated limit! Sounding the alarm")
-        alarm_client.publish(FUEL_ALARM_TOPIC, True, QOS)
-
-    time_value = time.strftime(time_format, time.localtime())
-
-    payload = {"value": round(value, 2), "time": time_value, "unit": unit}
-    return payload