Changeset bed4f06 in OpenWorkouts-current

Timestamp:

Jan 29, 2019, 12:16:50 PM (5 years ago)

Author:

borja <borja@…>

Branches:

current, feature/docs, master

Children:

6dc1846

Parents:

4bab6c1

Message:

(#7) Added method to gather monthly stats + view to export them

Location:

ow

Files:

• models/user.py (modified) (1 diff)
• tests/views/test_user.py (modified) (1 diff)
• views/user.py (modified) (3 diffs)

ow/models/user.py

@@ -234 +234 @@
                         timedelta())
         }
+
+    @property
+    def yearly_stats(self):
+        """
+        Return per-month stats for the last 12 months
+        """
+        # set the boundaries for looking for workouts afterwards,
+        # we need the current date as the "end date" and one year
+        # ago from that date. Then we set the start at the first
+        # day of that month.
+        end = datetime.now(timezone.utc)
+        start = (end - timedelta(days=365)).replace(day=1)
+
+        # build the stats, populating first the dict with empty values
+        # for each month.
+        stats = {}
+        for days in range((end - start).days):
+            day = (start + timedelta(days=days)).date()
+            if (day.year, day.month) not in stats.keys():
+                stats[(day.year, day.month)] = {
+                    'workouts': 0,
+                    'time': timedelta(0),
+                    'distance': Decimal(0),
+                    'elevation': Decimal(0),
+                    'sports': {}
+                }
+
+        # now loop over workouts, filtering and then adding stats to the
+        # proper place
+        for workout in self.workouts():
+            if start.date() <= workout.start.date() <= end.date():
+                # less typing, avoid long lines
+                month = stats[
+                    (workout.start.date().year, workout.start.date().month)]
+                month['workouts'] += 1
+                month['time'] += workout.duration or timedelta(seconds=0)
+                month['distance'] += workout.distance or Decimal(0)
+                month['elevation'] += workout.uphill or Decimal(0)
+                if workout.sport not in month['sports']:
+                    month['sports'][workout.sport] = {
+                        'workouts': 0,
+                        'time': timedelta(seconds=0),
+                        'distance': Decimal(0),
+                        'elevation': Decimal(0),
+                    }
+                month['sports'][workout.sport]['workouts'] += 1
+                month['sports'][workout.sport]['time'] += (
+                    workout.duration or timedelta(0))
+                month['sports'][workout.sport]['distance'] += (
+                    workout.distance or Decimal(0))
+                month['sports'][workout.sport]['elevation'] += (
+                    workout.uphill or Decimal(0))
+
+        return stats

ow/tests/views/test_user.py

@@ -268 +268 @@
         request = dummy_request
         response = user_views.profile(john, request)
-        assert response == {}
+        assert len(response.keys()) == 1
+        current_month = datetime.now(timezone.utc).strftime('%Y-%m')
+        assert response['current_month'] == current_month
 
     def test_login_get(self, dummy_request):

ow/views/user.py

@@ -1 +1 @@
 import json
 from calendar import month_name
-from datetime import datetime
+from datetime import datetime, timezone
 
 from pyramid.httpexceptions import HTTPFound
@@ -165 +165 @@
     basic info, stats, etc
     """
-    return {}
+    now = datetime.now(timezone.utc)
+    return {
+        'current_month': now.strftime('%Y-%m')
+    }
 
 
@@ -250 +253 @@
                     charset='utf-8',
                     body=json.dumps(json_stats))
+
+
+@view_config(
+    context=User,
+    permission='view',
+    name='yearly')
+def last_months_stats(context, request):
+    """
+    Return a json-encoded stream with statistics for the last 12 months
+    """
+    stats = context.yearly_stats
+    # this sets which month is 2 times in the stats, once this year, once
+    # the previous year. We will show it a bit different in the UI (showing
+    # the year too to prevent confusion)
+    repeated_month = datetime.now(timezone.utc).date().month
+    json_stats = []
+    for month in stats:
+        hms = timedelta_to_hms(stats[month]['time'])
+        name = month_name[month[1]][:3]
+        if month[1] == repeated_month:
+            name += ' ' + str(month[0])
+        month_stats = {
+            'id': str(month[0]) + '-' + str(month[1]).zfill(2),
+            'name': name,
+            'time': str(hms[0]).zfill(2),
+            'distance': int(round(stats[month]['distance'])),
+            'elevation': int(stats[month]['elevation']),
+            'workouts': stats[month]['workouts']
+        }
+        json_stats.append(month_stats)
+    return Response(content_type='application/json',
+                    charset='utf-8',
+                    body=json.dumps(json_stats))