Scan: Don't lookup from ldap (#256)

Lookup from db instead. Removes the lag when scanning a barcode.
flipdot · Nov 5, 2024 · 4506f6f · 4506f6f
1 parent d11b177
commit 4506f6f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/drinks_touch/screens/main.py b/drinks_touch/screens/main.py
@@ -8,7 +8,6 @@
 from elements.image import Image
 from elements.label import Label
 from elements.progress import Progress
-from users.users import Users
 from .names import NamesScreen
 from .screen import Screen
 
@@ -88,9 +87,9 @@ def on_barcode(self, barcode):
 
         if not barcode:
             return
-        user = Users.get_by_id_card(barcode)
-        if user:
-            ScreenManager.get_instance().set_active(ProfileScreen(self.screen, user))
+        account = Account.query.filter(Account.id_card == barcode).first()
+        if account:
+            ScreenManager.get_instance().set_active(ProfileScreen(self.screen, account))
 
     @staticmethod
     def __get_pos(i):

diff --git a/drinks_touch/screens/profile.py b/drinks_touch/screens/profile.py
@@ -269,9 +269,9 @@ def on_barcode(self, barcode):
             return
         self.processing.text = f"Gescannt: {barcode}"
         self.processing.is_visible = True
-        user = Users.get_by_id_card(barcode)
-        if user:
-            ScreenManager.get_instance().set_active(ProfileScreen(self.screen, user))
+        account = Account.query.filter(Account.id_card == barcode).first()
+        if account:
+            ScreenManager.get_instance().set_active(ProfileScreen(self.screen, account))
             self.processing.is_visible = False
             return
         drink = get_by_ean(barcode)

diff --git a/drinks_touch/screens/wait_scan.py b/drinks_touch/screens/wait_scan.py
@@ -3,6 +3,7 @@
 import logging
 
 import config
+from database.models import Account
 from database.models.scan_event import ScanEvent
 from database.storage import get_session
 from drinks.drinks import get_by_ean
@@ -13,7 +14,6 @@
 from screens.new_id_screen import NewIDScreen
 from screens.profile import ProfileScreen
 from tasks import CheckForUpdatesTask
-from users.users import Users
 from .git.main_screen import GitMainScreen
 from .main import MainScreen
 from .screen import Screen
@@ -209,9 +209,9 @@ def on_barcode(self, barcode):
             return
         self.processing.text = f"Gescannt: {barcode}"
         self.processing.is_visible = True
-        user = Users.get_by_id_card(barcode)
-        if user:
-            ScreenManager.get_instance().set_active(ProfileScreen(self.screen, user))
+        account = Account.query.filter(Account.id_card == barcode).first()
+        if account:
+            ScreenManager.get_instance().set_active(ProfileScreen(self.screen, account))
             self.processing.is_visible = False
             return
         drink = get_by_ean(barcode)