From df29445f89580daa0f6ab69477f97f5caf426917 Mon Sep 17 00:00:00 2001 From: prasket Date: Sun, 23 Aug 2020 19:10:41 -0700 Subject: [PATCH] created initial api.py and modified initial table creation and load to have primary key id and date loaded fields. --- Pipfile | 1 + Pipfile.lock | 76 +++++++++++++++++++++++++++++++++++++++++- api.py | 35 +++++++++++++++++++ create_covid-19_zip.py | 28 ++++++++-------- load_db.py | 20 +++++++---- 5 files changed, 140 insertions(+), 20 deletions(-) create mode 100644 api.py diff --git a/Pipfile b/Pipfile index e865a0f..a02aaa3 100644 --- a/Pipfile +++ b/Pipfile @@ -8,6 +8,7 @@ pylint = "*" [packages] psycopg2 = "*" +flask = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 43c24e1..502a5ff 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1a8d864dbfc9670ef3ce2ec28f3f174da0bdeab89a4c79c12b5aa9486b8770ef" + "sha256": "da16bb60c1de007d8f94358351fd693711e6cabca5199ddb2b0c14d9da227c5a" }, "pipfile-spec": 6, "requires": { @@ -16,6 +16,73 @@ ] }, "default": { + "click": { + "hashes": [ + "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", + "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" + ], + "version": "==7.1.2" + }, + "flask": { + "hashes": [ + "sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060", + "sha256:8a4fdd8936eba2512e9c85df320a37e694c93945b33ef33c89946a340a238557" + ], + "index": "pypi", + "version": "==1.1.2" + }, + "itsdangerous": { + "hashes": [ + "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", + "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" + ], + "version": "==1.1.0" + }, + "jinja2": { + "hashes": [ + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" + ], + "version": "==2.11.2" + }, + "markupsafe": { + "hashes": [ + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", + "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", + "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", + "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", + "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", + "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", + "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", + "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", + "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", + "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", + "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", + "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", + "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + ], + "version": "==1.1.1" + }, "psycopg2": { "hashes": [ "sha256:132efc7ee46a763e68a815f4d26223d9c679953cd190f1f218187cb60decf535", @@ -34,6 +101,13 @@ ], "index": "pypi", "version": "==2.8.5" + }, + "werkzeug": { + "hashes": [ + "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", + "sha256:6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c" + ], + "version": "==1.0.1" } }, "develop": { diff --git a/api.py b/api.py new file mode 100644 index 0000000..1690a7b --- /dev/null +++ b/api.py @@ -0,0 +1,35 @@ +import flask +from flask import request, jsonify + +app = flask.Flask(__name__) +app.config["DEBUG"] = True + +# Create some test data +zipcode = [ + {'id': 0, + 'zipcode': '98121', + 'population': '2123223' + }, + {'id': 1, + 'zipcode': '98122', + 'population': '33244' + }, + {'id': 2, + 'zipcode': '98123', + 'population': '2134' + } +] + + +@app.route('/', methods=['GET']) +def home(): + return "

Public API offered by the team at SeattleMatrix.

This \ + site is a collection of api's from various public sources collected \ + by the team at Seattle Matrix

" + +# A route to return all of the available entries in our catalog. +@app.route('/v1/kingcounty/covid-19/zipcode/all', methods=['GET']) +def api_all(): + return jsonify(zipcode) + +app.run() diff --git a/create_covid-19_zip.py b/create_covid-19_zip.py index 042d7a5..43e9a6a 100644 --- a/create_covid-19_zip.py +++ b/create_covid-19_zip.py @@ -1,19 +1,21 @@ import psycopg2 -conn = psycopg2.connect("host='localhost' dbname='king_county_wa' user='postgres' password='postgres'" ) +conn = psycopg2.connect("host='localhost' dbname='apiv1' user='postgres' password='postgres'" ) cur = conn.cursor() cur.execute(""" - CREATE TABLE covid19_zip( - zipcode varchar(5), - population int4, - tests int4, - test_Rate varchar(10), - positives int4, - positive_rate varchar(10), - hospitalizations int4, - hospitalization_rate varchar(10), - deaths int4, - death_rate varchar(10) -) + CREATE TABLE king_county_covid19_zip( + id SERIAL PRIMARY KEY, + date_added DATE NOT NULL DEFAULT CURRENT_DATE, + date_data DATE, + zipcode TEXT, + population INTEGER, + tests INTEGER, + test_rate TEXT, + positives INTEGER, + positive_rate TEXT, + hospitalizations INTEGER, + hospitalization_rate TEXT, + deaths INTEGER, + death_rate TEXT) """) conn.commit() diff --git a/load_db.py b/load_db.py index cefeb30..1333458 100644 --- a/load_db.py +++ b/load_db.py @@ -1,17 +1,25 @@ import psycopg2 import csv -conn = psycopg2.connect("host='localhost' dbname='king_county_wa' user='postgres' password='postgres'" ) +from datetime import datetime + +conn = psycopg2.connect("host='localhost' dbname='apiv1' user='postgres' password='postgres'" ) cur = conn.cursor() -with open('covid-19_zip.csv', 'r') as f: +# take the source data csv and upload to the database. +# hardcoded to 20200810 right now +data_date = "20200810" +source_file = "covid-19_" +data_date+"_zip.csv" + +with open(source_file, 'r') as f: reader = csv.reader(f) next(reader) # Skip the header row. for row in reader: - #print(row) cur.execute( - "INSERT INTO covid19_zip VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", row + "INSERT INTO king_county_covid19_zip(date_data, zipcode, population, tests, test_rate, \ + positives, positive_rate, hospitalizations, hospitalization_rate, deaths, death_rate) \ + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", + (data_date,row[0],row[1],row[2],row[3],row[4],row[5],row[6],row[7],row[8],row[9]) ) -conn.commit() -cur.execute('SELECT * FROM covid19_zip') \ No newline at end of file +conn.commit()