Extended user object

Author: Sholofly

geocachingapi/geocachingapi.py

@@ -35,10 +35,10 @@ class GeocachingApi:
     def __init__(
         self,
         *,
+        token: str,
         request_timeout: int = 8,
         session: Optional[ClientSession] = None,
         token_refresh_method: Optional[Callable[[], Awaitable[str]]] = None,
-        token: str,
     ) -> None:
         """Initialize connection with the Geocaching API."""
         self._session = session
@@ -121,7 +121,16 @@ async def update(self) -> GeocachingStatus:
     async def _update_user(self, data: Dict[str, Any] = None) -> None:
         assert self._status
         if data is None:
-            data = await self._request("GET", f"/{GEOCACHING_API_VERSION}/users/me?fields=username,referenceCode")
+            fields = ",".join([
+                "username",
+                "referenceCode",
+                "findCount",
+                "hideCount",
+                "favoritePoints",
+                "souvenirCount",
+                "awardedFavoritePoints"
+            ])
+            data = await self._request("GET", f"/{GEOCACHING_API_VERSION}/users/me?fields={fields}")
         self._status.user.update_from_dict(data)
 
     async def close(self) -> None:

geocachingapi/models.py

@@ -5,14 +5,29 @@
 
 @dataclass
 class GeocachingUser:
-    username: Optional[str] = None
     reference_code: Optional[str] = None
+    username: Optional[str] = None
+    find_count: Optional[int] = None
+    hide_count: Optional[int] = None
+    favorite_points: Optional[int] = None
+    souvenir_count: Optional[int] = None
+    awarded_favorite_points: Optional[int] = None
 
     def update_from_dict(self, data: Dict[str, Any]) -> None:
         if  "username" in data:
             self.username = data["username"]
         if  "reference" in data:
             self.reference_code = data["referenceCode"]
+        if  "findCount" in data:
+            self.find_count = data["findCount"]
+        if  "hideCount" in data:
+            self.hide_count = data["hideCount"]
+        if  "favoritePoints" in data:
+            self.favorite_points = data["favoritePoints"]
+        if  "souvenirCount" in data:
+            self.souvenir_count = data["souvenirCount"]
+        if  "awardedFavoritePoints" in data:
+            self.awarded_favorite_points = data["awardedFavoritePoints"]
 
         pass
 

tests/test.py

@@ -10,4 +10,6 @@ async def test():
     status:GeocachingStatus = None
     api = GeocachingApi(token=TOKEN)
     status = await api.update()
-    assert(status.user.username is not None)
+
+    assert(status.user.username is not None)
+    assert(status.user.find_count is not None)