From 55f34b5c08950e3de28caa1fede63f1196b8b6a7 Mon Sep 17 00:00:00 2001
From: Nico Melone <nico.a.melone@gmail.com>
Date: Thu, 8 Sep 2022 17:48:56 -0500
Subject: [PATCH] added better reset and totalizer handling

---
 Pub_Sub/.DS_Store                             | Bin 18436 -> 18436 bytes
 Pub_Sub/advvfdipp/.DS_Store                   | Bin 10244 -> 10244 bytes
 .../thingsboard/v1/pub/sendData.py            |  70 +++++++------
 .../thingsboard/v1/sub/receiveCommand.py      |  96 ++++++++++++++++++
 4 files changed, 134 insertions(+), 32 deletions(-)
 create mode 100644 Pub_Sub/flowmeterskid/thingsboard/v1/sub/receiveCommand.py

diff --git a/Pub_Sub/.DS_Store b/Pub_Sub/.DS_Store
index c55e5a602c01ce1d167931759421ba0f42416cf8..a0f418eba2da1bb65f034241a8e462def7e912a6 100644
GIT binary patch
delta 53
scmZpfz}PZ@af7%HBje<c+H#xCbgnTnGEAPYC%0K!?+q^&QM;R*0Nf!Fl>h($

delta 49
qcmZpfz}PZ@af7%HBg5p6+H#xCbgnT@X4IA6tgZKk7embMCMN)!p%7I7

diff --git a/Pub_Sub/advvfdipp/.DS_Store b/Pub_Sub/advvfdipp/.DS_Store
index 2bcd6e7fc7539b30c4c878ebe1170313bb4c80f8..ad58ee11c373a1c8900eb2012076dce126f11b06 100644
GIT binary patch
delta 18
ZcmZn(XbIR5F3iX{`JklK<|5%qA^<(q1}Xpm

delta 16
XcmZn(XbIR5E<CwWSY~sv@I(;+HXQ}z

diff --git a/Pub_Sub/flowmeterskid/thingsboard/v1/pub/sendData.py b/Pub_Sub/flowmeterskid/thingsboard/v1/pub/sendData.py
index 1b51308..ad7fcec 100644
--- a/Pub_Sub/flowmeterskid/thingsboard/v1/pub/sendData.py
+++ b/Pub_Sub/flowmeterskid/thingsboard/v1/pub/sendData.py
@@ -118,34 +118,36 @@ def checkParameterConfig(cfg):
 
 payload = {}
 
-try:
-    with open("/var/user/files/totalizers.json", "r") as t:
-        totalizers = json.load(t)
-    if not totalizers:
-        logger.info("-----INITIALIZING TOTALIZERS-----")
+def get_totalizers():
+    try:
+        with open("/var/user/files/totalizers.json", "r") as t:
+            totalizers = json.load(t)
+        if not totalizers:
+            logger.info("-----INITIALIZING TOTALIZERS-----")
+            totalizers = {
+                "day": 0,
+                "week": 0,
+                "month": 0,
+                "year": 0,
+                "lifetime": 0,
+                "dayHolding": 0,
+                "weekHolding": 0,
+                "monthHolding": 0,
+                "yearHolding": 0
+            }
+    except:
         totalizers = {
-            "day": 0,
-            "week": 0,
-            "month": 0,
-            "year": 0,
-            "lifetime": 0,
-            "dayHolding": 0,
-            "weekHolding": 0,
-            "monthHolding": 0,
-            "yearHolding": 0
-        }
-except:
-    totalizers = {
-            "day": 0,
-            "week": 0,
-            "month": 0,
-            "year": 0,
-            "lifetime": 0,
-            "dayHolding": 0,
-            "weekHolding": 0,
-            "monthHolding": 0,
-            "yearHolding": 0
-        }
+                "day": 0,
+                "week": 0,
+                "month": 0,
+                "year": 0,
+                "lifetime": 0,
+                "dayHolding": 0,
+                "weekHolding": 0,
+                "monthHolding": 0,
+                "yearHolding": 0
+            }
+    return totalizers
 
 
 
@@ -188,7 +190,7 @@ def sendData(message,wizard_api):
         resetPayload["ts"] = 1 + (round(dt.timestamp(dt.now())/600)*600)*1000
         publish(__topic__, json.dumps(resetPayload), __qos__) 
 
-def saveTotalizers():
+def saveTotalizers(totalizers):
     try:
         with open("/var/user/files/totalizers.json", "w") as t:
             json.dump(totalizers,t)
@@ -220,45 +222,49 @@ def getGPS():
     return (f"{lat_dec:.8f}",f"{lon_dec:.8f}",f"{speedMPH:.2f}")
 
 def totalizeDay(lifetime):
+    totalizers = get_totalizers()
     now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
     reset = False
     value = lifetime - totalizers["dayHolding"]
     if not int(now.strftime("%d")) == int(totalizers["day"]):
         totalizers["dayHolding"] = lifetime
         totalizers["day"] = int(now.strftime("%d"))
-        saveTotalizers()
+        saveTotalizers(totalizers)
         reset = True
     return (value,reset)
 
 def totalizeWeek(lifetime):
+    totalizers = get_totalizers()
     now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
     reset = False
     value = lifetime - totalizers["weekHolding"]
     if not now.strftime("%U") == totalizers["week"] and now.strftime("%a") == "Sun":
         totalizers["weekHolding"] = lifetime
         totalizers["week"] = now.strftime("%U")
-        saveTotalizers()
+        saveTotalizers(totalizers)
         reset = True
     return (value, reset)
 
 def totalizeMonth(lifetime):
+    totalizers = get_totalizers()
     now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
     reset = False
     value = lifetime - totalizers["monthHolding"]
     if not int(now.strftime("%m")) == int(totalizers["month"]):
         totalizers["monthHolding"] = lifetime
         totalizers["month"] = now.strftime("%m")
-        saveTotalizers()
+        saveTotalizers(totalizers)
         reset = True
     return (value,reset)
 
 def totalizeYear(lifetime):
+    totalizers = get_totalizers()
     now = dt.fromtimestamp(round(dt.timestamp(dt.now())/600)*600)
     reset = False
     value = lifetime - totalizers["yearHolding"]
     if not int(now.strftime("%Y")) == int(totalizers["year"]):
         totalizers["yearHolding"] = lifetime
         totalizers["year"] = now.strftime("%Y")
-        saveTotalizers()
+        saveTotalizers(totalizers)
         reset = True
     return (value, reset)
\ No newline at end of file
diff --git a/Pub_Sub/flowmeterskid/thingsboard/v1/sub/receiveCommand.py b/Pub_Sub/flowmeterskid/thingsboard/v1/sub/receiveCommand.py
new file mode 100644
index 0000000..c8a3376
--- /dev/null
+++ b/Pub_Sub/flowmeterskid/thingsboard/v1/sub/receiveCommand.py
@@ -0,0 +1,96 @@
+import json
+from datetime import datetime as dt
+from common.Logger import logger
+from quickfaas.measure import write
+from quickfaas.remotebus import publish
+
+
+def get_totalizers():
+    try:
+        with open("/var/user/files/totalizers.json", "r") as t:
+            totalizers = json.load(t)
+        if not totalizers:
+            logger.info("-----INITIALIZING TOTALIZERS-----")
+            totalizers = {
+                "day": 0,
+                "week": 0,
+                "month": 0,
+                "year": 0,
+                "lifetime": 0,
+                "dayHolding": 0,
+                "weekHolding": 0,
+                "monthHolding": 0,
+                "yearHolding": 0
+            }
+    except:
+        totalizers = {
+                "day": 0,
+                "week": 0,
+                "month": 0,
+                "year": 0,
+                "lifetime": 0,
+                "dayHolding": 0,
+                "weekHolding": 0,
+                "monthHolding": 0,
+                "yearHolding": 0
+            }
+    return totalizers
+
+def saveTotalizers(totalizers):
+    try:
+        with open("/var/user/files/totalizers.json", "w") as t:
+            json.dump(totalizers,t)
+    except Exception as e:
+        logger.error(e)
+
+def resetTotalizers():
+    try:
+        totalizers = get_totalizers()
+        
+        totalizers["dayHolding"] = 0
+        totalizers["weekHolding"] = 0
+        totalizers["MonthHolding"] = 0
+        totalizers["yearHolding"] = 0
+        saveTotalizers(totalizers)    
+        return True
+    except Exception as e:
+        logger.error(e)
+        return e
+
+def receiveCommand(topic, payload):
+    logger.debug(topic)
+    logger.debug(json.loads(payload))
+    p = json.loads(payload)
+    command = p["method"]
+    if command == "resetTotalizers":
+        r = resetTotalizers()
+    
+    if r == True:
+        message = [{"name": "flowmeter", "measures":[{"name":"reset_totalizers", "value": 1}]}]
+        try:
+            resp = write(message)
+        except Exception as e:
+            logger.error("Failed to write message")
+            logger.error(e)
+        payload = {
+            "ts": (round(dt.timestamp(dt.now())/600)*600)*1000,
+            "values": {
+                "day_volume": 0,
+                "yesterday_volume": 0,
+                "week_volume": 0,
+                "last_week_volume": 0,
+                "month_volume": 0,
+                "last_month_volume": 0,
+                "year_volume": 0,
+                "last_year_volume": 0
+            }
+        }
+        publish("v1/devices/me/telemetry",json.dumps(payload))
+    ack(topic.split("/")[-1], r)
+
+def ack(msgid, r):
+    #logger.debug(msgid)
+    #logger.debug(mac)
+    #logger.debug(name)
+    #logger.debug(value)
+    publish("v1/devices/me/rpc/response/" + str(msgid), json.dumps({"msg": {"time": (round(dt.timestamp(dt.now())/600)*600)*1000, "response": r}, "metadata": "", "msgType": ""}))
\ No newline at end of file