This \ + # TODO: Look into putting all this into a template or something. + return """
This \ site is a collection of api's from various public sources collected \ - by the team at Seattle Matrix
" + by the team at SeattleMatrix.org. Current Data: \ + King County, WA Covid-19 By ZipCode - Current Dates: 20200810, 20200824, 20200831 + """ -# A route to return all of the available records for King County +# A route to return all of the available records for King County COVID-19 @app.route('/v1/kingcounty/covid-19/zipcode/all', methods=['GET']) def api_zipcode_all(): - conn = psycopg2.connect(f"host={dbhost} dbname={database} user={username} password={password} port={port}") + """ This route returns all the data in the king_county_covid19_zip + table. This data is currently manually updated. + """ + conn = psycopg2.connect(f"host={dbhost} dbname={database} user={username} password={password} port={port} sslmode='require'") cur = conn.cursor() cur.execute("select row_to_json(king_county_covid19_zip) from king_county_covid19_zip;") rows = cur.fetchall() - # returning rv throws an error and jsonify returns double nested + # FIXME: returning row throws an error and jsonify returns double nested # json result need to figure this out. return jsonify(rows) -@app.route('/v1/kingcounty/covid-19/zipcode', methods=['GET']) -def api_zipcode(): - # Check to see if 'zip' was provided in URL - # If no zip display message stating this - if 'zip' in request.args: - provided_zipcode = request.args['zip'] - else: - return "Error: No zipcode [zip] field provided. Please specify an zipcode." - - # Create an empty list for our results - results = [] - - # Loop through the data and match results that fit the requested Zipcode. - # zipcodes are unique, but other fields might return many results - for zipcode in zipcodes: - if zipcode['zipcode'] == provided_zipcode: - results.append(zipcode) - - # If no zipcodes matched and results are empty show message rather than - # empty page, maybe this isnt good to do in an API that is going to be used - # for human and computer consumption, need to check into that. - if not results: - results = "The Zipcode you entered was not in the API, please try again" - - # Use the jsonify function from Flask to convert our list of - # Python dictionaries to the JSON format. - return jsonify(results) +if __name__ == "__main__": + app.run(host='0.0.0.0') -app.run() +# TODO: Create route for filtering on zipcode and date +# TODO: Put all above into function for covid-19 data +# TODO: Look into making a Class for db connection \ No newline at end of file diff --git a/create_covid-19_zip.py b/database/create_covid-19_zip.py similarity index 100% rename from create_covid-19_zip.py rename to database/create_covid-19_zip.py diff --git a/load_db.py b/database/load_db.py similarity index 100% rename from load_db.py rename to database/load_db.py diff --git a/source_data/covid-19.xlsx b/database/source_data/covid-19.xlsx similarity index 100% rename from source_data/covid-19.xlsx rename to database/source_data/covid-19.xlsx diff --git a/source_data/covid-19_20200810_zip.csv b/database/source_data/covid-19_20200810_zip.csv similarity index 100% rename from source_data/covid-19_20200810_zip.csv rename to database/source_data/covid-19_20200810_zip.csv diff --git a/source_data/covid-19_20200824_zip.csv b/database/source_data/covid-19_20200824_zip.csv similarity index 100% rename from source_data/covid-19_20200824_zip.csv rename to database/source_data/covid-19_20200824_zip.csv diff --git a/source_data/covid-19_20200831_zip.csv b/database/source_data/covid-19_20200831_zip.csv similarity index 100% rename from source_data/covid-19_20200831_zip.csv rename to database/source_data/covid-19_20200831_zip.csv diff --git a/source_data/covid-data-extract-geography-august-10.xlsx b/database/source_data/covid-data-extract-geography-august-10.xlsx similarity index 100% rename from source_data/covid-data-extract-geography-august-10.xlsx rename to database/source_data/covid-data-extract-geography-august-10.xlsx diff --git a/source_data/covid-data-extract-geography-august-24.xlsx b/database/source_data/covid-data-extract-geography-august-24.xlsx similarity index 100% rename from source_data/covid-data-extract-geography-august-24.xlsx rename to database/source_data/covid-data-extract-geography-august-24.xlsx diff --git a/source_data/covid-data-extract-geography-august-31.xlsx b/database/source_data/covid-data-extract-geography-august-31.xlsx similarity index 100% rename from source_data/covid-data-extract-geography-august-31.xlsx rename to database/source_data/covid-data-extract-geography-august-31.xlsx