[ENH] Add duration in Charge table

psa_car_controller/psacc/application/charging.py

@@ -20,10 +20,10 @@ class Charging:
 
     @staticmethod
     def get_chargings() -> List[dict]:
-        conn = Database.get_db()
-        res = conn.execute("select * from battery ORDER BY start_at").fetchall()
-        conn.close()
-        return list(map(dict, res))
+        charge_db = Database.get_all_charge()
+        charge_list = list(map(dict, charge_db))
+        Charging._calculated_fields(charge_list)
+        return charge_list
 
     @staticmethod
     def get_battery_curve(conn, charge, car) -> List[BatteryChargeCurve]:
@@ -97,3 +97,15 @@ def record_charging(car: Car, charging_status, charge_date: datetime, level, lat
                 Charging.update_chargings(conn, last_charge, car)
         conn.commit()
         conn.close()
+
+    @staticmethod
+    def _calculated_fields(charge_list: list):
+        for c in charge_list:
+            if c.get("stop_at") and c.get("start_at"):
+                c.update(
+                    {
+                        "duration_min": (c.get("stop_at") - c.get("start_at")).total_seconds()
+                        / 60,
+                        "duration_str": str((c.get("stop_at") - c.get("start_at"))),
+                    }
+                )

psa_car_controller/psacc/repository/db.py

@@ -321,6 +321,13 @@ def get_all_charge_without_price(conn) -> List[Charge]:
             charges.append(Charge(**dict_key_to_lower_case(**row)))
         return charges
 
+    @staticmethod
+    def get_all_charge() -> List[Charge]:
+        conn = Database.get_db()
+        res = conn.execute("select * from battery ORDER BY start_at").fetchall()
+        conn.close()      
+        return res
+
     @staticmethod
     def update_charge(charge: Charge):
         # we don't need to update mileage, since it should be inserted at beginning of charge,

psa_car_controller/web/figures.py

@@ -139,6 +139,9 @@ def get_figures(car: Car):
         sort_by=[{'column_id': 'start_at_str', 'direction': 'desc'}],
         columns=[{'id': 'start_at_str', 'name': 'start at', 'type': 'datetime'},
                  {'id': 'stop_at_str', 'name': 'stop at', 'type': 'datetime'},
+                 {'id': 'duration_str', 'name': 'duration', 'type': 'text'},
+                 {'id': 'duration_min', 'name': 'duration (min)', 'type': 'numeric',
+                  'format': deepcopy(nb_format).symbol_suffix(" min").precision(0)},
                  {'id': 'start_level', 'name': 'start level', 'type': 'numeric'},
                  {'id': 'end_level', 'name': 'end level', 'type': 'numeric'},
                  {'id': 'co2', 'name': 'CO2', 'type': 'numeric',
@@ -147,7 +150,7 @@ def get_figures(car: Car):
                   'format': deepcopy(nb_format).symbol_suffix(" kWh").precision(2)},
                  {'id': 'price', 'name': 'price', 'type': 'numeric',
                   'format': deepcopy(nb_format).symbol_suffix(" " + CURRENCY).precision(2), 'editable': True},
-                 {'id': 'charging_mode', 'name': 'charging mode', 'type': 'string'},
+                 {'id': 'charging_mode', 'name': 'charging mode', 'type': 'text'},
                  {'id': 'mileage', 'name': 'mileage', 'type': 'numeric', 'format': nb_format},
                  ],
         data=[],

tests/test_unit.py

@@ -33,7 +33,7 @@
 from psa_car_controller.psacc.utils.utils import get_temp
 from tests.data.car_status import FUEL_CAR_STATUS, ELECTRIC_CAR_STATUS, ELECTRIC_CAR_STATUS_V2
 from tests.utils import DATA_DIR, record_position, latitude, longitude, date0, date1, date2, date3, record_charging, \
-    vehicule_list, get_new_test_db, get_date, date4, compare_dict
+    vehicule_list, get_new_test_db, get_date, date4, compare_dict, duration_min, duration_str
 from psa_car_controller.web.figures import get_figures, get_battery_curve_fig, get_altitude_fig
 
 dummy_value = 0
@@ -237,6 +237,8 @@ def test_record_position_charging(self):
         assert isinstance(co2, float)
         assert compare_dict(chargings, [{'start_at': date0,
                                          'stop_at': date3,
+                                         'duration_str': duration_str,
+                                         'duration_min' :duration_min,
                                          'VIN': 'VR3UHZKX',
                                          'start_level': 40,
                                          'end_level': 85,

tests/utils.py

@@ -21,6 +21,8 @@
 date1 = date3 - timedelta(minutes=40)
 date0 = date3 - timedelta(minutes=60)
 date4 = date3 + timedelta(minutes=1)
+duration_min = (date3 - date0).seconds / 60
+duration_str = str(date3 - date0)
 
 vehicule_list = Cars()
 vehicule_list.extend(