From 6537bb097db1ca0eaf02d99d5386ec262915dbc4 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Thu, 2 Nov 2017 16:04:42 -0400 Subject: [PATCH 1/2] Return addresses in bgroup view --- app/controllers/bgroup.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py index 0e918cd..18a7bcd 100644 --- a/app/controllers/bgroup.py +++ b/app/controllers/bgroup.py @@ -45,5 +45,17 @@ class BuildingBGroupController(RestController): def get(self, bgroup_id, filter_data): """Get all buildings in a group""" - q = self.query(filter_data).filter(self.Model.bgroup_id == bgroup_id).all() - return [model.get_dictionary() for model in q] + + query = ''' + SELECT + id, + building_bgroup.building_id, + string_agg(street_address || ' ' || zipcode, ', ') AS address_list + FROM groups.building_bgroup + JOIN vw_building_address ON (building_bgroup.building_id = vw_building_address.building_id) + WHERE bgroup_id = 2 + GROUP BY building_bgroup.building_id, id + '''.format(bgroup_id) + + results = self.db.session.execute(query) + return [dict(row) for row in results] -- GitLab From c19898fa40eea1891c027d60829940ea7be547a5 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Thu, 2 Nov 2017 16:47:41 -0400 Subject: [PATCH 2/2] Remove hardcoded number --- app/controllers/bgroup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py index 18a7bcd..edb0203 100644 --- a/app/controllers/bgroup.py +++ b/app/controllers/bgroup.py @@ -53,7 +53,7 @@ class BuildingBGroupController(RestController): string_agg(street_address || ' ' || zipcode, ', ') AS address_list FROM groups.building_bgroup JOIN vw_building_address ON (building_bgroup.building_id = vw_building_address.building_id) - WHERE bgroup_id = 2 + WHERE bgroup_id = {} GROUP BY building_bgroup.building_id, id '''.format(bgroup_id) -- GitLab