changes to the Username displayment

Web/app.py

@@ -164,13 +164,40 @@ def _display_username(user_value):
         return ''
 
     raw_value = str(user_value).strip()
-    user_doc = us.get_user_by_id(raw_value)
-    if not user_doc:
-        user_doc = us.get_user_by_student_card(raw_value)
-    if user_doc:
-        return str(user_doc.get('Username') or user_doc.get('username') or raw_value)
+    decrypted_value = decrypt_text(raw_value)
+    lookup_values = [raw_value]
+    if decrypted_value and decrypted_value not in lookup_values:
+        lookup_values.append(str(decrypted_value).strip())
 
-    return decrypt_text(raw_value)
+    for lookup_value in lookup_values:
+        user_doc = us.get_user_by_id(lookup_value)
+        if not user_doc:
+            user_doc = us.get_user_by_student_card(lookup_value)
+        if not user_doc:
+            user_doc = us.get_user_by_student_card_record_id(lookup_value)
+        if not user_doc:
+            user_doc = us.get_user(lookup_value)
+        if user_doc:
+            return str(user_doc.get('Username') or user_doc.get('username') or lookup_value)
+
+    client = None
+    try:
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        cards = get_tenant_db(client)['student_cards']
+        card_queries = [{'AusweisId': lookup_value} for lookup_value in lookup_values]
+        if ObjectId.is_valid(raw_value):
+            card_queries.insert(0, {'_id': ObjectId(raw_value)})
+        card = cards.find_one({'$or': card_queries}) if card_queries else None
+        if card:
+            card = _decrypt_student_card_doc(card)
+            card_name = str(card.get('SchülerName') or '').strip()
+            if card_name:
+                return card_name
+    finally:
+        if client:
+            client.close()
+
+    return str(decrypted_value or raw_value)
 
 
 def _resolve_library_card_id(user_value):
@@ -184,7 +211,11 @@ def _resolve_library_card_id(user_value):
         return str(user_doc.get('StudentCardId') or raw_value).strip().upper()
 
     decrypted_value = decrypt_text(raw_value)
-    user_doc = us.get_user_by_student_card(decrypted_value)
+    user_doc = us.get_user_by_id(decrypted_value)
+    if not user_doc:
+        user_doc = us.get_user_by_student_card(decrypted_value)
+    if not user_doc:
+        user_doc = us.get_user_by_student_card_record_id(decrypted_value)
     if user_doc:
         return str(user_doc.get('StudentCardId') or decrypted_value).strip().upper()
 
@@ -3573,7 +3604,7 @@ def library_loans_admin():
             fmt_reports, fmt_repairs = format_damage_history(raw_reports, raw_repairs)
 
             raw_user = record.get('User', '')
-            decrypted_user = safe_decrypt(raw_user)
+            decrypted_user = _display_username(raw_user)
 
             user_class = (
                     safe_decrypt(record.get('Klasse'))
@@ -4489,7 +4520,6 @@ def api_item_detail(item_id):
         db = client[MONGODB_DB]
         ausleihungen_col = db['ausleihungen']
         items_col = db['items']
-        student_cards_col = db['student_cards']
 
         # Determine parent/group id (if this is a child, use its ParentItemId)
         parent_id = str(item.get('ParentItemId') or str(item.get('_id')))
@@ -4530,15 +4560,7 @@ def api_item_detail(item_id):
         def get_borrower_name(user_raw):
             if not user_raw:
                 return ''
-            try:
-                user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)})
-                if user_doc:
-                    if user_doc.get('SchülerName'):
-                        return decrypt_text(str(user_doc.get('SchülerName', '')))
-                    return str(user_doc.get('AusweisId', ''))
-            except Exception:
-                pass
-            return str(user_raw)
+            return _display_username(user_raw)
 
         # Prefer the most recent active borrower across the group
         borrower_value = ''

Web/modules/database/user.py

@@ -707,6 +707,31 @@ def get_user_by_student_card(student_card_id):
     finally:
         client.close()
 
+
+def get_user_by_student_card_record_id(card_id):
+    """Return the user assigned to a student-card document ID."""
+    if card_id is None:
+        return None
+
+    client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
+    try:
+        db = _get_tenant_db(client)
+        card = None
+        if isinstance(card_id, ObjectId):
+            card = db['student_cards'].find_one({'_id': card_id})
+        elif ObjectId.is_valid(str(card_id)):
+            card = db['student_cards'].find_one({'_id': ObjectId(str(card_id))})
+        if not card:
+            return None
+
+        card_id_value = normalize_student_card_id(card.get('AusweisId'))
+        if not card_id_value:
+            return None
+        return db['users'].find_one({'StudentCardId': card_id_value})
+    finally:
+        client.close()
+
+
 def get_user_by_student_ident(student_ident):
     """Return user dict by student ident by decrypting all cards and matching."""
     if not student_ident: