From cbef135d861af6d6bff87f43dd1bd76ea19bfc3a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Apr 2024 12:05:39 +0200 Subject: [PATCH] passing tests on workouts --- rowers/dataroutines.py | 2 +- rowers/tests/test_aworkouts.py | 66 +++++++++++++++++----------------- rowers/views/workoutviews.py | 10 ++---- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py index 8fe36699..467fc5ce 100644 --- a/rowers/dataroutines.py +++ b/rowers/dataroutines.py @@ -1943,7 +1943,7 @@ def datafusion(id1, id2, columns, offset): df1[' latitude'] = latitude df1[' longitude'] = longitude - df2 = getsmallrowdata_db(['time'] + columns, ids=[id2], doclean=False) + df2 = getsmallrowdata_pd(['time'] + columns, ids=[id2], doclean=False) forceunit = 'N' diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py index 5bb15c68..79c139b1 100644 --- a/rowers/tests/test_aworkouts.py +++ b/rowers/tests/test_aworkouts.py @@ -62,10 +62,10 @@ class ListWorkoutTest(TestCase): pass @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.dataprep.myqueue') def test_list_workouts(self, mocked_sqlalchemy, - mocked_getsmallrowdata_db, + mocked_read_data, mocked_myqueue): login = self.c.login(username=self.u.username, password=self.password) @@ -87,10 +87,10 @@ class ListWorkoutTest(TestCase): self.assertEqual(response.status_code,200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.dataprep.myqueue') def test_bulk_workouts(self, mocked_sqlalchemy, - mocked_getsmallrowdata_db, + mocked_read_data, mocked_myqueue): login = self.c.login(username=self.u.username, password=self.password) @@ -234,9 +234,9 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.middleware.myqueue') - def test_forcecurve(self, mocked_sqlalchemy, mocked_getsmallrowdata_db, + def test_forcecurve(self, mocked_sqlalchemy, mocked_read_data, mocked_myqueue): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -255,9 +255,9 @@ class WorkoutViewTest(TestCase): self.assertEqual(response.status_code,200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.middleware.myqueue') - def test_resample(self, mocked_sqlalchemy, mocked_getsmallrowdata_db, + def test_resample(self, mocked_sqlalchemy, mocked_read_data, mocked_myqueue): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -283,9 +283,9 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @pytest.mark.django_db(transaction=True) - def test_joins(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): + def test_joins(self, mocked_sqlalchemy, mocked_read_data): with transaction.atomic(): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -350,10 +350,10 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.weather.requests.get', side_effect=mocked_requests) def test_waterworkout_view(self, - mocked_sqlalchemy, mocked_getsmallrowdata_db, mocked_requests): + mocked_sqlalchemy, mocked_read_data, mocked_requests): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -406,8 +406,8 @@ class WorkoutViewTest(TestCase): self.assertEqual(response.status_code,200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') - def test_smoothen(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): + @patch('rowers.dataprep.read_data') + def test_smoothen(self, mocked_sqlalchemy, mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -447,8 +447,8 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') - def test_commentview(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): + @patch('rowers.dataprep.read_data') + def test_commentview(self, mocked_sqlalchemy, mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -473,8 +473,8 @@ class WorkoutViewTest(TestCase): self.assertEqual(response.status_code,200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') - def test_mapview(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): + @patch('rowers.dataprep.read_data') + def test_mapview(self, mocked_sqlalchemy, mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -485,9 +485,9 @@ class WorkoutViewTest(TestCase): self.assertEqual(response.status_code,200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') def notworking_test_workout_image(self, mocked_sqlalchemy, - mocked_getsmallrowdata_db): + mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -513,10 +513,10 @@ class WorkoutViewTest(TestCase): status_code=302,target_status_code=200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.dataprep.getrowdata_db',side_effect=mocked_getrowdata_db) @pytest.mark.django_db(transaction=True) - def test_workout_split(self, mocked_sqlalchemy, mocked_getsmallrowdata_db, + def test_workout_split(self, mocked_sqlalchemy, mocked_read_data, mocked_getrowdata_db): with transaction.atomic(): login = self.c.login(username=self.u.username, password=self.password) @@ -541,9 +541,9 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.getrowdata_db',side_effect=mocked_getrowdata_db) - @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_forfusion) + @patch('rowers.dataprep.read_data',side_effect=mocked_getsmallrowdata_forfusion) def test_workout_fusion(self, mocked_sqlalchemy, mocked_getrowdata_db, - mocked_getsmallrowdata_db): + mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -572,9 +572,9 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.dataprep.get_video_data',side_effect=mocked_videodata) - def test_workout_video_view(self, mocked_sqlalchemy, mocked_getsmallrowdata_db, + def test_workout_video_view(self, mocked_sqlalchemy, mocked_read_data, mocked_videodata): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -634,9 +634,9 @@ class WorkoutViewTest(TestCase): self.assertRedirects(response,expected_url=expected_url,status_code=302,target_status_code=200) @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') + @patch('rowers.dataprep.read_data') @patch('rowers.dataprep.get_video_data',side_effect=mocked_videodata) - def test_workout_video_view_erg(self, mocked_sqlalchemy, mocked_getsmallrowdata_db, + def test_workout_video_view_erg(self, mocked_sqlalchemy, mocked_read_data, mocked_videodata): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -698,7 +698,7 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.getrowdata_db',side_effect=mocked_getrowdata_db) @patch('rowers.dataprep.get_video_data',side_effect=mocked_videodata) - def test_video_selectworkout(self, mocked_sqlalchemy, mocked_getsmallrowdata_db, + def test_video_selectworkout(self, mocked_sqlalchemy, mocked_read_data, mocked_videodata): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -729,8 +729,8 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') - def test_editsummaryview(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): + @patch('rowers.dataprep.read_data') + def test_editsummaryview(self, mocked_sqlalchemy, mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) @@ -795,8 +795,8 @@ class WorkoutViewTest(TestCase): @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.getsmallrowdata_db') - def test_workout_delete(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): + @patch('rowers.dataprep.read_data') + def test_workout_delete(self, mocked_sqlalchemy, mocked_read_data): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index c64c1bac..6734e606 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -2177,10 +2177,6 @@ def workouts_view(request, message='', successmessage='', for w in workoutsnohr: # pragma: no cover _ = dataprep.workout_trimp(w) - # ids = [w.id for w in workouts] - # df = dataprep.getsmallrowdata_db(['time','power'],ids=ids) - # polarization = dataprep.polarization_index(df,r) - if query: # pragma: no cover query_list = query.split() workouts = workouts.filter( @@ -3196,7 +3192,7 @@ def workout_erase_column_view(request, id=0, column=''): return HttpResponseRedirect(url) try: - data = dataprep.getsmallrowdata_db([column], ids=[w.id]) + data = dataprep.read_data([column], ids=[w.id]) except: # pragma: no cover messages.error(request, 'Invalid column') url = reverse('workout_data_view', kwargs={ @@ -4326,7 +4322,7 @@ def workout_edit_view(request, id=0, message="", successmessage=""): row = get_workoutuser(id, request) if request.user.rower.rowerplan == 'basic' and 'speedcoach2' in row.workoutsource: # pragma: no cover - data = getsmallrowdata_db(['wash'], ids=[encoder.decode_hex(id)]) + data = read_data(['wash'], ids=[encoder.decode_hex(id)]) try: if data['wash'].std() != 0: url = reverse('paidplans_view') @@ -4339,7 +4335,7 @@ def workout_edit_view(request, id=0, message="", successmessage=""): pass if request.user.rower.rowerplan == 'basic' and 'nklinklogbook' in row.workoutsource: # pragma: no cover - data = getsmallrowdata_db(['wash'], ids=[encoder.decode_hex(id)]) + data = read_data(['wash'], ids=[encoder.decode_hex(id)]) try: if data['wash'].std() != 0: url = reverse('paidplans_view')