Fixed epic conflicts

consumer_api/views/sync_view.py

@@ -1,4 +1,5 @@
 import json
+import time
 from flask import request, current_app, jsonify
 from flask_classful import FlaskView
 from db import redis_client
@@ -10,22 +11,25 @@ class SyncView(FlaskView):
         remote_uuid = request.json['uuid']
         remote_ip = request.remote_addr
 
-        # load the currently available consumer list from the redis database
-        consumer_list = json.loads((redis_client.get("consumer_list") or b"{}").decode('utf-8'))
+        cust_key = f"consumer_{remote_uuid}"
 
-        if remote_uuid not in consumer_list.keys():
-            # display newly registered consumer
+        last_known_info = json.loads((redis_client.get(cust_key) or b"{}").decode('utf-8'))
+
+        if not last_known_info:
             current_app.logger.info(f"New consumer registered (unknown UUID): {remote_uuid} at {remote_ip}")
+
         else:
-            if consumer_list[remote_uuid]['ip'] != remote_ip:
-                # log address changes
+            if last_known_info['ip'] != remote_ip:
                 current_app.logger.info(f"Address of consumer {remote_uuid} changed to {remote_ip}")
 
-        # update consumer list redis databasse
-        consumer_list.update(
-            {remote_uuid: {"ip": remote_ip}}
-        )
-        redis_client.set("consumer_list", json.dumps(consumer_list).encode('utf-8'))
+        info = {
+            "uuid": remote_uuid,
+            "ip": remote_ip,
+            "last_seen": time.time()
+        }
+
+        redis_client.set(cust_key, json.dumps(info).encode('utf-8'))
+        redis_client.expire(cust_key, current_app.config["CUSTOMER_TIMEOUT"])
 
         # return with the current UUID
         response = {