GCP utils integration update

strava_watcher/main.py

@@ -13,7 +13,8 @@
 from pytz import utc
 from requests import HTTPError
 
-from brevet_top_gcp_utils import create_document, firestore_to_track_point
+from brevet_top_gcp_utils import (create_document, firestore_to_track_point,
+                                  get_checkpoints)
 from brevet_top_strava import (ActivityError, ActivityNotFound,
                                AthleteNotFound, auth_token,
                                build_checkpoint_list, get_activity,
@@ -137,7 +138,7 @@ def strava_compare(athlete_id: int, activity_id: int, secret: dict):
         ]
 
         # prepare a list of control points (check-in / check-out) necessary to visit
-        checkpoints, ids = build_checkpoint_list(get_checkpoints(brevet_dict["uid"]))
+        checkpoints, ids = build_checkpoint_list(get_checkpoints(brevet_dict["uid"], db=db_client))
         # logging.debug(f"Checkpoints {checkpoints} / {ids}")
 
         # start searching
@@ -192,21 +193,6 @@ def search_brevets(start_date: datetime) -> List[dict]:
     ]
 
 
-def get_checkpoints(brevet_uid: str) -> List[dict]:
-    checkpoints: list = [
-        cp.to_dict()
-        for cp in db_client.document(f"brevets/{brevet_uid}")
-        .collection("checkpoints")
-        .get()
-    ]
-    checkpoints.sort(key=lambda x: x.get("distance", 0))
-    return [
-        {**cp, "coordinates": firestore_to_track_point(cp)}
-        for cp in checkpoints
-        if cp.get("uid")
-    ]
-
-
 def create_rider_barcode(rider_uid: str, code: str, time: datetime) -> str:
     return create_document(
         f"riders/{rider_uid}/barcodes",

strava_watcher/requirements.txt

@@ -8,5 +8,5 @@ python_dateutil==2.8.2
 pytz==2021.3
 rdp==0.8
 numpy>=1.21.5
-brevet-top-gcp-utils==0.1.1
+brevet-top-gcp-utils==0.1.4
 brevet-top-strava==0.1.1