diff --git a/business_objects/dog/user.py b/business_objects/dog/user.py index 70a9cae..eba19a3 100644 --- a/business_objects/dog/user.py +++ b/business_objects/dog/user.py @@ -16,7 +16,7 @@ from forms.base import Form_Filters_User from helpers.helper_app import Helper_App # external from dataclasses import dataclass -from typing import ClassVar +from typing import ClassVar, Optional class User(SQLAlchemy_ABC, Base): @@ -54,7 +54,7 @@ class User(SQLAlchemy_ABC, Base): user.is_super_user = av.input_bool(query_row[6], 'is_super_user', _m) user.can_admin_dog = av.input_bool(query_row[7], 'can_admin_dog', _m) user.can_admin_user = av.input_bool(query_row[8], 'can_admin_user', _m) - user.is_new = av.input_bool(query_row[9], 'is_new', _m) + # user.is_new = av.input_bool(query_row[9], 'is_new', _m) return user @staticmethod @@ -127,7 +127,8 @@ class User(SQLAlchemy_ABC, Base): class User_Temp(db.Model, Base): __tablename__ = 'DOG_User_Temp' __table_args__ = { 'extend_existing': True } - id_user = db.Column(db.Integer, primary_key=True) + id_temp = db.Column(db.Integer, primary_key=True) + id_user = db.Column(db.Integer) id_user_auth0 = db.Column(db.String(250)) firstname = db.Column(db.String(250)) surname = db.Column(db.String(250)) @@ -144,7 +145,7 @@ class User_Temp(db.Model, Base): class Parameters_User(Get_Many_Parameters_Base): - id_user: int + id_user: Optional[int] auth0_id_user: str get_all_user: bool get_inactive_user: bool @@ -182,7 +183,7 @@ class Parameters_User(Get_Many_Parameters_Base): filters.get_inactive_user = False filters.ids_user = '' if user.id_user is None else str(user.id_user) filters.ids_user_auth0 = user.id_user_auth0 - filters.names_user = user.firstname + ' ' + user.surname + filters.names_user = f'{user.firstname} {user.surname}' filters.emails_user = user.email return filters diff --git a/datastores/datastore_user.py b/datastores/datastore_user.py index 3661c34..25e1d93 100644 --- a/datastores/datastore_user.py +++ b/datastores/datastore_user.py @@ -100,7 +100,6 @@ class DataStore_User(DataStore_Base): users.append(user) Helper_App.console_log(f'user {str(type(user))}: {user}') - """ errors = [] cursor.nextset() result_set_e = cursor.fetchall() @@ -109,8 +108,8 @@ class DataStore_User(DataStore_Base): errors = [SQL_Error.from_DB_record(row) for row in result_set_e] for error in errors: Helper_App.console_log(f"Error [{error.code}]: {error.msg}") - """ - errors = None + # errors = None + DataStore_User.db_cursor_clear(cursor) return users, errors diff --git a/static/MySQL/10518_tbl_DOG_User_Temp.sql b/static/MySQL/10518_tbl_DOG_User_Temp.sql index 541daa7..e4546d5 100644 --- a/static/MySQL/10518_tbl_DOG_User_Temp.sql +++ b/static/MySQL/10518_tbl_DOG_User_Temp.sql @@ -10,7 +10,7 @@ WHERE CREATE TABLE IF NOT EXISTS parts.DOG_User_Temp ( id_temp INT NOT NULL AUTO_INCREMENT PRIMARY KEY - , id_user INT NOT NULL + , id_user INT , id_user_auth0 VARCHAR(200) , firstname VARCHAR(250) , surname VARCHAR(250)