sustainability using actual user

Author: Ma-Golden

client/src/SustainabilityDashboard.js

@@ -10,6 +10,7 @@ import {
   Text,
 } from 'react-native';
 import { LineChart, PieChart } from 'react-native-chart-kit';
+import { retrieveData } from './caching';
 import susDashboardStyles from './components/styles/SustainabilityDashboard.styles';
 import fullBloom from './assets/SustainablityDashboard/Rootyfullbloom.png';
 import bushy from './assets/SustainablityDashboard/RootyBushy.png';
@@ -182,7 +183,7 @@ export default function Dashboard() {
   });
 
   // test name
-  const senderName = 'Cormac';
+  // const senderName = 'Cormac';
 
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
@@ -241,6 +242,14 @@ export default function Dashboard() {
 
   const getSustainabilityStats = async () => {
     try {
+      let senderName = await retrieveData('username');
+
+      console.log(senderName);
+
+      if (senderName == null) {
+        senderName = 'test_user'; // Default name if not found
+      }
+
       const baseUrl =
         Platform.OS === 'web'
           ? 'http://localhost:8000'
@@ -259,15 +268,17 @@ export default function Dashboard() {
         },
       );
 
+      console.log('Raw response: ', response);
+
       if (response.ok) {
         const serverMessage = await response.json();
         console.log('Response from Server: ', serverMessage.message);
 
         const {
-          emissionsSavings,
-          currentYearEmissions,
-          rawDistances,
-          friendsSusScores,
+          emissions_savings: emissionsSavings,
+          current_year_emissions: currentYearEmissions,
+          raw_distances: rawDistances,
+          friends_sus_scores: friendsSusScores,
         } = serverMessage;
 
         console.log('Emissions savings: ', emissionsSavings);

server/src/main.py

@@ -12,7 +12,7 @@
 from src.preferences import Preferences
 from src.networking import Networking
 from src.wayfinding import wayfinding_router_setup
-
+from src.sustainability import Sustainability
 
 class Server:
     def __init__(self):
@@ -30,6 +30,7 @@ def __init__(self):
         self.weather_api = weatherAPI()
         self.networking = Networking(self.app, self.logger)
         self.preferences_logic = Preferences(self.app, self.logger)
+        self.sustainability = Sustainability(self.app, self.logger)
         self.signup_logic = Signup(self.app, self.logger,
                                    self.preferences_logic)
 

server/src/sustainability.py

@@ -64,10 +64,7 @@ def db_fetch_month_sus_stats(self, user):
         db.connect_db()
 
         if db.search_user(table_name, user):
-            self.logger.info("Found user")
-            self.logger.info("connection closed, getting monthly distances")
             monthly_distances = db.return_user_row(table_name, user)
-            self.logger.info(f"monthly distances: {monthly_distances}")
             db.close_con()
             return self.calc_emissions_savings(monthly_distances)