Fix: Login.

business_objects/tcg/user.py

@@ -1,7 +1,7 @@
 """
-Project:    PARTS Website
+Project:    Magic Tracker
 Author:     Edward Middleton-Smith
-            Precision And Research Technology Systems Limited
+            Shuffle & Skirmish
 
 Technology: Business Objects
 Feature:    User Business Object
@@ -17,7 +17,7 @@ from helpers.helper_app import Helper_App
 # external
 from dataclasses import dataclass
 from typing import ClassVar, Optional
-from sqlalchemy.types import Text, Boolean
+from sqlalchemy.types import Text, Boolean, Integer
 
 
 class User(SQLAlchemy_ABC, Base):
@@ -138,6 +138,7 @@ User (
 
 
 class Parameters_User(Get_Many_Parameters_Base):
+    access_user_id: int
     # user_id: Optional[int]
     # auth0_user_id: str
     get_all_user: bool
@@ -155,12 +156,12 @@ class Parameters_User(Get_Many_Parameters_Base):
 
 
     @classmethod
-    def from_form_filters_user(cls, form):
+    def from_form_filters_user(cls, form, user_id_session):
         _m = f'{cls.__qualname__}.from_form_filters_user'
         av.val_instance(form, 'form', _m, Filters_User)
         get_inactive = not av.input_bool(form.active_only.data, "active", _m)
         # user_id = '' if form.user_id.data is None else form.user_id.data
-        filters = cls.get_default()
+        filters = cls.get_default(user_id_session)
         filters.get_all_user = True # (user_id == '')
         filters.get_inactive_user = get_inactive
         filters.user_ids = '' # user_id
@@ -170,11 +171,11 @@ class Parameters_User(Get_Many_Parameters_Base):
         # filters.require_all_non_id_filters_met = False
         # filters.require_any_non_id_filters_met = True
         return filters
-    
+
     @classmethod
-    def from_user(cls, user):
+    def from_user(cls, user, user_id_session):
         av.val_instance(user, 'user', 'Parameters_User.from_user', User)
-        filters = cls.get_default()
+        filters = cls.get_default(user_id_session)
         filters.get_all_user = ((user.user_id is None or user.user_id == 0) and user.user_auth0_id is None)
         filters.get_inactive_user = False
         filters.user_ids = '' if user.user_id is None else str(user.user_id)
@@ -182,13 +183,14 @@ class Parameters_User(Get_Many_Parameters_Base):
         # filters.names_user = user.get_name()
         # filters.emails_user = user.email
         return filters
-    
+
     @classmethod
-    def get_default(cls):
+    def get_default(cls, user_id_session):
         return cls(
-              # user_id = None
+              access_user_id = user_id_session
+            # , user_id = None
             # , auth0_user_id = ''
-              get_all_user = False
+            , get_all_user = False
             , get_inactive_user = False
             , user_ids = ''
             # , user_auth0_ids = ''
@@ -205,9 +207,10 @@ class Parameters_User(Get_Many_Parameters_Base):
         pass
     def to_json(self):
         return {
-            # 'a_user_id': self.user_id
+              'a_access_user_id': self.access_user_id
+            # , 'a_user_id': self.user_id
             # , 'a_auth0_user_id': self.auth0_user_id
-              'a_get_all_user': self.get_all_user
+            , 'a_get_all_user': self.get_all_user
             , 'a_get_inactive_user': self.get_inactive_user
             , 'a_user_ids': self.user_ids
             # , 'a_user_auth0_ids': self.user_auth0_ids
@@ -221,7 +224,8 @@ class Parameters_User(Get_Many_Parameters_Base):
     @staticmethod
     def get_type_hints():
         return {
-              'a_get_all_user': Boolean
+              'a_access_user_id': Integer
+            , 'a_get_all_user': Boolean
             , 'a_get_inactive_user': Boolean
             , 'a_user_ids': Text
             , 'a_require_all_id_filters_met': Boolean