Skip to content

Commit

Permalink
Changed json processing method
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeusina committed Dec 11, 2023
1 parent 0704193 commit 9c4d773
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions petersbugredu_wrap/types/child.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

class Child:
def __init__(self, firstname: str, surname: str, middlename: str, educations: list[Education],
action_payload: ActionPayload, hash_uid: str, identity: Identity, token: str) -> None:
action_payload: ActionPayload, hash_uid: str,
identity: Identity, token: str) -> None:
"""
Class represents Children API entity
:param firstname:
Expand Down Expand Up @@ -56,7 +57,7 @@ def get_teacher_list(self) -> list[Teacher]:
}

response = requests.request("GET", url, headers=headers, data=payload, cookies=cookies)
response_json = json.loads(response.text)
response_json = response.json()
self.logger.debug(
"Get the response to get teacher list with %code% status code".replace("%code%", str(response.status_code)))
if response.status_code != 200:
Expand Down Expand Up @@ -97,13 +98,13 @@ def get_mark_list_by_period(self, date_from: datetime.date, date_to: datetime.da
response = session.request("GET", url.replace("{{page}}", "0"), cookies=cookie, headers=headers)
self.logger.debug("Made request 1st page of marks with status code %code%"
.replace("%code%", str(response.status_code)))
pages.append(json.loads(response.text))
pages.append(response.json())
total_pages: int = pages[0]["data"]["total_pages"]
if total_pages > 1:
for page_number in range(2, total_pages + 1):
response = session.request("GET", url.replace("{{page}}", str(page_number)), cookies=cookie,
headers=headers)
pages.append(json.loads(response.text))
pages.append(response.json())
self.logger.debug("Made request %page% page of marks with status code %code%"
.replace("%code%", str(response.status_code)).replace("%page%", str(page_number)))
marks = []
Expand Down Expand Up @@ -157,13 +158,13 @@ def get_lesson_list_by_period(self, date_from: datetime.date, date_to: datetime.
response = session.request("GET", url.replace("{{page}}", "0"), cookies=cookies, headers=headers)
self.logger.debug("Made request 1st page of lessons with status code %code%"
.replace("%code%", str(response.status_code)))
pages.append(json.loads(response.text))
pages.append(response.json())
total_pages: int = pages[0]["data"]["total_pages"]
if total_pages > 1:
for page_number in range(2, total_pages + 1):
response = session.request("GET", url.replace("{{page}}", str(page_number)), cookies=cookies,
headers=headers)
pages.append(json.loads(response.text))
pages.append(response.json())
self.logger.debug("Made request %page% page of lessons with status code %code%"
.replace("%code%", str(response.status_code)).replace("%page%", str(page_number)))
lessons = []
Expand Down

0 comments on commit 9c4d773

Please sign in to comment.