From 565b3ae87a4d4d2a06cc2e0587cba284d3e3c0b6 Mon Sep 17 00:00:00 2001 From: mitsuha_s Date: Sun, 22 May 2022 21:26:27 +0000 Subject: [PATCH] remove handling exception in add_user method and change return value --- database_interaction.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/database_interaction.py b/database_interaction.py index cd125a3..14c40e2 100644 --- a/database_interaction.py +++ b/database_interaction.py @@ -1,6 +1,6 @@ import sqlite3 class Database(): - def __init__(self, path): + def __init__(self, path: str) -> None: self.conn = sqlite3.connect(path) self.cur = self.conn.cursor() self.cur.execute('CREATE TABLE IF NOT EXISTS users (id INTEGER, telegram_id NUMERIC NOT NULL UNIQUE, PRIMARY KEY(id))') @@ -8,12 +8,9 @@ class Database(): self.cur.execute('CREATE TABLE IF NOT EXISTS subscribes (user_id INTEGER, feed_id INTEGER, FOREIGN KEY(user_id) REFERENCES users(id), FOREIGN KEY(feed_id) REFERENCES feeds(id))') self.cur.execute('CREATE TABLE IF NOT EXISTS feeds_last_items (feed_id INTEGER, link TEXT NOT NULL UNIQUE, title TEXT, description TEXT, date NUMERIC, FOREIGN KEY(feed_id) REFERENCES feeds(id))') - def add_user(self, telegram_id): - try: - self.cur.execute('INSERT INTO users (telegram_id) VALUES (:telegram_id)', {'telegram_id': telegram_id}) - except sqlite3.IntegrityError: - return 1 - self.conn.commit() + def add_user(self, telegram_id: str) -> int: + self.cur.execute('INSERT INTO users (telegram_id) VALUES (:telegram_id)', {'telegram_id': telegram_id}) + return self.cur.lastrowid def add_rss_feed(): pass