Feat: User Relationships and Session Members.

This commit is contained in:
2026-02-28 19:53:50 +00:00
parent c7db290aaf
commit e8e9a02e7b
73 changed files with 3818 additions and 571 deletions

View File

@@ -59,7 +59,7 @@ class DataStore_Base(BaseModel):
proc_string += f'{"" if i == 0 else ", "}{param_name} := {param_expr}'
proc_string += ')'
stmt = text(proc_string)
Helper_App.console_log(f'{_m}\nproc_string: {stmt}\nargs: {argument_dict_list}')
# Helper_App.console_log(f'{_m}\nproc_string: {stmt}\nargs: {argument_dict_list}')
rows = []
with db.engine.connect().execution_options(isolation_level="AUTOCOMMIT") as conn:
@@ -70,7 +70,7 @@ class DataStore_Base(BaseModel):
# Fetch all rows as mappings before connection closes
if result.returns_rows:
rows = result.mappings().fetchall()
Helper_App.console_log(f'result: {rows}')
# Helper_App.console_log(f'result: {rows}')
return rows
# Map SQLAlchemy types to PostgreSQL type names for CAST()
@@ -108,49 +108,49 @@ class DataStore_Base(BaseModel):
func_string += ')'
stmt = text(func_string)
Helper_App.console_log(f'{_m}\nfunc_string: {stmt}\nargs: {argument_dict_list}')
# Helper_App.console_log(f'{_m}\nfunc_string: {stmt}\nargs: {argument_dict_list}')
if has_arguments:
result = db.session.execute(stmt, argument_dict_list)
else:
result = db.session.execute(stmt)
Helper_App.console_log(f'result: {result}')
# Helper_App.console_log(f'result: {result}')
return result
@staticmethod
def db_cursor_clear(cursor):
while cursor.nextset():
Helper_App.console_log(f'unexpected result set: {cursor.fetchall()}')
Helper_App.console_log(f'db_cursor_clear\nunexpected result set: {cursor.fetchall()}')
@staticmethod
def get_user_session():
Helper_App.console_log('DataStore_Base.get_user_session')
# Helper_App.console_log('DataStore_Base.get_user_session')
user = User.from_json(session.get(User.FLAG_USER))
"""
if user.user_id <= 0:
user.user_id = 3
"""
Helper_App.console_log(f'User: {user}')
# Helper_App.console_log(f'User: {user}')
return user
@staticmethod
def upload_bulk(permanent_table_name, records, batch_size):
_m = 'DataStore_Base.upload_bulk'
Helper_App.console_log(f'{_m}\nstarting...')
Helper_App.console_log(f'permanent_table_name: {permanent_table_name}')
# Helper_App.console_log(f'{_m}\nstarting...')
# Helper_App.console_log(f'permanent_table_name: {permanent_table_name}')
if db.session.dirty or db.session.new or db.session.deleted:
Helper_App.console_log("Session is not clean")
# Helper_App.console_log("Session is not clean")
return
# Assuming `permanent_table_name` is a string representing the table name
table_object = db.metadata.tables.get(permanent_table_name)
Helper_App.console_log(f'Tables: {list(db.metadata.tables.keys())}')
# Helper_App.console_log(f'Tables: {list(db.metadata.tables.keys())}')
if table_object is None:
Helper_App.console_log(f"Table {permanent_table_name} not found in metadata.")
# Helper_App.console_log(f"Table {permanent_table_name} not found in metadata.")
return
else:
expected_columns = set(column.name for column in db.inspect(table_object).columns)
Helper_App.console_log(f'table name: {table_object.name}')
Helper_App.console_log(f'expected_columns: {expected_columns}')
# else:
# expected_columns = set(column.name for column in db.inspect(table_object).columns)
# Helper_App.console_log(f'table name: {table_object.name}')
# Helper_App.console_log(f'expected_columns: {expected_columns}')
max_retries = 3
initial_backoff = 1
for i in range(0, len(records), batch_size):
@@ -180,7 +180,7 @@ class DataStore_Base(BaseModel):
except Exception as e:
db.session.rollback()
raise e
Helper_App.console_log(f'Records uploaded in batches.')
# Helper_App.console_log(f'Records uploaded in batches.')
@classmethod
def get_many_error(cls, guid):
@@ -189,23 +189,23 @@ class DataStore_Base(BaseModel):
arguments = Parameters_SQL_Error.get_default(guid)
argument_dict = arguments.to_json()
argument_types = Parameters_SQL_Error.get_type_hints()
Helper_App.console_log(f'{_m}\nargument_dict: {argument_dict}')
# Helper_App.console_log(f'{_m}\nargument_dict: {argument_dict}')
errors = []
try:
error_result = cls.db_function_execute('tcg.public.FN_Error_Get_Many', argument_dict, argument_types)
error_result_set = error_result.fetchall()
Helper_App.console_log(f'raw errors: {error_result_set}')
# Helper_App.console_log(f'raw errors: {error_result_set}')
errors = []
error_indexes = {}
for row in error_result_set:
new_error = SQL_Error.from_db_error(row)
error_indexes[new_error.error_id] = len(errors)
errors.append(new_error)
Helper_App.console_log(f'error {str(type(new_error))}: {new_error}')
# Helper_App.console_log(f'error {str(type(new_error))}: {new_error}')
except Exception as e:
Helper_App.console_log(f'Error: {str(e)}')
# Helper_App.console_log(f'Error: {str(e)}')
error = SQL_Error()
error.msg = str(e)
errors.append(error)
@@ -219,7 +219,7 @@ class DataStore_Base(BaseModel):
arguments = Parameters_SQL_Error.get_default(guid)
argument_dict = arguments.to_json()
argument_types = Parameters_SQL_Error.get_type_hints()
Helper_App.console_log(f'{_m}\nargument_dict: {argument_dict}')
# Helper_App.console_log(f'{_m}\nargument_dict: {argument_dict}')
cls.db_procedure_execute('tcg.public.USP_Error_Clear', argument_dict, argument_types)