more tests?
This commit is contained in:
@@ -126,7 +126,7 @@ class CrossFitBooker:
|
||||
"https://sport.nubapp.com/api/v4/users/checkUser.php",
|
||||
headers={"Content-Type": "application/x-www-form-urlencoded"},
|
||||
data=urlencode(login_params))
|
||||
|
||||
|
||||
if not response.ok:
|
||||
logging.error(f"First login step failed: {response.status_code} - {response.text[:100]}")
|
||||
return False
|
||||
@@ -147,7 +147,7 @@ class CrossFitBooker:
|
||||
"username": USERNAME,
|
||||
"password": PASSWORD
|
||||
}))
|
||||
|
||||
|
||||
if response.ok:
|
||||
try:
|
||||
login_data: Dict[str, Any] = response.json()
|
||||
@@ -184,7 +184,7 @@ class CrossFitBooker:
|
||||
return None
|
||||
|
||||
url: str = "https://sport.nubapp.com/api/v4/activities/getActivitiesCalendar.php"
|
||||
|
||||
|
||||
# Prepare request with mandatory parameters
|
||||
request_data: Dict[str, str] = self.mandatory_params.copy()
|
||||
request_data.update({
|
||||
@@ -192,7 +192,7 @@ class CrossFitBooker:
|
||||
"start_timestamp": start_date.strftime("%d-%m-%Y"),
|
||||
"end_timestamp": end_date.strftime("%d-%m-%Y")
|
||||
})
|
||||
|
||||
|
||||
# Add retry logic
|
||||
for retry in range(RETRY_MAX):
|
||||
try:
|
||||
@@ -240,7 +240,55 @@ class CrossFitBooker:
|
||||
"id_user": self.user_id,
|
||||
"action_by": self.user_id,
|
||||
"n_guests": "0",
|
||||
"booked_on": "3"
|
||||
"booked_on": "1",
|
||||
"device_type": self.mandatory_params["device_type"],
|
||||
"token": self.auth_token
|
||||
}
|
||||
|
||||
for retry in range(RETRY_MAX):
|
||||
try:
|
||||
response: requests.Response = self.session.post(
|
||||
url,
|
||||
headers=self.get_auth_headers(),
|
||||
data=urlencode(data),
|
||||
timeout=10
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
json_response: Dict[str, Any] = response.json()
|
||||
if json_response.get("success", False):
|
||||
logging.info(f"Successfully booked session {session_id}")
|
||||
return True
|
||||
else:
|
||||
logging.error(f"API returned success:false: {json_response} - Session ID: {session_id}")
|
||||
return False
|
||||
|
||||
logging.error(f"HTTP {response.status_code}: {response.text[:100]}")
|
||||
return False
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
if retry == RETRY_MAX - 1:
|
||||
logging.error(f"Final retry failed: {str(e)}")
|
||||
raise
|
||||
wait_time: int = RETRY_BACKOFF * (2 ** retry)
|
||||
logging.warning(f"Request failed (attempt {retry+1}/{RETRY_MAX}): {str(e)}. Retrying in {wait_time}s...")
|
||||
time.sleep(wait_time)
|
||||
|
||||
logging.error(f"Failed to complete request after {RETRY_MAX} attempts")
|
||||
return False
|
||||
|
||||
def get_booked_sessions(self) -> List[Dict[str, Any]]:
|
||||
"""
|
||||
Get a list of booked sessions.
|
||||
|
||||
Returns:
|
||||
A list of dictionaries containing information about the booked sessions.
|
||||
"""
|
||||
url = "https://sport.nubapp.com/api/v4/activities/getBookedActivities.php"
|
||||
data = {
|
||||
**self.mandatory_params,
|
||||
"id_user": self.user_id,
|
||||
"action_by": self.user_id
|
||||
}
|
||||
|
||||
for retry in range(RETRY_MAX):
|
||||
@@ -255,13 +303,12 @@ class CrossFitBooker:
|
||||
if response.status_code == 200:
|
||||
json_response: Dict[str, Any] = response.json()
|
||||
if json_response.get("success", False):
|
||||
logging.info(f"Successfully booked session {session_id}")
|
||||
return True
|
||||
return json_response.get("data", [])
|
||||
logging.error(f"API returned success:false: {json_response}")
|
||||
return False
|
||||
return []
|
||||
|
||||
logging.error(f"HTTP {response.status_code}: {response.text[:100]}")
|
||||
return False
|
||||
return []
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
if retry == RETRY_MAX - 1:
|
||||
@@ -272,7 +319,7 @@ class CrossFitBooker:
|
||||
time.sleep(wait_time)
|
||||
|
||||
logging.error(f"Failed to complete request after {RETRY_MAX} attempts")
|
||||
return False
|
||||
return []
|
||||
|
||||
def is_session_bookable(self, session: Dict[str, Any], current_time: datetime) -> bool:
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user