tests should now pass

rowers/dataprep.py

@@ -1691,12 +1691,14 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True,
         row = Workout.objects.get(id=id)
 
 
+
     if not data.empty and data['efficiency'].mean() == 0 and data['power'].mean() != 0 and checkefficiency == True:
         data = add_efficiency(id=id)
 
     if doclean:
         data = clean_df_stats(data, ignorehr=True)
 
+
     return data, row
 
 # Fetch a subset of the data from the DB
@@ -2047,19 +2049,6 @@ def read_df_sql(id):
 
     df = df.fillna(value=0)
 
-    funit = Workout.objects.get(id=id).forceunit
-
-    if funit == 'lbs':
-        try:
-            df['peakforce'] = df['peakforce'] * lbstoN
-        except KeyError:
-            pass
-
-        try:
-            df['averageforce'] = df['averageforce'] * lbstoN
-        except KeyError:
-            pass
-
     return df
 
 def read_df_sql_old(id):

rowers/tests/test_units.py

@@ -70,6 +70,17 @@ class ForceUnits(TestCase):
         average_N = int(df['averageforce'].mean())
         self.assertEqual(average_N,399)
 
+        data = dataprep.read_df_sql(1)
+        average_N = int(data['averageforce'].mean())
+        self.assertEqual(average_N,399)
+
+        df,row = dataprep.getrowdata_db(id=1)
+        average_N = int(df['averageforce'].mean())
+        self.assertEqual(average_N,398)
+
+        df = dataprep.clean_df_stats(datadf,ignoreadvanced=False)
+        average_N = int(df['averageforce'].mean())
+        self.assertEqual(average_N,399)
 
     def test_upload_speedcoach_N(self):
         login = self.c.login(username=self.u.username, password=self.password)