From 9101ba50cd6a2be749e38ac8653e85f8fdd3c932 Mon Sep 17 00:00:00 2001
From: Sam <sam@samr1.net>
Date: Mon, 23 Sep 2019 14:43:56 +0200
Subject: [PATCH] fix user statistics - #41

---
 .../fittrackee_api/tests/test_users_api.py    | 60 +++++++++++++++++++
 fittrackee_api/fittrackee_api/users/models.py | 11 +++-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/fittrackee_api/fittrackee_api/tests/test_users_api.py b/fittrackee_api/fittrackee_api/tests/test_users_api.py
index 34ffb4f1..5dc1c141 100644
--- a/fittrackee_api/fittrackee_api/tests/test_users_api.py
+++ b/fittrackee_api/fittrackee_api/tests/test_users_api.py
@@ -193,6 +193,66 @@ def test_users_list(app, user_1, user_2, user_3):
     assert data['data']['users'][2]['total_duration'] == '0:00:00'
 
 
+def test_users_list_with_activities(
+    app,
+    user_1,
+    user_2,
+    user_3,
+    sport_1_cycling,
+    activity_cycling_user_1,
+    sport_2_running,
+    activity_running_user_1,
+    activity_cycling_user_2,
+):
+
+    client = app.test_client()
+    resp_login = client.post(
+        '/api/auth/login',
+        data=json.dumps(dict(email='test@test.com', password='12345678')),
+        content_type='application/json',
+    )
+    response = client.get(
+        '/api/users',
+        headers=dict(
+            Authorization='Bearer '
+            + json.loads(resp_login.data.decode())['auth_token']
+        ),
+    )
+    data = json.loads(response.data.decode())
+
+    assert response.status_code == 200
+    assert 'success' in data['status']
+
+    assert len(data['data']['users']) == 3
+    assert 'created_at' in data['data']['users'][0]
+    assert 'created_at' in data['data']['users'][1]
+    assert 'created_at' in data['data']['users'][2]
+    assert 'test' in data['data']['users'][0]['username']
+    assert 'toto' in data['data']['users'][1]['username']
+    assert 'sam' in data['data']['users'][2]['username']
+    assert 'test@test.com' in data['data']['users'][0]['email']
+    assert 'toto@toto.com' in data['data']['users'][1]['email']
+    assert 'sam@test.com' in data['data']['users'][2]['email']
+    assert data['data']['users'][0]['timezone'] is None
+    assert data['data']['users'][0]['weekm'] is False
+    assert data['data']['users'][0]['nb_activities'] == 2
+    assert data['data']['users'][0]['nb_sports'] == 2
+    assert data['data']['users'][0]['total_distance'] == 22.0
+    assert data['data']['users'][0]['total_duration'] == '1:57:04'
+    assert data['data']['users'][1]['timezone'] is None
+    assert data['data']['users'][1]['weekm'] is False
+    assert data['data']['users'][1]['nb_activities'] == 1
+    assert data['data']['users'][1]['nb_sports'] == 1
+    assert data['data']['users'][1]['total_distance'] == 15
+    assert data['data']['users'][1]['total_duration'] == '1:00:00'
+    assert data['data']['users'][2]['timezone'] is None
+    assert data['data']['users'][2]['weekm'] is True
+    assert data['data']['users'][2]['nb_activities'] == 0
+    assert data['data']['users'][2]['nb_sports'] == 0
+    assert data['data']['users'][2]['total_distance'] == 0
+    assert data['data']['users'][2]['total_duration'] == '0:00:00'
+
+
 def test_encode_auth_token(app, user_1):
     """=> Ensure correct auth token generation"""
     auth_token = user_1.encode_auth_token(user_1.id)
diff --git a/fittrackee_api/fittrackee_api/users/models.py b/fittrackee_api/fittrackee_api/users/models.py
index d0d136fa..153228f4 100644
--- a/fittrackee_api/fittrackee_api/users/models.py
+++ b/fittrackee_api/fittrackee_api/users/models.py
@@ -96,12 +96,17 @@ class User(db.Model):
         if nb_activity > 0:
             sports = (
                 db.session.query(func.count(Activity.sport_id))
+                .filter(Activity.user_id == self.id)
                 .group_by(Activity.sport_id)
                 .all()
             )
-            total = db.session.query(
-                func.sum(Activity.distance), func.sum(Activity.duration)
-            ).first()
+            total = (
+                db.session.query(
+                    func.sum(Activity.distance), func.sum(Activity.duration)
+                )
+                .filter(Activity.user_id == self.id)
+                .first()
+            )
         return {
             'id': self.id,
             'username': self.username,