From b2468056c47a7b40d6ba1f06960b36b1ccb9d5c7 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Thu, 1 Aug 2019 13:12:49 +0100 Subject: [PATCH] Remove duplicated queries --- common/database_helpers.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/database_helpers.py b/common/database_helpers.py index 3385f348..8471564c 100644 --- a/common/database_helpers.py +++ b/common/database_helpers.py @@ -46,6 +46,7 @@ def get_count(self): self.execute_query() return self.base_query.count() + class ReadQuery(Query): def __init__(self, table): @@ -57,14 +58,16 @@ def execute_query(self): def get_single_result(self): self.execute_query() - if self.base_query.first() is not None: - return self.base_query.first() + result = self.base_query.first() + if result is not None: + return result raise MissingRecordError(" No result found") def get_all_results(self): self.execute_query() - if self.base_query.all() is not None: - return self.base_query.all() + results = self.base_query.all() + if results is not None: + return results raise MissingRecordError(" No results found")