Update app.py

app.py

@@ -46,39 +46,57 @@ class MindbodyClient:
         resp.raise_for_status()
         return resp.json()
 
-    # --------------------------- public endpoints --------------------------
-    def get_class_descriptions(self, location_id: str | int):
-        """Return **types of training** offered at a location."""
-        params = {"LocationIds": location_id}
+    def get_class_descriptions(self, location_id: int | str):
+        params = {"locationIds": location_id}
         return self._get("/class/classdescriptions", params)
 
-    def get_classes(self, location_id: str | int, start_iso: str, end_iso: str):
-        """Return **scheduled classes** for a date range."""
-        params = {
-            "LocationIds": location_id,
-            "StartDateTime": start_iso,
-            "EndDateTime": end_iso,
-        }
+    def get_classes(
+        self,
+        *,
+        location_id: int | str | None = None,
+        start_iso: str | None = None,
+        end_iso: str | None = None,
+        class_ids: list[int] | None = None,
+    ):
+        """Return scheduled classes.  Accepts *either* a location or explicit classIds."""
+        params: dict[str, str | list[int]] = {}
+        if location_id is not None:
+            params["locationIds"] = location_id
+        if class_ids:
+            params["classIds"] = class_ids
+        if start_iso:
+            params["startDateTime"] = start_iso
+        if end_iso:
+            params["endDateTime"] = end_iso
         return self._get("/class/classes", params)
 
-    def book_class(self, class_id: int, client_id: str, cross_regional: bool = False):
+    def book_class(
+        self,
+        *,
+        class_id: int,
+        client_id: str,
+        cross_regional: bool = False,
+        require_payment: bool = False,
+        send_email: bool = False,
+    ):
         """Book a client into a class *after* verifying availability."""
-        # 1) confirm availability
-        info = self._get("/class/classes", {"ClassIds": class_id})
-        if not info.get("Classes"):
-            raise ValueError("Class ID not found")
-
-        cls = info["Classes"][0]
+        # 1) quick availability check
+        info = self.get_classes(class_ids=[class_id])
+        cls = (info.get("Classes") or [None])[0]
+        if not cls:
+            raise ValueError(f"Class {class_id} not found")
         if not cls.get("IsAvailable", False):
-            raise ValueError("Class is not available for online booking")
+            raise ValueError("Class is not open for online booking")
         if cls.get("TotalBooked", 0) >= cls.get("MaxCapacity", 0):
             raise ValueError("Class is already full")
 
-        # 2) book
+        # 2) book it
         payload = {
             "ClientId": client_id,
             "ClassId": class_id,
             "CrossRegionalBooking": cross_regional,
+            "RequirePayment": require_payment,
+            "SendEmail": send_email,
         }
         return self._post("/class/addclienttoclass", payload)
 
@@ -129,43 +147,53 @@ def get_training_types(location_id: str | int):
         return f"❌ Error: {exc}"
 
 
-def get_schedule(location_id: str | int, days: int):
+def get_schedule(location_id: str | int, days: float):
     """Return upcoming classes in a human-friendly Markdown list."""
     if not mb_client:
         return "❌ Authenticate first."
 
     try:
-        start_iso = datetime.now().strftime("%Y-%m-%dT00:00:00")
-        end_iso = (datetime.now() + timedelta(days=int(days))).strftime("%Y-%m-%dT23:59:59")
-        res = mb_client.get_classes(location_id, start_iso, end_iso)
+        now = datetime.utcnow()
+        start_iso = now.replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
+        end_iso = (now + timedelta(days=int(days))).replace(
+            hour=23, minute=59, second=59, microsecond=0
+        ).isoformat()
+
+        res = mb_client.get_classes(
+            location_id=location_id, start_iso=start_iso, end_iso=end_iso
+        )
         classes = res.get("Classes", [])
         if not classes:
             return "⚠️ No classes in the selected window."
 
-        formatted = []
+        lines: list[str] = []
         for c in classes:
-            dt = c.get("StartDateTime", "?")
-            name = c.get("ClassDescription", {}).get("Name", "🆔" + str(c.get("ClassDescriptionId")))
-            ok = "✅" if c.get("IsAvailable") else "❌"
-            cid = c.get("Id")
-            formatted.append(f"{dt} | {name} | {ok} | ClassId: {cid}")
+            when = c["StartDateTime"][:16].replace("T", " ")  # YYYY-MM-DD HH:MM
+            name = c.get("ClassDescription", {}).get("Name") or f"ID {c['ClassDescriptionId']}"
+            ok = "✅" if c["IsAvailable"] else "❌"
+            cid = c["Id"]
+            lines.append(f"{when} | {name} | {ok} | ClassId: {cid}")
 
-        return "📅 Schedule\n" + "\n".join(formatted)
+        return "### 📅 Schedule\n" + "\n".join(lines)
     except Exception as exc:
         logger.exception("Error while fetching schedule")
         return f"❌ Error: {exc}"
 
 
 def book_class_gr(class_id: int, client_id: str, cross_regional: bool):
-    """Book a class through the UI."""
     if not mb_client:
         return "❌ Authenticate first."
 
     try:
-        res = mb_client.book_class(class_id, client_id, cross_regional)
+        res = mb_client.book_class(
+            class_id=class_id,
+            client_id=client_id,
+            cross_regional=cross_regional,
+        )
         visit = res.get("Visit", {})
         status = visit.get("AppointmentStatus", "OK")
-        return f"🎉 Booked! Status: {status}\n\nFull response:\n{res}"
+        readable = visit.get("StartDateTime", "")[:16].replace("T", " ")
+        return f"🎉 **Booked {readable} – status {status}**\n\n```json\n{res}\n```"
     except Exception as exc:
         logger.exception("Booking failed")
         return f"❌ Could not book: {exc}"