Debug logging implementation and changes to the User entcryption
This commit is contained in:
+9
-3
@@ -4461,6 +4461,7 @@ 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')))
|
||||
@@ -4503,8 +4504,10 @@ def api_item_detail(item_id):
|
||||
if rec.get('Status') == 'active' and rec.get('User'):
|
||||
try:
|
||||
user_raw = rec.get('User')
|
||||
if user_raw is not None:
|
||||
borrower_value = decrypt_text(str(user_raw))
|
||||
user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)}) if user_raw else None
|
||||
app.logger.debug(f"Line 4508: Found user_doc for borrower: {user_doc}")
|
||||
if user_doc:
|
||||
borrower_value = decrypt_text(str(user_doc.get('SchülerName', ''))) if user_doc.get('SchülerName') else str(user_doc.get('AusweisId', ''))
|
||||
except Exception:
|
||||
borrower_value = str(rec.get('User', ''))
|
||||
break
|
||||
@@ -4512,8 +4515,10 @@ def api_item_detail(item_id):
|
||||
if not borrower_value and item.get('User'):
|
||||
try:
|
||||
item_user = item.get('User')
|
||||
app.logger.debug(f"Line 4518: Found item_user for borrower: {item_user}")
|
||||
if item_user is not None:
|
||||
borrower_value = decrypt_text(str(item_user))
|
||||
app.logger.debug(f"Line 4521: Decrypted borrower_value from item.User: {borrower_value}")
|
||||
except Exception:
|
||||
borrower_value = str(item.get('User', ''))
|
||||
|
||||
@@ -4530,6 +4535,7 @@ def api_item_detail(item_id):
|
||||
|
||||
for rec in borrow_records[:3]:
|
||||
user_raw = rec.get('User')
|
||||
app.logger.debug(f"Line 4538: Processing borrow record: {rec}")
|
||||
try:
|
||||
user = decrypt_text(user_raw) if user_raw is not None else ''
|
||||
except Exception:
|
||||
@@ -4556,7 +4562,7 @@ def api_item_detail(item_id):
|
||||
<p><strong>Kategorie:</strong> {html.escape(str(item.get('library_category', '-')))}</p>
|
||||
<p><strong>Beschreibung:</strong> {html.escape(str(item.get('Beschreibung', '-')))}</p>
|
||||
<p><strong>Status:</strong> {html.escape(str(status_label))}</p>
|
||||
{f'<p><strong>Ausgeliehen von:</strong> {html.escape(str(decrypt_text(borrower_value)))}</p>' if borrower_value and status_label == 'Ausgeliehen' else ''}
|
||||
{f'<p><strong>Ausgeliehen von:</strong> {html.escape(str(borrower_value))}</p>' if borrower_value and status_label == 'Ausgeliehen' else ''}
|
||||
{borrows_html}
|
||||
"""
|
||||
ctx = get_tenant_context()
|
||||
|
||||
Reference in New Issue
Block a user