From 8565a96e15a64e2dafbc9e0b94f1dfb6d13e424c Mon Sep 17 00:00:00 2001
From: Davte <davte@libero.it>
Date: Sun, 5 Jan 2020 19:33:05 +0100
Subject: [PATCH] Add `users` table with its fields if missing

Refactoring of previous version patch
---
 davtelepot/__init__.py |  2 +-
 davtelepot/bot.py      | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/davtelepot/__init__.py b/davtelepot/__init__.py
index 9c8f661..39b3a01 100644
--- a/davtelepot/__init__.py
+++ b/davtelepot/__init__.py
@@ -14,7 +14,7 @@ __author__ = "Davide Testa"
 __email__ = "davide@davte.it"
 __credits__ = ["Marco Origlia", "Nick Lee @Nickoala"]
 __license__ = "GNU General Public License v3.0"
-__version__ = "2.3.14"
+__version__ = "2.3.15"
 __maintainer__ = "Davide Testa"
 __contact__ = "t.me/davte"
 
diff --git a/davtelepot/bot.py b/davtelepot/bot.py
index 53f603e..e217b0d 100644
--- a/davtelepot/bot.py
+++ b/davtelepot/bot.py
@@ -217,6 +217,19 @@ class Bot(TelegramBot, ObjectWithDatabase, MultiLanguageObject):
         self._log_file_name = None
         self._errors_file_name = None
         self.placeholder_requests = dict()
+        # Add `users` table with its fields if missing
+        self.db['users'].upsert(
+            dict(
+                telegram_id=000000000,
+                privileges=100,
+                username="username",
+                first_name="First",
+                last_name="Last",
+                language_code="en",
+                selected_language_code="en"
+            ),
+            ['telegram_id']
+        )
         return
 
     @property
@@ -2464,19 +2477,6 @@ class Bot(TelegramBot, ObjectWithDatabase, MultiLanguageObject):
 
     def setup(self):
         """Make bot ask for updates and handle responses."""
-        with self.db as db:
-            if 'users' not in db:
-                db['users'].insert(
-                    dict(
-                        telegram_id=9999999999,
-                        privileges=100,
-                        username="username",
-                        first_name="First",
-                        last_name="Last",
-                        language_code="en",
-                        selected_language_code="en"
-                    )
-                )
         if not self.webhook_url:
             asyncio.ensure_future(self.get_updates())
         else: