diff --git a/resources/images/professor-ubuntu/server/getAssignments.py b/resources/images/professor-ubuntu/server/getAssignments.py index 3d9ee9c..3745447 100644 --- a/resources/images/professor-ubuntu/server/getAssignments.py +++ b/resources/images/professor-ubuntu/server/getAssignments.py @@ -22,7 +22,7 @@ encoded_dir_path_student = base64.b64encode(( f"{dir_path_student}/{assignment_id}").encode('ascii')).decode('ascii') # base64 encode urlmodel = json.loads(requests.get( - f"{Urls.base_url}/users/{user['id']}/{lecture_id}/url").text) + f"{Urls.base_url}/users/{user['userId']}/{lecture_id}/url").text) url = f"{urlmodel['apiEndpoint']}/files/{encoded_dir_path_student}" json_str = requests.get(url).text # json to dict @@ -30,7 +30,7 @@ # write files for filename, content in result.items(): - assignment_dir_path = f"{dir_path}/{assignment_id}/{user['id']}/{filename}" + assignment_dir_path = f"{dir_path}/{assignment_id}/{user['userId']}/{filename}" f = open(assignment_dir_path, 'w') f.write(content) f.close() diff --git a/resources/images/professor-ubuntu/server/main.py b/resources/images/professor-ubuntu/server/main.py index 79852ac..566ee68 100644 --- a/resources/images/professor-ubuntu/server/main.py +++ b/resources/images/professor-ubuntu/server/main.py @@ -41,14 +41,14 @@ def create_directories(assignment_id, lecture_id, data_users_assigned): encoded_dir_path_student = base64.b64encode(( f"{dir_path_student}/{assignment_id}").encode('ascii')).decode('ascii') # base64 encode urlmodel = json.loads(requests.get( - f"{Urls.base_url}/users/{user['id']}/{lecture_id}/url").text) + f"{Urls.base_url}/users/{user['userId']}/{lecture_id}/url").text) url = f"{urlmodel['apiEndpoint']}/mkdir/{encoded_dir_path_student}" result = requests.post(url).text if result == False: - print(f"Error in mkdir, uid:{user['id']}") + print(f"Error in mkdir, uid:{user['userId']}") # mkdir in professor - os.makedirs(f"{dir_path_professor}/{assignment_id}/{user['id']}") + os.makedirs(f"{dir_path_professor}/{assignment_id}/{user['userId']}") @app.post("/assignments/")