clean

MyElectricalData · Oct 5, 2021 · ed442df · ed442df
1 parent 1fa570c
commit ed442df
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/app/addresses.py b/app/addresses.py
@@ -1,12 +1,14 @@
 import requests
 import json
 from dateutil.relativedelta import *
+import base64
+from pprint import pprint
 
 from importlib import import_module
 main = import_module("main")
 f = import_module("function")
 
-def getAddresses(client):
+def getAddresses(client, cur):
     pdl = main.pdl
     url = main.url
     headers = main.headers
@@ -15,7 +17,22 @@ def getAddresses(client):
         "type": "addresses",
         "usage_point_id": str(pdl),
     }
-    addresses = requests.request("POST", url=f"{url}", headers=headers, data=json.dumps(data)).json()
+
+    query = f"SELECT * FROM addresses WHERE pdl = '{pdl}'"
+    cur.execute(query)
+    query_result = cur.fetchone()
+    if query_result is None:
+        addresses = requests.request("POST", url=f"{url}", headers=headers, data=json.dumps(data)).json()
+        addresses_b64 = str(addresses)
+        addresses_b64 = addresses_b64.encode('ascii')
+        addresses_b64 = base64.b64encode(addresses_b64)
+        cur.execute(f"INSERT OR REPLACE INTO addresses VALUES ('{pdl}','{addresses_b64}')")
+    else:
+        addresses = json.loads(query_result[1])
+
+    pprint(addresses)
+    quit()
+
     if not "customer" in addresses:
         f.publish(client, f"{pdl}/consumption/current_year/error", str(1))
         for key, value in addresses.items():

diff --git a/app/daily.py b/app/daily.py
@@ -26,7 +26,8 @@ def getDaily(cur, client, mode="consumption", last_activation_date=datetime.now(
 
     lastYears = datetime.now() + relativedelta(years=-1)
     dateBegin = lastYears.strftime('%Y-%m-%d')
-    dateEnded = datetime.now() + relativedelta(days=-1)
+    # dateEnded = datetime.now() + relativedelta(days=-1)
+    dateEnded = datetime.now()
     dateEnded = dateEnded.strftime('%Y-%m-%d')
 
     data = dailyBeetwen(cur, pdl, mode, dateBegin, dateEnded, last_activation_date)

diff --git a/app/main.py b/app/main.py
@@ -138,6 +138,16 @@
 
 def init_database(cur):
     f.log("Initialise database")
+    # ADDRESSES
+    cur.execute('''CREATE TABLE addresses
+                   (pdl TEXT, json TEXT)''')
+    cur.execute('''CREATE UNIQUE INDEX idx_pdl_addresses
+                    ON addresses (pdl)''')
+    # CONTRACT
+    cur.execute('''CREATE TABLE contracts
+                   (pdl TEXT, json TEXT)''')
+    cur.execute('''CREATE UNIQUE INDEX idx_pdl_contracts
+                    ON contracts (pdl)''')
     # CONSUMPTION
     cur.execute('''CREATE TABLE consumption_daily
                    (pdl TEXT, date TEXT, value REAL, fail INTEGER)''')
@@ -177,8 +187,12 @@ def run():
 
             # Check database structure
             try:
+                cur.execute("INSERT OR REPLACE INTO addresses VALUES ('0','0')")
+                cur.execute("INSERT OR REPLACE INTO contracts VALUES ('0','0')")
                 cur.execute("INSERT OR REPLACE INTO consumption_daily VALUES ('0','1970-01-01','0','0')")
                 cur.execute("INSERT OR REPLACE INTO production_daily VALUES ('0','1970-01-01','0','0')")
+                cur.execute("DELETE FROM addresses WHERE pdl = 0")
+                cur.execute("DELETE FROM contracts WHERE pdl = 0")
                 cur.execute("DELETE FROM consumption_daily WHERE pdl = 0")
                 cur.execute("DELETE FROM production_daily WHERE pdl = 0")
             except:
@@ -211,7 +225,7 @@ def run():
             if addresses == True:
                 f.log("####################################################################################")
                 f.log("Get Addresses :")
-                addr.getAddresses(client)
+                addr.getAddresses(client, cur)
 
             if get_consumption == True:
                 f.log("####################################################################################")