Merge pull request #3 from Hanagotchi/HAN-5

Criterio envio paquetes

Author: feijooso

src/data_packet.py

@@ -10,19 +10,21 @@
 - Humidity and Watering should be between 0 and 100, since they are percentages.
 - Light has to be positive or 0.
 '''
+
+
 def create_packet(temperature: float = None, humidity: float = None, light: float = None, watering: float = None):
     if not (temperature and humidity and light and watering):
         return None
-    
+
     if humidity < 0 or humidity > 100:
         raise Exception(f"Humidity has to be between 0 and 100. Current value: {humidity}")
-    
+
     if watering < 0 or watering > 100:
         raise Exception(f"Watering has to be between 0 and 100. Current value: {watering}")
-    
+
     if light < 0:
         raise Exception(f"Light has to be positive or 0. Current value: {light}")
-    
+
     return {
         "temperature": temperature,
         "humidity": humidity,
@@ -39,15 +41,18 @@ def create_packet(temperature: float = None, humidity: float = None, light: floa
 - 
 -
 '''
+
+
 def generate_data():
-    #TODO
+    # TODO
     temperature = rnd.randint(-5, 30)
     humidity = rnd.randint(0, 100)
     light = rnd.randint(0, 400)
     watering = rnd.randint(0, 100)
 
     return temperature, humidity, light, watering
 
+
 '''
 Compares the current packet and the last sent packet, based in the deviations.
 
@@ -64,10 +69,20 @@ def generate_data():
 - last_sent: {temperature: float, humidity: float, light: float, watering: float}
 - deviations: {temperature: float, humidity: float, light: float, watering: float}
 '''
-def current_packet_differs_from_last_sent(current, last_sent, deviations):
-    #TODO
 
+
+def data_has_changed(current, last_sent, deviations):
     if not last_sent:
         return True
 
-    return True
+    if parameter_has_changed(current["temperature"], last_sent["temperature"], deviations["temperature"])\
+            or parameter_has_changed(current["humidity"], last_sent["humidity"], deviations["humidity"])\
+            or parameter_has_changed(current["light"], last_sent["light"], deviations["light"])\
+            or parameter_has_changed(current["watering"], last_sent["watering"], deviations["watering"]):
+        return True
+
+    return False
+
+
+def parameter_has_changed(current, last, deviation):
+    return abs(current - last) > deviation

src/main.py

@@ -12,36 +12,36 @@
 import time, random
 import logging
 
-from data_packet import generate_data, create_packet, current_packet_differs_from_last_sent
+from data_packet import generate_data, create_packet, data_has_changed
+
 
 def simulate_packets(config):
     last_sent_packet = None
     while True:
         try:
             temperature, humidity, light, watering = generate_data()
             current_packet = create_packet(temperature, humidity, light, watering)
-            
-            if not current_packet:
-                continue
 
-            if current_packet_differs_from_last_sent(current_packet, last_sent_packet, config["deviations"]):
-                # TODO: Send packet to the RabbitMQ queue
-                logging.info(f"Packet sent: {current_packet}")
-                
-                last_sent_packet = current_packet
+            if not current_packet or not data_has_changed(current_packet, last_sent_packet, config["deviations"]):
+                continue
 
+            # TODO: Send packet to the RabbitMQ queue
+            logging.info(f"Packet sent: {current_packet}")
+            last_sent_packet = current_packet
 
         except Exception as err:
             logging.warning(err)
         finally:
             time.sleep(config["packet_period"])
-        
+
 
 '''
 Reads the config file. At this moment, it is mocked.
 '''
+
+
 def read_config_file(path):
-    #TODO
+    # TODO
     return {
         "packet_period": 1,
         "device_id": str(random.getrandbits(128)),
@@ -50,8 +50,9 @@ def read_config_file(path):
             "humidity": 5,
             "light": 25,
             "watering": 5
+        }
     }
-}
+
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)