sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

running tests

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-20 15:11:28 +02:00
parent ac7c114649
commit db0bf05ab2
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataroutines.py
View File

@@ -1588,6 +1588,7 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False,
for id, f in zip(ids, csvfilenames): for id, f in zip(ids, csvfilenames):
if os.path.isfile(f): if os.path.isfile(f):
df = pl.scan_parquet(f) df = pl.scan_parquet(f)
data.append(df)
else: else:
rowdata, row = getrowdata(id=id) rowdata, row = getrowdata(id=id)
try: try:
@@ -1599,7 +1600,7 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False,
bands=True, otwpower=True, barchart=True, bands=True, otwpower=True, barchart=True,
polars=True) polars=True)
df = pl.scan_parquet(f) df = pl.scan_parquet(f)
data.append(df) data.append(df)
data = pl.collect_all(data) data = pl.collect_all(data)

12
rowers/interactiveplots.py
View File

@@ -1694,12 +1694,14 @@ def interactive_flexchart_stacked(id, r, xparam='time',
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if ispromember(r.user): if ispromember(r.user):
rowdata = dataprep.getsmallrowdata_pl(columns, ids=[id], doclean=True, rowdata = dataprep.read_data(columns, ids=[id], doclean=True,
workstrokesonly=False, for_chart=True) workstrokesonly=False, for_chart=True)
else: else:
rowdata = dataprep.getsmallrowdata_pl(columns_basic, ids=[id], doclean=True, rowdata = dataprep.read_data(columns_basic, ids=[id], doclean=True,
workstrokesonly=False, for_chart=True) workstrokesonly=False, for_chart=True)
rowdata = dataprep.remove_nulls_pl(rowdata)
if r.usersmooth > 1: # pragma: no cover if r.usersmooth > 1: # pragma: no cover
for column in columns: for column in columns:
try: try:
@@ -1715,16 +1717,18 @@ def interactive_flexchart_stacked(id, r, xparam='time',
if len(rowdata) < 2: if len(rowdata) < 2:
if ispromember(r.user): if ispromember(r.user):
rowdata = dataprep.getsmallrowdata_pl(columns, ids=[id], rowdata = dataprep.read_data(columns, ids=[id],
doclean=False, doclean=False,
workstrokesonly=False, workstrokesonly=False,
for_chart=True) for_chart=True)
else: else:
rowdata = dataprep.getsmallrowdata_pl(columns_basic, ids=[id], rowdata = dataprep.read_data(columns_basic, ids=[id],
doclean=False, doclean=False,
workstrokesonly=False, workstrokesonly=False,
for_chart=True) for_chart=True)
rowdata = dataprep.remove_nulls_pl(rowdata)
if rowdata.is_empty(): if rowdata.is_empty():
return "", "No valid data" return "", "No valid data"

2
rowers/tests/mocks.py
View File

@@ -336,7 +336,7 @@ def mocked_getsmallrowdata_db(*args, **kwargs):
return df return df
def mocked_getsmallrowdata_pl(*args, **kwargs): def mocked_read_data(*args, **kwargs):
df = pl.read_csv('rowers/tests/testdata/colsfromdb.csv') df = pl.read_csv('rowers/tests/testdata/colsfromdb.csv')
return df return df

8
rowers/tests/test_unit_tests.py
View File

@@ -582,7 +582,7 @@ class DataPrepTests(TestCase):
age = dataprep.calculate_age(born,today=today) age = dataprep.calculate_age(born,today=today)
self.assertEqual(age,49) self.assertEqual(age,49)
@patch('rowers.dataprep.getsmallrowdata_pl',side_effect=mocked_getsmallrowdata_uh) @patch('rowers.dataprep.read_data',side_effect=mocked_getsmallrowdata_uh)
def test_goldmedalstandard(self,mocked_getsmallrowdata_uh): def test_goldmedalstandard(self,mocked_getsmallrowdata_uh):
maxvalue, delta = dataprep.calculate_goldmedalstandard(self.r,self.wuh_otw) maxvalue, delta = dataprep.calculate_goldmedalstandard(self.r,self.wuh_otw)
records = CalcAgePerformance.objects.filter( records = CalcAgePerformance.objects.filter(
@@ -703,7 +703,7 @@ class InteractivePlotTests(TestCase):
self.assertFalse(len(div)==0) self.assertFalse(len(div)==0)
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_pl', side_effect=mocked_getsmallrowdata_pl) @patch('rowers.dataprep.read_data', side_effect=mocked_read_data)
def test_interactive_chart(self, mocked_sqlalchemy, def test_interactive_chart(self, mocked_sqlalchemy,
mocked_getsmallrowdata_db): mocked_getsmallrowdata_db):
workout = Workout.objects.filter(user=self.r,workouttype__in=mytypes.rowtypes)[0] workout = Workout.objects.filter(user=self.r,workouttype__in=mytypes.rowtypes)[0]
@@ -735,9 +735,9 @@ class InteractivePlotTests(TestCase):
self.assertFalse(len(div)==0) self.assertFalse(len(div)==0)
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_pl', side_effect=mocked_getsmallrowdata_pl) @patch('rowers.dataprep.read_data', side_effect=mocked_read_data)
def test_interactive_flexchart_stacked(self, mocked_sqlalchemy, def test_interactive_flexchart_stacked(self, mocked_sqlalchemy,
mocked_getsmallrowdata_pl): mocked_read_data):
workout = Workout.objects.filter(user=self.r,workouttype__in=mytypes.rowtypes)[0] workout = Workout.objects.filter(user=self.r,workouttype__in=mytypes.rowtypes)[0]
id = workout.id id = workout.id

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.