Changeset 2f8a48f in OpenWorkouts-current for ow/tests

Timestamp:

Jan 25, 2019, 12:38:55 AM (5 years ago)

Author:

borja <borja@…>

Branches:

current, feature/docs, master

Children:

421f05f

Parents:

6d1b54b

Message:

(#7) Added several methods to the User model to gather some stats (yearly,

monthly, weekly).

Added two new utilities:

• timedelta_to_hms (so we can print timedelta objects properly in template code)

• get_week_days (returns a list of datetime objects for the days in the same week as a given day)

Added a template_helpers module, containing code that affects template
rendering.

Added timedelta_to_hms as a global to the default template rendering context

Refactored some code in the Workout model so it uses timedelta_to_hms instead
of running the same code twice.

Location:

ow/tests

Files:

• models/test_user.py (modified) (2 diffs)
• test_utilities.py (modified) (3 diffs)

ow/tests/models/test_user.py

@@ +1 @@
+from decimal import Decimal
 from datetime import datetime, timedelta, timezone
 
@@ -118 +119 @@
                    11: {'cycling': 1, 'running': 1}}
         }
+
+    def test_stats(self, root):
+        expected_no_stats = {
+            'workouts': 0,
+            'time': timedelta(seconds=0),
+            'distance': Decimal(0),
+            'elevation': Decimal(0),
+            'sports': {}
+        }
+        # no stats
+        assert root['john'].stats() == expected_no_stats
+        # add a cycling workout
+        workout = Workout(
+            start=datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=(60*4)),
+            distance=115,
+            sport='cycling')
+        root['john'].add_workout(workout)
+        # asking for a different year, future
+        assert root['john'].stats(2019) == expected_no_stats
+        # asking for a different year, past
+        assert root['john'].stats(2016) == expected_no_stats
+        # asking fot the year the workout is in
+        assert root['john'].stats(2018) == {
+            'workouts': 1,
+            'time': timedelta(minutes=(60*4)),
+            'distance': Decimal(115),
+            'elevation': Decimal(0),
+            'sports': {
+                'cycling': {
+                    'workouts': 1,
+                    'time': timedelta(minutes=(60*4)),
+                    'distance': Decimal(115),
+                    'elevation': Decimal(0),
+                }
+            }
+        }
+        # add a second cycling workout
+        workout = Workout(
+            start=datetime(2018, 11, 26, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=(60*3)),
+            distance=100,
+            sport='cycling')
+        root['john'].add_workout(workout)
+        assert root['john'].stats(2018) == {
+            'workouts': 2,
+            'time': timedelta(minutes=(60*7)),
+            'distance': Decimal(215),
+            'elevation': Decimal(0),
+            'sports': {
+                'cycling': {
+                    'workouts': 2,
+                    'time': timedelta(minutes=(60*7)),
+                    'distance': Decimal(215),
+                    'elevation': Decimal(0),
+                }
+            }
+        }
+        # add a running workout
+        workout = Workout(
+            start=datetime(2018, 11, 26, 16, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=(60)),
+            distance=10,
+            sport='running')
+        root['john'].add_workout(workout)
+        assert root['john'].stats(2018) == {
+            'workouts': 3,
+            'time': timedelta(minutes=(60*8)),
+            'distance': Decimal(225),
+            'elevation': Decimal(0),
+            'sports': {
+                'cycling': {
+                    'workouts': 2,
+                    'time': timedelta(minutes=(60*7)),
+                    'distance': Decimal(215),
+                    'elevation': Decimal(0),
+                },
+                'running': {
+                    'workouts': 1,
+                    'time': timedelta(minutes=(60)),
+                    'distance': Decimal(10),
+                    'elevation': Decimal(0),
+                }
+            }
+        }
+        # ensure the stats for future/past years did not change after
+        # adding those workouts
+        assert root['john'].stats(2019) == expected_no_stats
+        assert root['john'].stats(2016) == expected_no_stats
+
+    def test_get_week_stats(self, root):
+        expected_no_stats_per_day = {
+            'workouts': 0,
+            'time': timedelta(0),
+            'distance': Decimal(0),
+            'elevation': Decimal(0),
+            'sports': {}
+        }
+
+        expected_no_stats = {}
+        for i in range(19, 26):
+            day = datetime(2018, 11, i, 10, 00, tzinfo=timezone.utc)
+            expected_no_stats[day] = expected_no_stats_per_day
+
+        day = datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc)
+        assert root['john'].get_week_stats(day) == expected_no_stats
+
+        # add a cycling workout
+        workout = Workout(
+            start=datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=(60*4)),
+            distance=115,
+            sport='cycling')
+        root['john'].add_workout(workout)
+
+        # check a week in the future
+        day = datetime(2019, 11, 25, 10, 00, tzinfo=timezone.utc)
+        week_stats = root['john'].get_week_stats(day)
+        for day in week_stats:
+            assert week_stats[day] == expected_no_stats_per_day
+
+        # check a week in the past
+        day = datetime(2017, 11, 25, 10, 00, tzinfo=timezone.utc)
+        week_stats = root['john'].get_week_stats(day)
+        for day in week_stats:
+            assert week_stats[day] == expected_no_stats_per_day
+
+        # Check the week where the workout is
+        day = datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc)
+        week_stats = root['john'].get_week_stats(day)
+        for day in week_stats:
+            if day.day == 25:
+                # this is the day where we have a workout
+                assert week_stats[day] == {
+                    'workouts': 1,
+                    'time': timedelta(minutes=(60*4)),
+                    'distance': Decimal(115),
+                    'elevation': Decimal(0),
+                    'sports': {
+                        'cycling': {
+                            'workouts': 1,
+                            'time': timedelta(minutes=(60*4)),
+                            'distance': Decimal(115),
+                            'elevation': Decimal(0)
+                        }
+                    }
+                }
+            else:
+                # day without workout
+                assert week_stats[day] == expected_no_stats_per_day
+
+        # add a second cycling workout
+        workout = Workout(
+            start=datetime(2018, 11, 23, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=(60*3)),
+            distance=100,
+            sport='cycling')
+        root['john'].add_workout(workout)
+        day = datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc)
+        week_stats = root['john'].get_week_stats(day)
+        for day in week_stats:
+            if day.day == 25:
+                # this is the day where we have a workout
+                assert week_stats[day] == {
+                    'workouts': 1,
+                    'time': timedelta(minutes=(60*4)),
+                    'distance': Decimal(115),
+                    'elevation': Decimal(0),
+                    'sports': {
+                        'cycling': {
+                            'workouts': 1,
+                            'time': timedelta(minutes=(60*4)),
+                            'distance': Decimal(115),
+                            'elevation': Decimal(0)
+                        }
+                    }
+                }
+            elif day.day == 23:
+                # this is the day where we have a workout
+                assert week_stats[day] == {
+                    'workouts': 1,
+                    'time': timedelta(minutes=(60*3)),
+                    'distance': Decimal(100),
+                    'elevation': Decimal(0),
+                    'sports': {
+                        'cycling': {
+                            'workouts': 1,
+                            'time': timedelta(minutes=(60*3)),
+                            'distance': Decimal(100),
+                            'elevation': Decimal(0)
+                        }
+                    }
+                }
+            else:
+                # day without workout
+                assert week_stats[day] == expected_no_stats_per_day
+
+    def test_week_stats(self, root):
+        expected_no_stats_per_day = {
+            'workouts': 0,
+            'time': timedelta(0),
+            'distance': Decimal(0),
+            'elevation': Decimal(0),
+            'sports': {}
+        }
+
+        # no workouts for the current week (this tests is for coverage
+        # purposes mostly, as the main logic is tested in test_get_week_stats)
+        day = datetime.now(timezone.utc)
+        week_stats = root['john'].get_week_stats(day)
+        for day in week_stats:
+            assert week_stats[day] == expected_no_stats_per_day
+
+    def test_week_totals(self, root):
+        # no data, empty totals
+        assert root['john'].week_totals == {
+            'distance': Decimal(0),
+            'time': timedelta(0)
+        }

ow/tests/test_utilities.py

@@ -1 +1 @@
 import os
-from datetime import timedelta
+from datetime import timedelta, datetime
 from unittest.mock import patch
 from pyexpat import ExpatError
@@ -22 +22 @@
     mps_to_kmph,
     kmph_to_mps,
-    save_map_screenshot
+    save_map_screenshot,
+    timedelta_to_hms,
+    get_week_days
 )
 
@@ -144 +146 @@
         assert not os.makedirs.called
         subprocess.run.assert_called_once
+
+    def test_timedelta_to_hms(self):
+        value = timedelta(seconds=0)
+        assert timedelta_to_hms(value) == (0, 0, 0)
+        value = timedelta(seconds=3600)
+        assert timedelta_to_hms(value) == (1, 0, 0)
+        value = timedelta(seconds=3900)
+        assert timedelta_to_hms(value) == (1, 5, 0)
+        value = timedelta(seconds=3940)
+        assert timedelta_to_hms(value) == (1, 5, 40)
+        value = timedelta(seconds=4)
+        assert timedelta_to_hms(value) == (0, 0, 4)
+        value = timedelta(seconds=150)
+        assert timedelta_to_hms(value) == (0, 2, 30)
+        # try now something that is not a timedelta
+        with pytest.raises(AttributeError):
+            timedelta_to_hms('not a timedelta')
+
+    def test_week_days(self):
+        # get days from a monday, week starting on monday
+        days = get_week_days(datetime(2019, 1, 21))
+        assert len(days) == 7
+        matches = [
+            [days[0], datetime(2019, 1, 21)],
+            [days[1], datetime(2019, 1, 22)],
+            [days[2], datetime(2019, 1, 23)],
+            [days[3], datetime(2019, 1, 24)],
+            [days[4], datetime(2019, 1, 25)],
+            [days[5], datetime(2019, 1, 26)],
+            [days[6], datetime(2019, 1, 27)]
+        ]
+        for m in matches:
+            assert m[0] == m[1]
+        # get days from a wednesday, week starting on monday
+        days = get_week_days(datetime(2019, 1, 23))
+        assert len(days) == 7
+        matches = [
+            [days[0], datetime(2019, 1, 21)],
+            [days[1], datetime(2019, 1, 22)],
+            [days[2], datetime(2019, 1, 23)],
+            [days[3], datetime(2019, 1, 24)],
+            [days[4], datetime(2019, 1, 25)],
+            [days[5], datetime(2019, 1, 26)],
+            [days[6], datetime(2019, 1, 27)]
+        ]
+        for m in matches:
+            assert m[0] == m[1]
+        # get days from a monday, but week starting on sunday now
+        days = get_week_days(datetime(2019, 1, 21), start_day=0)
+        assert len(days) == 7
+        matches = [
+            [days[0], datetime(2019, 1, 20)],
+            [days[1], datetime(2019, 1, 21)],
+            [days[2], datetime(2019, 1, 22)],
+            [days[3], datetime(2019, 1, 23)],
+            [days[4], datetime(2019, 1, 24)],
+            [days[5], datetime(2019, 1, 25)],
+            [days[6], datetime(2019, 1, 26)]
+        ]
+        for m in matches:
+            assert m[0] == m[1]