From feef909c61859e21e75a08a2dcca41fbd7071fc7 Mon Sep 17 00:00:00 2001 From: mitsuha_s Date: Wed, 13 Jul 2022 20:39:17 +0000 Subject: [PATCH] add __convert_to_list_of_dicts method --- database.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/database.py b/database.py index 6d8c947..357bcc8 100644 --- a/database.py +++ b/database.py @@ -121,24 +121,24 @@ class Database: subscribers = self.cur.fetchall() return list(map(lambda x: x['telegram_id'], subscribers)) - def find_feeds(self) -> list[DictRow]: + def find_feeds(self) -> list[dict]: """Get a list of feeds.""" self.log.debug('find_feeds()') self.cur.execute('SELECT * FROM feeds') - return self.cur.fetchall() + return self.__convert_to_list_of_dicts(self.cur.fetchall()) - def find_user_feeds(self, user_id: int) -> list[DictRow]: + def find_user_feeds(self, user_id: int) -> list[dict]: """Return a list of feeds the user is subscribed to.""" self.log.debug('find_user_feeds(user_id=\'%s\')', user_id) self.cur.execute('SELECT * FROM feeds WHERE id IN (SELECT feed_id FROM subscriptions WHERE user_id = %s)', - [user_id]) - return self.cur.fetchall() + [user_id]) + return self.__convert_to_list_of_dicts(self.cur.fetchall()) - def find_feed_items(self, feed_id: int) -> list[DictRow]: + def find_feed_items(self, feed_id: int) -> list[dict]: """Get last feed items.""" self.log.debug('find_feed_items(feed_id=\'%s\')', feed_id) self.cur.execute('SELECT * FROM feeds_last_items WHERE feed_id = %s', [feed_id]) - return self.cur.fetchall() + return self.__convert_to_list_of_dicts(self.cur.fetchall()) def find_feed_items_urls(self, feed_id: int) -> list[str]: """Return urls last feed items""" @@ -180,3 +180,8 @@ class Database: ' description TEXT' ')' ) + + @staticmethod + def __convert_to_list_of_dicts(rows: list[DictRow]) -> list[dict]: + """Convert list of DictRows to list of dicts""" + return list(map(lambda x: dict(x), rows))