Changeset 778d53d in OpenWorkouts-current for ow/tests

Timestamp:

Mar 5, 2019, 11:45:32 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current

Children:

aa6dcaf

Parents:

35953eb

Message:

(#7) Show per-sport stats in the profile page:

• Show a dropdown list of sports for which the user has activities. By default we choose the sport with most activities.

• Show a dropdown list of years for which the user has activities. By default we show stats for the current year. If the user picks up a different year, we show the totals (distance, time, elevation, number of workouts) for that year.

• Show the totals of all time for the chosen sport

Location:

ow/tests

Files:

• models/test_user.py (modified) (2 diffs)
• views/test_user.py (modified) (5 diffs)

ow/tests/models/test_user.py

@@ -81 +81 @@
         assert list(root['john'].workout_ids()) == ['1', '2', '3']
         assert root['john'].num_workouts == len(workouts)
+
+    def test_favorite_sport(self, root):
+        assert root['john'].favorite_sport is None
+        # add a cycling workout
+        workout = Workout(
+            sport='cycling',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=120),
+            distance=66,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].favorite_sport == 'cycling'
+        # add a running workout, both sports have same amount of workouts,
+        # favorite is picked up reversed alphabetically
+        workout = Workout(
+            sport='running',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=45),
+            distance=5,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].favorite_sport == 'running'
+        # add another cycling workout, now that is the favorite sport
+        workout = Workout(
+            sport='cycling',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=60),
+            distance=30,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].favorite_sport == 'cycling'
+
+    def test_activity_sports(self, root):
+        assert root['john'].activity_sports == []
+        workout = Workout(
+            sport='cycling',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=120),
+            distance=66,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].activity_sports == ['cycling']
+        workout = Workout(
+            sport='running',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=45),
+            distance=5,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].activity_sports == ['cycling', 'running']
+
+    def test_activity_years(self, root):
+        assert root['john'].activity_years == []
+        workout = Workout(
+            sport='cycling',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=120),
+            distance=66,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].activity_years == [datetime.now(timezone.utc).year]
+        workout = Workout(
+            sport='running',
+            start=datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=45),
+            distance=5,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].activity_years == [
+            datetime.now(timezone.utc).year,
+            2018
+        ]
+
+    def test_activity_months(self, root):
+        # we have to pass a year parameter
+        with pytest.raises(TypeError):
+            root['john'].activity_months()
+        now = datetime.now(timezone.utc)
+        assert root['john'].activity_months(now.year) == []
+        workout = Workout(
+            sport='cycling',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=120),
+            distance=66,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].activity_months(now.year) == [now.month]
+        assert root['john'].activity_months(now.year-1) == []
+        assert root['john'].activity_months(now.year+1) == []
+        workout = Workout(
+            sport='running',
+            start=datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=45),
+            distance=5,
+        )
+        root['john'].add_workout(workout)
+        assert root['john'].activity_months(now.year) == [now.month]
+        assert root['john'].activity_months(2018) == [11]
+        assert root['john'].activity_months(now.year+1) == []
 
     def test_activity_dates_tree(self, root):
@@ -552 +651 @@
             else:
                 assert stats == expected_no_stats_per_week
+
+    def test_sport_totals(self, root):
+        # user has no workouts, so no totals
+        assert root['john'].sport_totals() == {
+            'workouts': 0,
+            'time': timedelta(0),
+            'distance': Decimal(0),
+            'elevation': Decimal(0),
+        }
+        # add a cycling workout happening now
+        workout = Workout(
+            sport='cycling',
+            start=datetime.now(timezone.utc),
+            duration=timedelta(minutes=120),
+            distance=66,
+        )
+        root['john'].add_workout(workout)
+        # only one workout, one sport, so the default will show totals
+        # for that sport
+        assert root['john'].sport_totals() == {
+            'workouts': 1,
+            'time': timedelta(minutes=120),
+            'distance': Decimal(66),
+            'elevation': Decimal(0),
+        }
+        # Add a running workout
+        workout = Workout(
+            sport='running',
+            start=datetime(2018, 11, 25, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=45),
+            distance=5,
+        )
+        root['john'].add_workout(workout)
+        # the favorite sport is running now
+        assert root['john'].sport_totals() == {
+            'workouts': 1,
+            'time': timedelta(minutes=45),
+            'distance': Decimal(5),
+            'elevation': Decimal(0),
+        }
+        # but we can get the totals for cycling too
+        assert root['john'].sport_totals('cycling') == {
+            'workouts': 1,
+            'time': timedelta(minutes=120),
+            'distance': Decimal(66),
+            'elevation': Decimal(0),
+        }
+        # adding a new cycling workout, in a different year
+        workout = Workout(
+            sport='cycling',
+            start=datetime(2017, 11, 25, 10, 00, tzinfo=timezone.utc),
+            duration=timedelta(minutes=60),
+            distance=32,
+        )
+        root['john'].add_workout(workout)
+        # now cycling is the favorite sport
+        assert root['john'].sport_totals() == {
+            'workouts': 2,
+            'time': timedelta(minutes=180),
+            'distance': Decimal(98),
+            'elevation': Decimal(0),
+        }
+        # but we can get running stats too
+        assert root['john'].sport_totals('running') == {
+            'workouts': 1,
+            'time': timedelta(minutes=45),
+            'distance': Decimal(5),
+            'elevation': Decimal(0),
+        }
+        # there are no running activities for 2016
+        assert root['john'].sport_totals('running', 2016) == {
+            'workouts': 0,
+            'time': timedelta(0),
+            'distance': Decimal(0),
+            'elevation': Decimal(0),
+        }
+        # and not activities for cycling in 2016 neither
+        assert root['john'].sport_totals('cycling', 2016) == {
+            'workouts': 0,
+            'time': timedelta(0),
+            'distance': Decimal(0),
+            'elevation': Decimal(0),
+        }
+        # and we can get the separate totals for cycling in different years
+        year = datetime.now(timezone.utc).year
+        assert root['john'].sport_totals('cycling', year) == {
+            'workouts': 1,
+            'time': timedelta(minutes=120),
+            'distance': Decimal(66),
+            'elevation': Decimal(0),
+        }
+        assert root['john'].sport_totals('cycling', 2017) == {
+            'workouts': 1,
+            'time': timedelta(minutes=60),
+            'distance': Decimal(32),
+            'elevation': Decimal(0),
+        }

ow/tests/views/test_user.py

@@ -46 +46 @@
             start=datetime(2015, 6, 28, 12, 55, tzinfo=timezone.utc),
             duration=timedelta(minutes=60),
-            distance=30
+            distance=30,
+            sport='cycling'
         )
         john.add_workout(workout)
@@ -413 +414 @@
         # profile page for the current day (no workouts avalable)
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 6
+        assert len(response.keys()) == 7
         current_month = datetime.now(timezone.utc).strftime('%Y-%m')
         assert response['user'] == john
@@ -425 +426 @@
             'elevation': Decimal(0)
         }
+        assert response['profile_stats'] == {
+            'sports': ['cycling'],
+            'years': [2015],
+            'current_year': datetime.now(timezone.utc).year,
+            'current_sport': 'cycling'
+        }
         # profile page for a previous date, that has workouts
         request.GET['year'] = 2015
         request.GET['month'] = 6
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 6
+        assert len(response.keys()) == 7
         assert response['user'] == john
         assert response['user_gender'] == 'Robot'
@@ -446 +453 @@
         request.GET['week'] = 25
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 6
+        assert len(response.keys()) == 7
         assert response['user'] == john
         assert response['user_gender'] == 'Robot'
@@ -462 +469 @@
         request.GET['week'] = 26
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 6
+        assert len(response.keys()) == 7
         assert response['user'] == john
         assert response['user_gender'] == 'Robot'