From e267e3d9f10942621340827bf010250825c10b41 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 12 Aug 2020 09:45:22 +0100 Subject: [PATCH] Refactor to use .query All the other methods of this class call through to query, we can make this code clearer by making `get_areas` do the same. --- app/broadcast_areas/repo.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/app/broadcast_areas/repo.py b/app/broadcast_areas/repo.py index 6851758b2..bd06fccd9 100644 --- a/app/broadcast_areas/repo.py +++ b/app/broadcast_areas/repo.py @@ -123,24 +123,21 @@ class BroadcastAreasRepository(object): description = self.query(q, library_id)[0][0] return description - def get_areas(self, *area_ids): - with self.conn() as conn: - cursor = conn.cursor() + def get_areas(self, area_ids): + q = """ + SELECT id, name + FROM broadcast_areas + WHERE id IN ({}) + """.format(("?," * len(area_ids))[:-1]) - q = """ - SELECT id, name - FROM broadcast_areas - WHERE id IN ({}) - """.format(("?," * len(*area_ids))[:-1]) - cursor.execute(q, *area_ids) - results = cursor.fetchall() + results = self.query(q, *area_ids) - areas = [ - (row[0], row[1]) - for row in results - ] + areas = [ + (row[0], row[1]) + for row in results + ] - return areas + return areas def get_all_areas_for_library(self, library_id): q = """