Skip to content

Commit

Permalink
Updated init.sql (#101)
Browse files Browse the repository at this point in the history 
* Updated init.sql

* Changed combined risk table name to match init.sql
  • Loading branch information
@AdamFinkle
AdamFinkle authored Nov 24, 2024
1 parent 5e4dfe7 commit b534fcc
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 53 deletions.
2 changes: 1 addition & 1 deletion backend/api/models/combined_risk.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


class CombinedRisk(Base):
__tablename__ = "combined_risks"
__tablename__ = "combined_risk"

id = Column(Integer, primary_key=True, autoincrement=True)
address = Column(String(50), nullable=False, unique=True)
Expand Down
143 changes: 91 additions & 52 deletions backend/database/init.sql
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,96 @@
/* Disclaimer: this is mock data. It should not be relied upon to determine any property’s safety or compliance with the soft story program.*/

-- Create PostGIS extension
CREATE EXTENSION IF NOT EXISTS postgis;

SET search_path TO public;

/*CREATE TABLE IF NOT EXISTS addresses (
eas_baseid INTEGER NOT NULL,
eas_subid INTEGER NOT NULL,
eas_fullid VARCHAR(255) PRIMARY KEY,
address VARCHAR(255) NOT NULL,
unit_number VARCHAR(255),
address_number INTEGER,
address_number_suffix VARCHAR(255) NOT NULL,
street_name VARCHAR(255) NOT NULL,
street_type VARCHAR(255),
parcel_number VARCHAR(255),
block VARCHAR(255),
lot VARCHAR(255),
cnn INTEGER,
longitude FLOAT NOT NULL,
latitude FLOAT NOT NULL,
zip_code INTEGER NOT NULL,
point GEOGRAPHY(POINT, 4326) NOT NULL,
supdist VARCHAR(255),
supervisor INTEGER,
supdistpad VARCHAR(255),
numbertext VARCHAR(255),
supname VARCHAR(255),
nhood VARCHAR(255),
complete_landmark_name VARCHAR(255),
sfdata_as_of DATE NOT NULL,
sfdata_loaded_at TIMESTAMP NOT NULL
create extension if not exists postgis;

set search_path to public;

create table if not exists address (
eas_baseid integer not null,
eas_subid integer not null,
eas_fullid varchar(255) primary key,
address varchar(255) not null,
unit_number varchar(255),
address_number integer,
address_number_suffix varchar(255) not null,
street_name varchar(255) not null,
street_type varchar(255),
parcel_number varchar(255),
block varchar(255),
lot varchar(255),
cnn integer,
longitude float not null,
latitude float not null,
zip_code integer not null,
point geography(point, 4326) not null,
supdist varchar(255),
supervisor integer,
supdistpad varchar(255),
numbertext varchar(255),
supname varchar(255),
nhood varchar(255),
complete_landmark_name varchar(255),
sfdata_as_of date not null,
sfdata_loaded_at timestamp not null
);

-- Potential functions to creat a Point: ST_MakePoint(-122.41228, 37.77967); ST_GeomFromText('POINT(-122.41228, 37.77967)', 4326); ST_SetSRID(ST_MakePoint(-122.41228, 37.77967), 4326)

insert into address (eas_baseid, eas_subid, eas_fullid, address, unit_number, address_number, address_number_suffix, street_name, street_type, parcel_number, block, lot, cnn, longitude, latitude, zip_code, point, supdist, supervisor, supdistpad, numbertext, supname, nhood, complete_landmark_name, sfdata_as_of, sfdata_loaded_at) values
(495990, 764765, '495990-764765-0', '46 AUBURN ST', '', 46, '', 'AUBURN', 'ST', '', '', '', 830000, -122.41228, 37.77967, 94133, ST_SetSRID(ST_MakePoint(-122.41228, 37.77967), 4326), 'SUPERVISORIAL DISTRICT 3', 3, 3, 'THREE', 'Aaron Peskin', 'Nob Hill', '', '2024/10/28 03:40:00 AM', '2024/10/28 10:11:26 PM');


create table if not exists combined_risk (
id serial primary key,
address varchar(50) not null unique,
soft_story_risk boolean not null default false,
seismic_hazard_risk boolean not null default false,
landslide_risk boolean not null default false,
liquefaction_risk boolean not null default false
);

-- Potential functions to create a Point: ST_MakePoint(-122.41228, 37.77967); ST_GeomFromText('POINT(-122.41228, 37.77967)', 4326); ST_SetSRID(ST_MakePoint(-122.41228, 37.77967), 4326)
INSERT INTO addresses (eas_baseid, eas_subid, eas_fullid, address, unit_number, address_number, address_number_suffix, street_name, street_type, parcel_number, block, lot, cnn, longitude, latitude, zip_code, point, supdist, supervisor, supdistpad, numbertext, supname, nhood, complete_landmark_name, sfdata_as_of, sfdata_loaded_at)
VALUES
(495990, 764765, '495990-764765-0', '46 AUBURN ST', '', 46, '', 'AUBURN', 'ST', '', '', '', 830000, -122.41228, 37.77967, 94133, ST_SetSRID(ST_MakePoint(-122.41228, 37.77967), 4326), 'SUPERVISORIAL DISTRICT 3', 3, 3, 'THREE', 'Aaron Peskin', 'Nob Hill', '', '2024/10/28 03:40:00 AM', '2024/10/28 10:11:26 PM');
*/
CREATE TABLE IF NOT EXISTS combined_risks (
id SERIAL PRIMARY KEY,
address VARCHAR(50) NOT NULL UNIQUE,
soft_story_risk BOOLEAN NOT NULL DEFAULT FALSE,
seismic_hazard_risk BOOLEAN NOT NULL DEFAULT FALSE,
landslide_risk BOOLEAN NOT NULL DEFAULT FALSE,
liquefaction_risk BOOLEAN NOT NULL DEFAULT FALSE

create table if not exists soft_story_addresses (
identifier integer not null,
block varchar(255),
lot varchar(255),
parcel_number varchar(255),
property_address varchar(255),
address varchar(255),
tier integer,
status varchar(255),
bos_district integer,
--point: Mapped[Geometry] = mapped_column(Geometry("POINT", srid=4326))
sfdata_as_of timestamp,
sfdata_loaded_at timestamp
--update_timestamp timestamp
);

INSERT INTO combined_risks (address, soft_story_risk, seismic_hazard_risk, landslide_risk, liquefaction_risk) VALUES
('3560 PIERCE ST, SAN FRANCISCO CA', TRUE, FALSE, FALSE, FALSE),
('3484 18TH ST, SAN FRANCISCO CA', TRUE, TRUE, FALSE, TRUE),
('175 ALHAMBRA ST, SAN FRANCISCO CA', FALSE, FALSE, FALSE, FALSE),
('106 HAIGHT ST, SAN FRANCISCO CA', TRUE, TRUE, TRUE, TRUE),
('3852 CALIFORNIA ST, SAN FRANCISCO CA', FALSE, TRUE, FALSE, TRUE)
;
insert into combined_risk (address, soft_story_risk, seismic_hazard_risk, landslide_risk, liquefaction_risk) values
('3560 PIERCE ST, SAN FRANCISCO CA', true, false, false, false),
('3484 18TH ST, SAN FRANCISCO CA', true, true, false, true),
('175 ALHAMBRA ST, SAN FRANCISCO CA', false, false, false, false),
('106 HAIGHT ST, SAN FRANCISCO CA', true, true, true, true),
('3852 CALIFORNIA ST, SAN FRANCISCO CA', false, true, false, true);

--add point column between bos_district and sfdata_as_of
--Here they are in order for our rows
--POINT (-122.424966202 37.762929444)
--POINT (-122.412108664 37.805406258)
--POINT (-122.507457108 37.756334425)
--POINT (-122.444181708 37.771944708)
--POINT (-122.479013074 37.764537366)
--POINT (-122.400877183 37.753556427)

--add update_timestamp column after sfdata_loaded_at
--this column will be filled with data generated at runtime by our code

--status column is a varchar in the database but must be transformed into a boolean for use
--possibly keep the booleans in the transformed database in memory between updates

insert into soft_story_addresses (identifier, block, lot, parcel_number, property_address, address, tier, status, bos_district, sfdata_as_of, sfdata_loaded_at) values
(1, 3578, 71, 3578071, '3549 17TH ST', '3549 17TH ST, SAN FRANCISCO CA', 3, 'Work Complete CFC Issued', 8, '2024/11/04 03:18:13 AM', '2024/11/04 03:30:26 AM'),
(2, 41, 4, 41004, '2231 POWELL ST', '2231 POWELL ST, SAN FRANCISCO CA', 3, 'Non-Compliant', 3, '2024/11/04 03:18:13 AM', '2024/11/04 03:30:26 AM'),
(3, 1896, 46, 1896046, '1612 48TH AV', '1612 48TH AV, SAN FRANCISCO CA', 3, 'Work Complete, CFC Issued', 4, '2024/11/04 03:18:13 AM', '2024/11/04 03:30:26 AM'),
(4, 1222, 55, 1222055, '253 CENTRAL AV', '253 CENTRAL AV, SAN FRANCISCO CA', 3, 'Work Complete, CFC Issued', 5, '2024/11/04 03:18:13 AM', '2024/11/04 03:30:26 AM'),
(5, 1730, 49, 1730049, '1240 21ST AV', '1240 21ST AV, SAN FRANCISCO CA', 3, 'Work Complete, CFC Issued', 4, '2024/11/04 03:18:13 AM', '2024/11/04 03:30:26 AM'),
(6, 4217, 12, 4217012, '2120 24TH ST', '2120 24TH ST, SAN FRANCISCO CA', 3, 'Work Complete, CFC Issued', 10, '2024/11/04 03:18:13 AM', '2024/11/04 03:30:26 AM');

0 comments on commit b534fcc

Please sign in to comment.