API & Client: filter activities - #3 (WIP)

fittrackee_api/fittrackee_api/activities/activities.py

@@ -33,9 +33,11 @@ def get_activities(auth_user_id):
         ave_speed_from = params.get('ave_speed_from')
         ave_speed_to = params.get('ave_speed_to')
         order = params.get('order')
+        sport_id = params.get('sport_id')
         per_page = int(params.get('per_page')) if params.get('per_page') else 5
         activities = Activity.query.filter(
             Activity.user_id == auth_user_id,
+            Activity.sport_id == sport_id if sport_id else True,
             Activity.activity_date >= datetime.strptime(date_from, '%Y-%m-%d')
             if date_from else True,
             Activity.activity_date <= datetime.strptime(date_to, '%Y-%m-%d')

fittrackee_api/fittrackee_api/tests/test_activities_api_0_get.py

@@ -487,6 +487,35 @@ def test_get_activities_ave_speed_filter(
     assert 'Fri, 23 Feb 2018 00:00:00 GMT' == data['data']['activities'][0]['activity_date']   # noqa
 
 
+def test_get_activities_sport_filter(
+    app, user_1, sport_1_cycling, seven_activities_user_1, sport_2_running,
+    activity_running_user_1
+):
+    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/activities?sport_id=2',
+        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']['activities']) == 1
+    assert 'Sun, 01 Apr 2018 00:00:00 GMT' == data['data']['activities'][0]['activity_date']   # noqa
+
+
 def test_get_an_activity(
     app, user_1, sport_1_cycling, activity_cycling_user_1
 ):