From dbc6d1b1c8714d86a3bf08ad75d24a37fa7ae11b Mon Sep 17 00:00:00 2001 From: Jean-Pierre Appel Date: Wed, 25 Oct 2023 02:25:38 -0400 Subject: started pattern match to handle different requests --- server/server.py | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/server/server.py b/server/server.py index 3af80f6..05630bb 100644 --- a/server/server.py +++ b/server/server.py @@ -21,6 +21,17 @@ def recieve_game(game_fp) -> dict: return game +def create_game(length: int) -> None: + return { + 'size': length, + 'finished': False, + 'board': [True] * length, + 'turn': 0, + 'version': '0.0.0', + 'human_turn': , + 'winner': '' + } + def send_game(game: dict) -> str: game_json = json.dumps(game) return game_json.encode('utf-8') @@ -47,13 +58,26 @@ def application(env, start_response): headers = [('Content-Type', 'application/json')] start_response('200 OK', headers) - if env['REQUEST_METHOD'] == 'POST': - try: - game = recieve_game(env['wsgi.input']) - except json.JSONDecodeError: - return [json.dumps({'failure': True}).encode('utf-8')] - play_game(game) - return [send_game(game)] + query = env['QUERY_STRING'] + path_info = env['PATH_INFO'] + match env['REQUEST_METHOD'], env['PATH_INFO']: + case ('GET', '/toggle/newgame'): + # TODO: return descriptive status code + game = create_game(query['size']) + return [send_game(game)] + case ('POST', '/toggle/play'): + # TODO: return descriptive status code + try: + game = recieve_game(env['wsgi.input']) + except json.JSONDecodeError: + return [json.dumps({'Error': 'json parsing error, is your request formatted correctly?'}).encode('utf-8')] + play_game(game) + return [send_game(game)] + case ('DELETE', _): + start_response('405 Method Not Allowed', headers) + case _: + start_response('404 Not Found', headers) + return [json.dumps({'not_post': True}).encode('utf-8')] -- cgit v1.2.3 From f6550e60d256c7c19c8c430ed7294e4d8ea1d4d1 Mon Sep 17 00:00:00 2001 From: JP Appel Date: Wed, 25 Oct 2023 14:14:11 -0400 Subject: changed endpoint, parser for query params --- server/server.py | 50 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/server/server.py b/server/server.py index 05630bb..71b6f0f 100644 --- a/server/server.py +++ b/server/server.py @@ -28,7 +28,7 @@ def create_game(length: int) -> None: 'board': [True] * length, 'turn': 0, 'version': '0.0.0', - 'human_turn': , + 'human_turn': False, 'winner': '' } @@ -54,32 +54,52 @@ def play_game(game: dict) -> None: game['winner'] = 'Computer' +def parse_query_params(query_string) -> dict: + queries = {} + for entry in query_string.split('&'): + key, val = entry.split('=', 2) + queries[key] = val + + return queries + + def application(env, start_response): headers = [('Content-Type', 'application/json')] - start_response('200 OK', headers) - query = env['QUERY_STRING'] path_info = env['PATH_INFO'] + status = '200 OK' + response = [] + match env['REQUEST_METHOD'], env['PATH_INFO']: - case ('GET', '/toggle/newgame'): - # TODO: return descriptive status code - game = create_game(query['size']) - return [send_game(game)] - case ('POST', '/toggle/play'): - # TODO: return descriptive status code + case ('GET', '/toggle/game/new'): + queries = parse_query_params(env['QUERY_STRING']) + game = create_game(queries['size']) + response.append(send_game(game)) + + case ('POST', '/toggle/game/play'): try: game = recieve_game(env['wsgi.input']) + except json.JSONDecodeError: - return [json.dumps({'Error': 'json parsing error, is your request formatted correctly?'}).encode('utf-8')] + status = '500 Internal Server Error' + decode_error = { + 'Error': 'json parsing error, is your request formatter correctly' + } + response.append(json.dumps(decode_error).encode('utf-8')) + play_game(game) - return [send_game(game)] + response.append(send_game(game)) + case ('DELETE', _): - start_response('405 Method Not Allowed', headers) - case _: - start_response('404 Not Found', headers) + status = '405 Method Not Allowed' + headers.remove(('Content-Type', 'application/json')) + case _: + status = '404 Not Found' + headers.remove(('Content-Type', 'application/json')) - return [json.dumps({'not_post': True}).encode('utf-8')] + start_response(status, headers) + return response def main(): -- cgit v1.2.3