4 files changed, 13 insertions, 9 deletions
diff --git a/app/constants/constants.py b/app/constants/constants.py
index f3ab71d..4bdc5dd 100644
--- a/app/constants/constants.py
+++ b/app/constants/constants.py
@@ -1,4 +1,4 @@
-from app.login.credentials import *
+from app.request.login.credentials import *
 
 # TODO: Organize this better
 
diff --git a/app/energy_service.py b/app/energy_service.py
index 475939f..2eb6867 100644
--- a/app/energy_service.py
+++ b/app/energy_service.py
@@ -1,6 +1,6 @@
 from fastapi import FastAPI
-from app.login.login import login
-from app.energy_request.energy_request import request
+from app.request.login.login_request import login
+from app.request.energy.energy_request import requestUsageData
 import os
 import json
 
@@ -13,7 +13,7 @@ def get():
         print('Debug file present')
         return getDebugResponse()
     sessionKeys = login()
-    return request(sessionKeys)
+    return requestUsageData(sessionKeys)
 
 def getDebugResponse():
     with open(debugFilePath) as file:
diff --git a/app/energy_request/energy_request.py b/app/request/energy/energy_request.py
index f6aac3f..5217b18 100644
--- a/app/energy_request/energy_request.py
+++ b/app/request/energy/energy_request.py
@@ -1,6 +1,6 @@
 import json
 import requests
-from ..constants.constants import usageRequestCookies, genericRequestHeaders, electricUsageRequestJson, waterUsageRequestJson, waterRequestEndpoint, electricRequestEndpoint
+from ...constants.constants import usageRequestCookies, genericRequestHeaders, electricUsageRequestJson, waterUsageRequestJson, waterRequestEndpoint, electricRequestEndpoint
 
 # Electric
 
@@ -56,8 +56,12 @@ def requestWater():
     
 def parseResponse(response):
     # such an icky response from an endpoint
-    # TODO: Remove unneeded JSON entries?
-    return json.loads(response.text.replace("\\\"", "\"").replace("\\\"", "\"").replace("\"{\"", "{\"").replace("}\"}", "}}"))['d']['objUsageGenerationResultSetTwo']
+    jsonResponse = json.loads(response.text.replace("\\\"", "\"").replace("\\\"", "\"").replace("\"{\"", "{\"").replace("}\"}", "}}"))['d']
+    # TODO: Remove useless data from response
+    return {
+        "usageData": jsonResponse['objUsageGenerationResultSetTwo'], # Raw usage data for each timeframe
+        "tentativeData": jsonResponse['getTentativeData'] # Accumulated usage data and predictions
+    }
 
 def setupRequestParameters(parameters):
     # Setup cookies and csrftoken to perform requests
@@ -69,7 +73,7 @@ def setupRequestParameters(parameters):
 
 # Service calling method
 
-def request(requestParameters):
+def requestUsageData(requestParameters):
     setupRequestParameters(requestParameters)
     return {
         "electric": requestElectric(),
diff --git a/app/login/login.py b/app/request/login/login_request.py
index 511be44..c74986e 100644
--- a/app/login/login.py
+++ b/app/request/login/login_request.py
@@ -1,6 +1,6 @@
 import requests
 import re
-from ..constants.constants import loginPageHeaders, loginRequestJson, genericRequestHeaders, loginPageUri, loginRequestEndpoint
+from ...constants.constants import loginPageHeaders, loginRequestJson, genericRequestHeaders, loginPageUri, loginRequestEndpoint
 
 def login():
     # Grab generated session keys from viewing the webpage