From cc8e3d799d67f6964ef936ba47727e0650668245 Mon Sep 17 00:00:00 2001 From: Conrad Date: Wed, 14 Jun 2017 16:55:34 -0400 Subject: [PATCH 1/5] Use new building search parameters --- app/models/building.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/building.py b/app/models/building.py index 86cc4c9..b9d3a73 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) -- GitLab From 1eb073aadbff50ecde58f61657792d21c5b3cfd8 Mon Sep 17 00:00:00 2001 From: Conrad Date: Wed, 14 Jun 2017 16:55:48 -0400 Subject: [PATCH 2/5] Handle buildings that have multiple addresses --- app/controllers/building.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/building.py b/app/controllers/building.py index df19a02..dacad03 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -57,5 +57,10 @@ class BuildingController(RestController): if not building_list: raise NotFound + if len(building_list) > 1: + new_address = building_list[0].street_address + for building in building_list[1::]: + new_address += ', ' + building.street_address + building_list[0].street_address = new_address return building_list[0] -- GitLab From db6dae6f31adb39ba27be92e037f516e759b2039 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 19 Jun 2017 16:04:13 -0400 Subject: [PATCH 3/5] Update form to match new building search --- app/forms/building.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/forms/building.py b/app/forms/building.py index 9b0f022..0966af0 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() -- GitLab From 34c2d6b5006df825be37ae1838e1fd54068c198f Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 20 Jun 2017 12:24:37 -0400 Subject: [PATCH 4/5] Return list of addresses instead of comma seperated string --- app/controllers/building.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/building.py b/app/controllers/building.py index dacad03..72d1bb8 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -58,9 +58,9 @@ class BuildingController(RestController): if not building_list: raise NotFound if len(building_list) > 1: - new_address = building_list[0].street_address - for building in building_list[1::]: - new_address += ', ' + building.street_address - building_list[0].street_address = new_address + address_list = [] + for building in building_list: + address_list.append(building.street_address) + building_list[0].street_address = address_list return building_list[0] -- GitLab From 08eff8c7441b15358285fa72a6cba1531ff7aedc Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 20 Jun 2017 17:00:48 -0400 Subject: [PATCH 5/5] Return multiple street addresses as a list --- app/controllers/building.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/building.py b/app/controllers/building.py index 72d1bb8..84a197c 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -57,10 +57,9 @@ class BuildingController(RestController): if not building_list: raise NotFound - if len(building_list) > 1: - address_list = [] - for building in building_list: - address_list.append(building.street_address) - building_list[0].street_address = address_list + address_list = [] + for building in building_list: + address_list.append(building.street_address) + building_list[0].street_address = address_list return building_list[0] -- GitLab