diff --git a/core/models/manage/insert.py b/core/models/manage/insert.py index 364ad11..0726a7f 100644 --- a/core/models/manage/insert.py +++ b/core/models/manage/insert.py @@ -20,7 +20,16 @@ from core.models.orm_models.Dependency import Dependency from core.models.orm_models.EncryptedProxy import EncryptedProxy -# This is the public interface, +from sqlalchemy import exists + + +@safe_db_operation +def verify_table_not_empty(model_class: Type, session: Session) -> DatabaseOperation: + """Checks if the table contains at least one record.""" + return session.query(exists().select_from(model_class)).scalar() + + +# This is the main public interface, def insert_into_model(model_class: Type, all_data: dict | list, override=False) -> DatabaseOperation: """ Purpose: @@ -38,7 +47,20 @@ def insert_into_model(model_class: Type, all_data: dict | list, override=False) data_list = all_data if isinstance(all_data, list) else [all_data] # Call the wrapped function with normalized data - return _wrapped_insert(model_class=model_class, data_list=data_list, override=override) + inserted = _wrapped_insert(model_class=model_class, data_list=data_list, override=override) + + if not inserted.valid: + return inserted + + not_blank = verify_table_not_empty(model_class) + + if not not_blank: + error_type = "Although it initally inserted, it returned blank." + logger.error(error_type) + return DatabaseOperation(valid=False, error_type=DBErrorType.UNKNOWN, message=error_type) + + logger.info("Confirmed it's not blank") + return inserted @safe_db_operation @@ -103,6 +125,8 @@ def _wrapped_insert(model_class: Type, data_list: dict | list, session: Session, message=f"Wrapped Insert Failed: {str(e)}" )) + + # =================== Isolation Test ====================== """ Spoof Failure of an operational error to trigger/test a migration diff --git a/core/services/profiles/change_location.py b/core/services/profiles/change_location.py index 713e79e..0f67ef1 100644 --- a/core/services/profiles/change_location.py +++ b/core/services/profiles/change_location.py @@ -91,10 +91,3 @@ def change_location_server( ticket_observer=observer_stash.ticket_observer, connection_observer=observer_stash.connection_observer ) - - - # if not server_side_changed.valid: - # return server_side_changed.wrap("server-side failed") - - -# return Result(valid=True)