fix: add Configuration filter support for moon2024 logbook queries

README.md

@@ -38,7 +38,9 @@ This outputs a CSV file with the following fields:
 
 #### Supported Boards 🛹
 
-Currently all [Aurora Climbing](https://auroraclimbing.com/) based boards (Kilter, Tension, etc.) and the [Moonboard](https://moonboard.com/). The Moonboard web API currently appears to be broken for some iterations of the board, including 2016 and 2024.
+Currently all [Aurora Climbing](https://auroraclimbing.com/) based boards (Kilter, Tension, etc.) and the [Moonboard](https://moonboard.com/).
+
+**Note on Moonboard 2024**: The Moonboard API for 2024 boards requires angle-specific queries (25° and 40°) and may return incomplete data. The API appears to have data inconsistencies between the Dashboard and Logbook endpoints. BoardLib now supports querying moon2024 with Configuration filters, but users may find that some climbs visible in the web Dashboard are not returned by the API.
 
 ### Images 📸
 

src/boardlib/api/moon.py

@@ -88,15 +88,23 @@ def get_session(username, password):
     return session
 
 
-def logbook_pages(session, board, page_size=40, page=1):
+def logbook_pages(session, board, page_size=40, page=1, angle=None):
+    # Build filter string
+    filter_str = f"setupId~eq~'{BOARD_IDS[board]}'"
+
+    # Moon2024 requires Configuration filter for each angle
+    if board == "moon2024" and angle is not None:
+        config_id = ANGLES_TO_IDS[board][angle]
+        filter_str += f"~and~Configuration~eq~'{config_id}'"
+
     response = session.post(
         f"{HOST}/Logbook/GetLogbook",
         data={
             "sort": "",
             "page": page,
             "pageSize": page_size,
             "group": "",
-            "filter": f"setupId~eq~'{BOARD_IDS[board]}'",
+            "filter": filter_str,
         },
         headers={
             "X-Requested-With": "XMLHttpRequest",
@@ -106,18 +114,26 @@ def logbook_pages(session, board, page_size=40, page=1):
     response_json = response.json()
     yield from response_json["Data"]
     if response_json["Total"] > page_size * page:
-        yield from logbook_pages(session, board, page_size, page + 1)
+        yield from logbook_pages(session, board, page_size, page + 1, angle)
+
 
+def raw_logbook_entries_for_page(session, board, entry_id, page_size=30, page=1, angle=None):
+    # Build filter string
+    filter_str = f"setupId~eq~'{BOARD_IDS[board]}'"
+
+    # Moon2024 requires Configuration filter for each angle
+    if board == "moon2024" and angle is not None:
+        config_id = ANGLES_TO_IDS[board][angle]
+        filter_str += f"~and~Configuration~eq~'{config_id}'"
 
-def raw_logbook_entries_for_page(session, board, entry_id, page_size=30, page=1):
     response = session.post(
         f"{HOST}/Logbook/GetLogbookEntries/{entry_id}",
         data={
             "sort": "",
             "page": page,
             "pageSize": page_size,
             "group": "",
-            "filter": f"setupId~eq~'{BOARD_IDS[board]}'",
+            "filter": filter_str,
         },
         headers={"X-Requested-With": "XMLHttpRequest"},
     )
@@ -126,16 +142,25 @@ def raw_logbook_entries_for_page(session, board, entry_id, page_size=30, page=1)
     yield from response_json["Data"]
     if response_json["Total"] > page_size * page:
         yield from raw_logbook_entries_for_page(
-            session, board, entry_id, page_size, page + 1
+            session, board, entry_id, page_size, page + 1, angle
         )
 
 
 def raw_logbook_entries(session, board, logbook_page_size=40, entry_page_size=30):
-    logbook = logbook_pages(session, board, page_size=logbook_page_size)
-    for entry in logbook:
-        yield from raw_logbook_entries_for_page(
-            session, board, entry["Id"], page_size=entry_page_size
-        )
+    # Moon2024 requires querying each angle separately
+    if board == "moon2024":
+        for angle in ANGLES_TO_IDS[board].keys():
+            logbook = logbook_pages(session, board, page_size=logbook_page_size, angle=angle)
+            for entry in logbook:
+                yield from raw_logbook_entries_for_page(
+                    session, board, entry["Id"], page_size=entry_page_size, angle=angle
+                )
+    else:
+        logbook = logbook_pages(session, board, page_size=logbook_page_size)
+        for entry in logbook:
+            yield from raw_logbook_entries_for_page(
+                session, board, entry["Id"], page_size=entry_page_size
+            )
 
 
 def get_my_ranking(session, board, angle):