Logování: current_log_user

bin/add-role

@@ -75,7 +75,7 @@ ur = db.UserRole(
 session.add(ur)
 session.flush()
 
-mo.util.log(None, db.LogType.user_role, ur.user_role_id, {
+mo.util.log(db.LogType.user_role, ur.user_role_id, {
     'action': 'assigned',
     'user_id': ur.user_id,
     'place_id': ur.place_id,

bin/create-user

@@ -27,7 +27,7 @@ user = db.User(
 session.add(user)
 session.flush()
 
-mo.util.log(None, db.LogType.user, user.user_id, {
+mo.util.log(db.LogType.user, user.user_id, {
     'action': 'created',
     'is_org': user.is_org,
     'is_admin': user.is_admin

mo/util.py

@@ -3,10 +3,12 @@
 import mo.db as db
 from typing import Any, Optional
 
+current_log_user: Optional[db.User] = None
 
-def log(who: Optional[db.User], type: db.LogType, what: int, details: Any):
+
+def log(type: db.LogType, what: int, details: Any):
     entry = db.Log(
-        changed_by=who.user_id if who else None,
+        changed_by=current_log_user.user_id if current_log_user else None,
         type=type,
         id=what,
         details=details,

requirements.txt

@@ -7,3 +7,4 @@ dateutils
 psycopg2
 sqlalchemy
 sqlacodegen
+bcrypt