diff --git a/services/__init__.py b/services/__init__.py index 303f927..80198d3 100644 --- a/services/__init__.py +++ b/services/__init__.py @@ -2,11 +2,13 @@ import json from flask import make_response + def root_dir(): """ Returns root director for this project """ return os.path.dirname(os.path.realpath(__file__ + '/..')) + def nice_json(arg): - response = make_response(json.dumps(arg, sort_keys = True, indent=4)) + response = make_response(json.dumps(arg, sort_keys=True, indent=4)) response.headers['Content-type'] = "application/json" - return response \ No newline at end of file + return response diff --git a/services/bookings.py b/services/bookings.py index da50a8c..e3ecafa 100644 --- a/services/bookings.py +++ b/services/bookings.py @@ -25,6 +25,7 @@ def hello(): def booking_list(): return nice_json(bookings) + @app.route("/bookings/") def booking_record(username): if username not in bookings: @@ -32,6 +33,6 @@ def booking_record(username): return nice_json(bookings[username]) -if __name__ == "__main__": - app.run(port=5003, debug = True) +if __name__ == "__main__": + app.run(port=5003, debug=True) diff --git a/services/movies.py b/services/movies.py index a6e96ba..37d0ac6 100644 --- a/services/movies.py +++ b/services/movies.py @@ -9,6 +9,7 @@ with open("{}/database/movies.json".format(root_dir()), "r") as f: movies = json.load(f) + @app.route("/") def hello(): return nice_json({ @@ -19,6 +20,7 @@ def hello(): } }) + @app.route("/movies/") def movie_info(movieid): if movieid not in movies: @@ -29,11 +31,11 @@ def movie_info(movieid): return nice_json(result) + @app.route("/movies") def movie_record(): return nice_json(movies) if __name__ == "__main__": - app.run(port=5001, debug = True) - + app.run(port=5001, debug=True) diff --git a/services/showtimes.py b/services/showtimes.py index a8783b9..23bd75d 100644 --- a/services/showtimes.py +++ b/services/showtimes.py @@ -9,6 +9,7 @@ with open("{}/database/showtimes.json".format(root_dir()), "r") as f: showtimes = json.load(f) + @app.route("/") def hello(): return nice_json({ @@ -19,10 +20,12 @@ def hello(): } }) + @app.route("/showtimes") def showtimes_list(): return nice_json(showtimes) + @app.route("/showtimes/") def showtimes_record(date): if date not in showtimes: @@ -30,5 +33,6 @@ def showtimes_record(date): print showtimes[date] return nice_json(showtimes[date]) + if __name__ == "__main__": - app.run(port=5002, debug = True) \ No newline at end of file + app.run(port=5002, debug=True) diff --git a/services/user.py b/services/user.py index d258e3b..d8bd0a0 100644 --- a/services/user.py +++ b/services/user.py @@ -23,10 +23,12 @@ def hello(): } }) + @app.route("/users") def users_list(): return nice_json(users) + @app.route("/users/") def user_record(username): if username not in users: @@ -34,6 +36,7 @@ def user_record(username): return nice_json(users[username]) + @app.route("/users//bookings") def user_bookings(username): """ @@ -46,7 +49,7 @@ def user_bookings(username): raise NotFound("User '{}' not found.".format(username)) try: - users_bookings = requests.get("http://127.0.0.1:5003/bookings/{}".format(username)) + users_bookings = requests.get("http://0:5003/bookings/{}".format(username)) except requests.exceptions.ConnectionError: raise ServiceUnavailable("The Bookings service is unavailable.") @@ -61,7 +64,7 @@ def user_bookings(username): result[date] = [] for movieid in movies: try: - movies_resp = requests.get("http://127.0.0.1:5001/movies/{}".format(movieid)) + movies_resp = requests.get("http://0:5001/movies/{}".format(movieid)) except requests.exceptions.ConnectionError: raise ServiceUnavailable("The Movie service is unavailable.") movies_resp = movies_resp.json() @@ -86,4 +89,4 @@ def user_suggested(username): if __name__ == "__main__": - app.run(port = 5000, debug = True) \ No newline at end of file + app.run(port=5000, debug=True)