General tidy.

This commit is contained in:
Andy Howard
2024-06-13 14:32:44 +01:00
parent 0c44e9ddd3
commit bf6bb966bc
159 changed files with 1166 additions and 972 deletions
@@ -78,7 +78,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
catch (Exception exc)
{
SetErrorState("Database query exception");
SaLogger.Warn(GetType().Name + ".GetSysParam\n\tQuery: " + dbCommand.CommandText + "\n\tException: " + exc.Message);
SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}");
}
}
return sysParam;
@@ -97,7 +97,6 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Insert SysParam.
public override bool InsertSysParam(SbmSysParam sysparam, DbUpdateInfo dbUpdateInfo)
{
String fn = GetType().Name + ".InsertSysParam";
ClearErrorState();
if (!IsValidSysParam(sysparam)) return false;
if (SysId.IsValid(sysparam.Id)) return SetErrorState(ErrorMessage.ValiditemId);
@@ -117,7 +116,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
dbSysParam.ExecuteInsertCommand(dbCommand);
sysparam.Id = new SysId(dbSysParam._Id);
sysparam.Changed = false;
if (DebugMode) SaLogger.Debug(fn + " Inserted. " + GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Inserted. {GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t")}");
}
catch (Exception exc) { SetErrorState(exc.Message); }
}
@@ -128,13 +127,12 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Update SysParam.
public override bool UpdateSysParam(SbmSysParam sysparam, DbUpdateInfo dbUpdateInfo)
{
String fn = GetType().Name + ".UpdateSysParam";
ClearErrorState();
if (!IsValidSysParam(sysparam)) return false;
if (!SysId.IsValid(sysparam.Id)) return SetErrorState(ErrorMessage.InvalidItemId);
if (!sysparam.Changed)
{
if (DebugMode) SaLogger.Debug(fn + " Data not changed. " + GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Data not changed. {GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t")}");
return true;
}
using (var dbConnection = db.CreateConnection())
@@ -152,7 +150,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
PopulateTo(dbSysParam, sysparam, dbUpdateInfo);
dbSysParam.ExecuteUpdateCommand(dbCommand);
sysparam.Changed = false;
if (DebugMode) SaLogger.Debug(fn + " Updated. " + GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Updated. {GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t")}");
// Record updates.
updateLogMonitor.RecordUpdatedValues(sysparam);
@@ -173,7 +171,6 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
}
public override bool DeleteSysParam(SbmSysParam sysparam, DbUpdateInfo dbUpdateInfo)
{
String fn = GetType().Name + ".DeleteSysParam";
ClearErrorState();
if (!SysParamCanBeDeleted(sysparam)) return false;
using (var dbConnection = db.CreateConnection())
@@ -190,7 +187,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
dbCommand.CommandText = "DELETE FROM " + SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SysParam) + " WHERE Id=" + SysId.ToString(sysparam.Id) + ";";
dbCommand.ExecuteNonQuery();
sysparam.Changed = false;
if (DebugMode) SaLogger.Debug(fn + " Deleted. " + GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Deleted. {GetLogProperties(sysparam).Concat(": ").Concat("", "\n\t")}");
}
catch (Exception exc) { SetErrorState(exc.Message); }
}
@@ -430,7 +427,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// SysParam list.
public override List<SbmSysParam> GetSysParamList(SbmSysParam.Params prm)
{
List<SbmSysParam> prmSysParams = new List<SbmSysParam>();
ClearErrorState();
List<SbmSysParam> sysParams = new List<SbmSysParam>();
DbQuery qry = new DbQuery(db.DbmsType);
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SysParam), aliasSysParam);
SysParam_Db dbSysParam = new SysParam_Db(DbInfo);
@@ -451,16 +449,17 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
{
dbSysParam = new SysParam_Db(DbInfo);
dbSysParam.PopulateFrom(dbDataReader);
prmSysParams.Add(CreateSysParam(dbSysParam));
sysParams.Add(CreateSysParam(dbSysParam));
}
}
}
catch (Exception exc)
{
SaLogger.Warn(GetType().Name + ".GetSysParamList\n\tQuery: " + dbCommand.CommandText + "\n\tException: " + exc.Message);
SetErrorState("Database query exception");
SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}");
}
}
return prmSysParams;
return sysParams;
}
//-------------------------------------------------------------------