Merge pull request #76 from pgulb/44-flush-pagination-on-pwa-root

44 flush pagination on pwa root

Author: pgulb

api/main.py

@@ -214,18 +214,32 @@ def delete_flush_by_id(
 @app.get("/flushes", status_code=status.HTTP_200_OK)
 def get_flushes(
     export_format: Union[str, None] = None,
+    skip: Union[int, None] = None,
     credentials: HTTPBasicCredentials = Depends(security),
 ):
     check_creds(credentials)
     flushes = client.flush.flushes
     try:
-        entries = [
-            x
-            for x in flushes.find(
-                filter={"user_id": credentials.username},
-                sort=[("time_start", pymongo.DESCENDING)],
-            )
-        ]
+        if skip is not None:
+            entries = [
+                x
+                for x in flushes.find(
+                    filter={
+                        "user_id": credentials.username,
+                    },
+                    limit=3,
+                    skip=skip,
+                    sort=[("time_start", pymongo.DESCENDING)],
+                )
+            ]
+        else:
+            entries = [
+                x
+                for x in flushes.find(
+                    filter={"user_id": credentials.username},
+                    sort=[("time_start", pymongo.DESCENDING)],
+                )
+            ]
         for entry in entries:
             entry["_id"] = str(entry["_id"])
             del entry["user_id"]

api/tests/universal/test_getting_flushes.py

@@ -80,3 +80,81 @@ def test_getting_flushes_noflushes():
     )
     assert response.status_code == status.HTTP_200_OK
     assert response.json() == []
+
+
+def test_getting_flushes_with_skip():
+    flushes = [
+        {
+            "time_start": "2021-01-01T00:00:00",
+            "time_end": "2021-01-01T01:00:00",
+            "rating": 5,
+            "note": "test",
+            "phone_used": True,
+        },
+        {
+            "time_start": "2021-01-01T01:00:00",
+            "time_end": "2021-01-01T02:00:00",
+            "rating": 5,
+            "note": "test",
+            "phone_used": True,
+        },
+        {
+            "time_start": "2021-01-01T02:00:00",
+            "time_end": "2021-01-01T03:00:00",
+            "rating": 5,
+            "note": "test",
+            "phone_used": True,
+        },
+        {
+            "time_start": "2021-01-01T03:00:00",
+            "time_end": "2021-01-01T04:00:00",
+            "rating": 5,
+            "note": "test",
+            "phone_used": True,
+        },
+        {
+            "time_start": "2021-01-01T04:00:00",
+            "time_end": "2021-01-01T05:00:00",
+            "rating": 5,
+            "note": "test",
+            "phone_used": True,
+        },
+        {
+            "time_start": "2021-01-01T05:00:00",
+            "time_end": "2021-01-01T06:00:00",
+            "rating": 5,
+            "note": "test",
+            "phone_used": True,
+        },
+    ]
+    username, password = "testgettingflushesskip", "testgettingflushesskip"
+    create_user(client, username, password)
+    for f in flushes:
+        create_flush(client, username, password, f)
+    response = client.get(
+        "/flushes",
+        auth=BasicAuth(username=username, password=password),
+        params={"skip": 0},
+    )
+    assert response.status_code == status.HTTP_200_OK
+    js = response.json()
+    assert len(js) == 3
+    assert js[0]["time_start"] == flushes[-1]["time_start"]
+    response = client.get(
+        "/flushes",
+        auth=BasicAuth(username=username, password=password),
+        params={"skip": 3},
+    )
+    assert response.status_code == status.HTTP_200_OK
+    js = response.json()
+    assert len(js) == 3
+    assert js[0]["time_start"] == flushes[2]["time_start"]
+
+    response = client.get(
+        "/flushes",
+        auth=BasicAuth(username=username, password=password),
+        params={"skip": 6},
+    )
+    assert response.status_code == status.HTTP_200_OK
+    js = response.json()
+    assert len(js) == 0

pwa/flush/apicalls.go

@@ -9,6 +9,8 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"net/url"
+	"strconv"
 	"time"
 
 	"github.com/maxence-charriere/go-app/v10/pkg/app"
@@ -141,7 +143,7 @@ func TryAddFlush(creds Creds, flush Flush) (int, error) {
 	return r.StatusCode, nil
 }
 
-func GetFlushes(ctx app.Context) ([]Flush, error) {
+func GetFlushes(ctx app.Context, skip int) ([]Flush, error) {
 	apiUrl, err := GetApiUrl()
 	if err != nil {
 		return nil, err
@@ -153,6 +155,11 @@ func GetFlushes(ctx app.Context) ([]Flush, error) {
 	var c Creds
 	ctx.GetState("creds", &c)
 	req.Header.Add("Authorization", "Basic "+c.UserColonPass)
+	log.Println("flush fetch skip: ", skip)
+	log.Println("adding skip to /flushes...")
+	q := url.Values{}
+	q.Add("skip", strconv.Itoa(skip))
+	req.URL.RawQuery = q.Encode()
 	r, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, err
@@ -195,6 +202,9 @@ func GetFlushes(ctx app.Context) ([]Flush, error) {
 	}
 	log.Println("temporary flush struct: ", temp)
 	log.Println("Flushes: ", flushes)
+	if len(flushes) > 0 {
+		ctx.SetState("skip", skip+3)
+	}
 	return flushes, nil
 }