diff --git a/app/controllers/building.py b/app/controllers/building.py index df19a02b841288eb6ce529b478650532a7acd84d..84a197c48121997d70de000fe02877540785b140 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -57,5 +57,9 @@ class BuildingController(RestController): if not building_list: raise NotFound + address_list = [] + for building in building_list: + address_list.append(building.street_address) + building_list[0].street_address = address_list return building_list[0] diff --git a/app/forms/building.py b/app/forms/building.py index 9b0f022f5b22b0fdfb028ad5a509b6258203157e..0966af0558ab1b812dc75135522acfe049fbc3b9 100644 --- a/app/forms/building.py +++ b/app/forms/building.py @@ -9,6 +9,6 @@ class BuildingForm: validators=[wtf.validators.Required(), wtf.validators.Length(max=200)]) bbl = wtf.IntegerField() borough = wtf.StringField(validators=wtf.validators.Length(max=2)) - zip_code = wtf.StringField(validators=[validators.zip_]) + zip = wtf.StringField(validators=[validators.zip_]) building_id = wtf.IntegerField() lot_id = wtf.IntegerField() diff --git a/app/models/building.py b/app/models/building.py index 86cc4c9197bac60957ff1a731cfecefec1af5086..b9d3a7398df2d7632fa75c64f918bb53120c35fa 100644 --- a/app/models/building.py +++ b/app/models/building.py @@ -7,28 +7,28 @@ class Building(BaseModel): __table_args__ = {"schema": "public"} PROCS = { - 'READ': 'get_building', + 'READ': 'building_search', } __table__ = ProcTable( 'Building', - ProcColumn('address'), + ProcColumn('street_address'), ProcColumn('bbl'), ProcColumn('borough'), ProcColumn('zipcode'), ProcColumn('building_id'), ProcColumn('lot_id'), - ProcColumn('bin_id'), + ProcColumn('bin'), ) - def __init__(self, address, bbl, borough, zipcode, building_id, lot_id, bin_id): - self.address = address + def __init__(self, street_address, bbl, borough, zipcode, building_id, lot_id, bin): + self.street_address = street_address self.bbl = bbl self.borough = borough self.zipcode = zipcode self.building_id = building_id self.lot_id = lot_id - self.bin_id = bin_id + self.bin = bin def __str__(self): - return "Building: {} located at {}".format(self.building_id, self.address) + return "Building: {} located at {}".format(self.building_id, self.street_address)