added watering and fixes

Author: feijooso

app/resources/parser.py

@@ -30,30 +30,37 @@ def check_t_rule(register, night_value, day_value):
 }
 
 LIGHT_RULES_MAP = {
-    1: (is_in_range, (200, 350)),
+    1: (is_in_range, (350, 500)),
     2: (is_in_range, (200, 350)),
     3: (is_in_range, (75, 200)),
     4: (is_in_range, (25, 75)),
 }
 
+WATERING_RULES_MAP = {
+    1: (is_in_range, (70, 100)),
+    2: (is_in_range, (40, 70)),
+    3: (is_in_range, (10, 40)),
+}
+
 
 def parse_values(string):
     values = string.split('-')
     return [int(value) for value in values]
 
 
-# asumimos register: nombre_planta, humedad, luz, temperatura
 def apply_rules(register, plant_name):
     plant_data = df[df['Botanical_Name'] == plant_name]
     h_value = plant_data['H'].values[0]
     l_value = plant_data['L'].values[0]
     t_value = plant_data['T'].values[0]
+    w_value = plant_data['W'].values[0]
 
     parameters = []
 
     t_values = parse_values(t_value)
     h_values = parse_values(h_value)
     l_values = parse_values(l_value)
+    w_values = parse_values(w_value)
 
     is_temperature_deviated = all(
         not apply_temperature_rule(t_value, register.temperature)
@@ -62,6 +69,13 @@ def apply_rules(register, plant_name):
     if is_temperature_deviated:
         parameters.append('temperature')
 
+    is_watering_deviated = all(
+        not apply_watering_rule(w_value, register.watering)
+        for w_value in w_values
+    )
+    if is_watering_deviated:
+        parameters.append('watering')
+
     is_light_deviated = all(
         not apply_light_rule(l_value, register.light)
         for l_value in l_values
@@ -84,6 +98,11 @@ def apply_temperature_rule(rule, register):
     return rule_function(register, *rule_values)
 
 
+def apply_watering_rule(rule, register):
+    rule_function, rule_values = WATERING_RULES_MAP.get(rule, None)
+    return rule_function(register, *rule_values)
+
+
 def apply_light_rule(rule, register):
     rule_function, rule_values = LIGHT_RULES_MAP.get(rule, None)
     return rule_function(register, *rule_values)

app/service/rabbitmq/consumer.py

@@ -54,7 +54,6 @@ def check_package(self, measurement_from_rabbit):
 
     def send_notification(self, id_user, message):
         logger.info(f"[ ID_USER: {id_user} ]")
-        logger.info("TO DO - For Step #2 & Step #4 from Ticket HAN-14")
 
     def apply_rules(self, measurement):
         # TODO: FIND PLANT TYPE NAME GIVEN PLANT TYPE
@@ -63,8 +62,6 @@ def apply_rules(self, measurement):
             raise DeviatedParametersError(deviated_parameters)
 
     def save_measurement(self, measurement_from_rabbit, device_plant):
-        logger.info("TO DO - Step #5 from Ticket HAN-14")
-
         measurement_from_db = Measurement(
             id_plant=device_plant.id_plant,
             plant_type=device_plant.plant_type,
@@ -119,8 +116,6 @@ def __callback(self, body):
             logger.warn(LoggerMessages.DEVIATING_PARAMETERS)
             logger.debug(LoggerMessages.ERROR_DETAILS.format(err, body))
 
-            # TO DO - Ticket HAN-17 & Step #4 from Ticket HAN-14
-            # parameters = err.parameters  # List of deviating parameters.
             self.send_notification(device_plant.id_user, err)
 
         if device_plant is not None and measurement is not None: