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
@@ -67,7 +67,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
catch (Exception exc)
{
SetErrorState("Database query exception");
SaLogger.Warn(GetType().Name + ".GetAssetProcess\n\tQuery: " + dbCommand.CommandText + "\n\tException: " + exc.Message);
SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}");
}
}
return assetProcess;
@@ -105,7 +105,6 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Insert AssetProcess.
public override bool InsertAssetProcess(SbmAssetProcess assetProcess, DbUpdateInfo dbUpdateInfo)
{
String fn = GetType().Name + ".InsertAssetProcess";
ClearErrorState();
if (!IsValidAssetProcess(assetProcess)) return false;
if (SysId.IsValid(assetProcess.Id)) return SetErrorState(ErrorMessage.ValiditemId);
@@ -125,7 +124,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
dbAssetProcess.ExecuteInsertCommand(dbCommand);
assetProcess.Id = new SysId(dbAssetProcess._Id);
assetProcess.Changed = false;
if (DebugMode) SaLogger.Debug(fn + " Inserted. " + GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Inserted.{GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t")}");
}
catch (Exception exc) { SetErrorState(exc.Message); }
}
@@ -136,13 +135,12 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Update AssetProcess.
public override bool UpdateAssetProcess(SbmAssetProcess assetProcess, DbUpdateInfo dbUpdateInfo)
{
String fn = GetType().Name + ".UpdateAssetProcess";
ClearErrorState();
if (!IsValidAssetProcess(assetProcess)) return false;
if (!SysId.IsValid(assetProcess.Id)) return SetErrorState(ErrorMessage.InvalidItemId);
if (!assetProcess.Changed)
{
if (DebugMode) SaLogger.Debug(fn + " Data not changed. " + GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Data not changed.{GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t")}");
return true;
}
using (var dbConnection = db.CreateConnection())
@@ -153,14 +151,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Retrieve AssetProcess.
dbConnection.Open();
SaAssetProcess_Db dbAssetProcess = new SaAssetProcess_Db(DbInfo);
dbAssetProcess.PopulateFrom(dbCommand, aliasAssetProcess, "Id=" + SysId.ToString(assetProcess.Id));
dbAssetProcess.PopulateFrom(dbCommand, aliasAssetProcess, $"Id={SysId.ToString(assetProcess.Id)}");
SbmUpdateLogItemMonitor_AssetProcess updateLogMonitor = new SbmUpdateLogItemMonitor_AssetProcess(Internals, CreateAssetProcess(dbAssetProcess));
// Update properties.
PopulateTo(dbAssetProcess, assetProcess, dbUpdateInfo);
dbAssetProcess.ExecuteUpdateCommand(dbCommand);
assetProcess.Changed = false;
if (DebugMode) SaLogger.Debug(fn + " Updated. " + GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Updated.{GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t")}");
// Record updates.
updateLogMonitor.RecordUpdatedValues(assetProcess);
@@ -181,7 +179,6 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
}
public override bool DeleteAssetProcess(SbmAssetProcess assetProcess, DbUpdateInfo dbUpdateInfo)
{
String fn = GetType().Name + ".DeleteAssetProcess";
ClearErrorState();
if (!AssetProcessCanBeDeleted(assetProcess)) return false;
using (var dbConnection = db.CreateConnection())
@@ -192,13 +189,13 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Retrieve AssetProcess.
dbConnection.Open();
SaAssetProcess_Db dbAssetProcess = new SaAssetProcess_Db(DbInfo);
dbAssetProcess.PopulateFrom(dbCommand, aliasAssetProcess, "Id=" + assetProcess.Id.ToString());
dbAssetProcess.PopulateFrom(dbCommand, aliasAssetProcess, $"Id={assetProcess.Id.ToString()}");
// Delete AssetProcess.
dbCommand.CommandType = System.Data.CommandType.Text;
dbCommand.CommandText = "DELETE FROM " + SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaAssetProcess) + " WHERE Id=" + SysId.ToString(assetProcess.Id) + ";";
dbCommand.CommandText = $"DELETE FROM {SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaAssetProcess)} WHERE Id={SysId.ToString(assetProcess.Id)};";
dbCommand.ExecuteNonQuery();
assetProcess.Changed = false;
if (DebugMode) SaLogger.Debug(fn + " Deleted. " + GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t"));
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Deleted.{GetLogProperties(assetProcess).Concat(": ").Concat("", "\n\t")}");
}
catch (Exception exc) { SetErrorState(exc.Message); }
}
@@ -344,10 +341,10 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
String includedIds = prm.IncludedIds.Concat(",");
String colAssetProcess_Id = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaAssetProcess_Id, aliasAssetProcess);
if (!includedIds.IsEmpty())
filter.Add(colAssetProcess_Id + " IN (" + includedIds + ")");
filter.Add($"{colAssetProcess_Id} IN ({includedIds})");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(colAssetProcess_Id + " NOT IN (" + excludedIds + ")");
filter.Add($"{colAssetProcess_Id} NOT IN ({excludedIds})");
if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1");
return filter;
@@ -404,7 +401,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// AssetProcess list.
public override List<SbmAssetProcess> GetAssetProcessList(SbmAssetProcess.Params prm)
{
List<SbmAssetProcess> AssetProcesses = new List<SbmAssetProcess>();
ClearErrorState();
List<SbmAssetProcess> assetProcesses = new List<SbmAssetProcess>();
DbQuery qry = new DbQuery(db.DbmsType);
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaAssetProcess), aliasAssetProcess);
SaAssetProcess_Db dbAssetProcess = new SaAssetProcess_Db(DbInfo);
@@ -425,16 +423,17 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
{
dbAssetProcess = new SaAssetProcess_Db(DbInfo);
dbAssetProcess.PopulateFrom(dbDataReader);
AssetProcesses.Add(CreateAssetProcess(dbAssetProcess));
assetProcesses.Add(CreateAssetProcess(dbAssetProcess));
}
}
}
catch (Exception exc)
{
SaLogger.Warn(GetType().Name + ".GetAssetProcessList\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 AssetProcesses;
return assetProcesses;
}
//-------------------------------------------------------------------