API & Client: display activities on calendar - #2

mpwo_api/mpwo_api/activities/activities.py

@@ -27,6 +27,7 @@ def get_activities(auth_user_id):
         date_from = params.get('from')
         date_to = params.get('to')
         order = params.get('order')
+        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.activity_date >= datetime.strptime(date_from, '%Y-%m-%d')
@@ -38,7 +39,7 @@ def get_activities(auth_user_id):
             if order == 'asc'
             else Activity.activity_date.desc()
         ).paginate(
-            page, 5, False
+            page, per_page, False
         ).items
         response_object = {
             'status': 'success',

mpwo_api/mpwo_api/tests/test_activities_api_0_get.py

@@ -437,6 +437,51 @@ def test_get_an_activity(
     assert '0:17:04' == data['data']['activities'][0]['duration']
 
 
+def test_get_activities_per_page(
+    app, user_1, sport_1_cycling, seven_activities_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?per_page=10',
+        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']) == 7
+    assert 'Wed, 09 May 2018 00:00:00 GMT' == data['data']['activities'][0]['activity_date']  # noqa
+    assert 'Mon, 20 Mar 2017 00:00:00 GMT' == data['data']['activities'][6]['activity_date']  # noqa
+
+    response = client.get(
+        '/api/activities?per_page=3',
+        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']) == 3
+    assert 'Wed, 09 May 2018 00:00:00 GMT' == data['data']['activities'][0]['activity_date']  # noqa
+    assert 'Fri, 23 Feb 2018 00:00:00 GMT' == data['data']['activities'][2]['activity_date']  # noqa
+
+
 def test_get_an_activity_invalid_id(app, user_1):
     client = app.test_client()
     resp_login = client.post(