From c1a2e2d097352c803629c2a5aa8c93eb46967796 Mon Sep 17 00:00:00 2001 From: Andy Howard Date: Wed, 4 Aug 2021 21:35:18 +0100 Subject: [PATCH] BusinessMgr User Context --- SacsStandardBase/Base/Bus/SysId.cs | 8 ++++++-- SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeConsole_Dbas.cs | 4 ++-- SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs | 2 +- SacsStandardDbas/Dbas/Data/DbResultSet_DataReader.cs | 2 +- SacsStandardDbas/Dbas/Diary/SaDiaryConsole_Dbas.cs | 8 ++++---- .../Dbas/Interfaces/SaInterfaceConsole_Dbas.cs | 4 ++-- SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas.cs | 3 ++- SacsStandardDbas/Dbas/ItemData/SaItemDataConsole_Dbas.cs | 4 ++-- SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs | 2 +- SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs | 4 ++-- SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs | 2 +- .../Dbas/ItemOptions/SaItemOptionConsole_Dbas.cs | 4 ++-- SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs | 2 +- .../Dbas/ReferenceData/SaReferenceDataConsole_Dbas.cs | 4 ++-- .../Dbas/ReferenceData/SbmReferenceDataMgr_Dbas.cs | 3 ++- 15 files changed, 31 insertions(+), 25 deletions(-) diff --git a/SacsStandardBase/Base/Bus/SysId.cs b/SacsStandardBase/Base/Bus/SysId.cs index 041f1c6..699bc9f 100644 --- a/SacsStandardBase/Base/Bus/SysId.cs +++ b/SacsStandardBase/Base/Bus/SysId.cs @@ -44,11 +44,15 @@ namespace Sarand.Net.Standard.Base.Bus // Utilities. public static bool IsValid(SysId sysId) { - return (sysId != null && sysId.id != 0); + return sysId != null && sysId.id != 0; + } + public static SysId OnInvalid(SysId sysId, SysId sysIdDefault) + { + return IsValid(sysId) ? sysId : sysIdDefault; } public static SysId InvalidOnNull(SysId sysId) { - return (sysId != null ? sysId : new SysId()); + return sysId != null ? sysId : new SysId(); } //------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeConsole_Dbas.cs b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeConsole_Dbas.cs index bbda72e..04fc1e0 100644 --- a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeConsole_Dbas.cs @@ -26,7 +26,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes //------------------------------------------------------------------- // Construction. - protected SaCodeTypeConsole_Dbas (SacsDatabase database) + protected SaCodeTypeConsole_Dbas (ISacsDatabase database) { Database = database; codeTypeMgr = new SaCodeTypeMgr_Dbas(this); @@ -34,7 +34,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool DatabaseIsValid { get { return codeTypeMgr.DatabaseIsValid; } } public override bool CanUpdateDatabase { get { return codeTypeMgr.CanUpdateDatabase; } } diff --git a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs index 4422c28..2e2abf7 100644 --- a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs @@ -40,7 +40,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes // Properties. public String TableName_CodeType { get { return SaCodeTypeDbDfn.GetTableName(SaCodeTypeDbDfn.TableIdx.SaCodeType); } } public String TableName_Code { get { return SaCodeTypeDbDfn.GetTableName(SaCodeTypeDbDfn.TableIdx.SaCode); } } - internal SacsDatabase Database { get { return codeTypeConsole.Database; } } + internal ISacsDatabase Database { get { return codeTypeConsole.Database; } } private DbDataItem.DatabaseInfo DbInfo { get; } public override bool DatabaseIsValid { get { return (Database != null && Database.GetTableNames().Contains(TableName_CodeType) && Database.GetTableNames().Contains(TableName_Code)); } } public override bool CanUpdateDatabase { get { return DatabaseIsValid; } } diff --git a/SacsStandardDbas/Dbas/Data/DbResultSet_DataReader.cs b/SacsStandardDbas/Dbas/Data/DbResultSet_DataReader.cs index 7def163..a6aa337 100644 --- a/SacsStandardDbas/Dbas/Data/DbResultSet_DataReader.cs +++ b/SacsStandardDbas/Dbas/Data/DbResultSet_DataReader.cs @@ -94,7 +94,7 @@ namespace Sarand.Net.Standard.Dbas.Data resultSet.SetErrorState(errorState); return resultSet; } - public static async Task ExecuteQueryAsync (SacsDatabase database, String query) + public static async Task ExecuteQueryAsync (ISacsDatabase database, String query) { DataMembers data = new DataMembers(database, query); String fn = typeof(DbResultSet_DataReader).Name + ".ExecuteQueryAsync"; diff --git a/SacsStandardDbas/Dbas/Diary/SaDiaryConsole_Dbas.cs b/SacsStandardDbas/Dbas/Diary/SaDiaryConsole_Dbas.cs index 3a57159..74dfa89 100644 --- a/SacsStandardDbas/Dbas/Diary/SaDiaryConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/Diary/SaDiaryConsole_Dbas.cs @@ -1,5 +1,5 @@ -using Sarand.Net.Standard.Base.Diary; -using Sarand.Net.Standard.Dbas.Base; +using Sarand.Net.Standard.Base.Dbas; +using Sarand.Net.Standard.Base.Diary; using System; using System.Collections.Generic; using System.Linq; @@ -22,14 +22,14 @@ namespace Sarand.Net.Standard.Dbas.Diary //------------------------------------------------------------------- // Construction. - protected SaDiaryConsole_Dbas (SacsDatabase database) + protected SaDiaryConsole_Dbas (ISacsDatabase database) { Database = database; } //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool DatabaseIsValid { get { return true; } } public override bool CanUpdateDatabase { get { return true; } } diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceConsole_Dbas.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceConsole_Dbas.cs index c5299a4..0a347a8 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceConsole_Dbas.cs @@ -24,7 +24,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //------------------------------------------------------------------- // Construction. - protected SaInterfaceConsole_Dbas (SacsDatabase database) + protected SaInterfaceConsole_Dbas (ISacsDatabase database) { Database = database; interfaceMgr = new SaInterfaceMgr_Dbas(this); @@ -40,7 +40,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool DatabaseIsValid { get { return interfaceMgr.DatabaseIsValid; } } public override bool CanUpdateDatabase { get { return interfaceMgr.CanUpdateDatabase; } } diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas.cs index 28c73ba..0daad61 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Sarand.Net.Standard.Base.App; using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Dbas; using Sarand.Net.Standard.Base.Interfaces; using Sarand.Net.Standard.Dbas.Base; using Sarand.Net.Standard.Dbas.Data; @@ -46,7 +47,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; } + internal ISacsDatabase Database { get; } private DbDataItem.DatabaseInfo DbInfo { get; } public String TableName_Interface { get; } = SaInterfaceDbDfn.GetTableName(SaInterfaceDbDfn.TableIdx.SaInterface); public String TableName_InterfaceProcess { get; } = SaInterfaceDbDfn.GetTableName(SaInterfaceDbDfn.TableIdx.SaInterfaceProcess); diff --git a/SacsStandardDbas/Dbas/ItemData/SaItemDataConsole_Dbas.cs b/SacsStandardDbas/Dbas/ItemData/SaItemDataConsole_Dbas.cs index 68ffa40..54a3ac0 100644 --- a/SacsStandardDbas/Dbas/ItemData/SaItemDataConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemData/SaItemDataConsole_Dbas.cs @@ -26,7 +26,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData //------------------------------------------------------------------- // Construction. - protected SaItemDataConsole_Dbas (SacsDatabase database) + protected SaItemDataConsole_Dbas (ISacsDatabase database) { Database = database; itemDataMgr = new SaItemDataMgr_Dbas(this); @@ -34,7 +34,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool DatabaseIsValid { get { return itemDataMgr.DatabaseIsValid; } } public override bool CanUpdateDatabase { get { return itemDataMgr.CanUpdateDatabase; } } diff --git a/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs index 779480a..3edff3b 100644 --- a/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs @@ -40,7 +40,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData //------------------------------------------------------------------- // Properties. public String TableName_ItemData { get { return SaItemDataDbDfn.GetTableName(SaItemDataDbDfn.TableIdx.SaItemData); } } - internal SacsDatabase Database { get { return itemDataConsole.Database; } } + internal ISacsDatabase Database { get { return itemDataConsole.Database; } } private DbDataItem.DatabaseInfo DbInfo { get; } public override bool DatabaseIsValid { get { return (Database != null && Database.GetTableNames().Contains(TableName_ItemData)); } } public override bool CanUpdateDatabase { get { return DatabaseIsValid; } } diff --git a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs index e7623af..04d1412 100644 --- a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs @@ -33,7 +33,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs //------------------------------------------------------------------- // Construction. - protected SaItemDocConsole_Dbas (SacsDatabase database) + protected SaItemDocConsole_Dbas (ISacsDatabase database) { Database = database; itemDocMgr = new SaItemDocMgr_Dbas(this); @@ -41,7 +41,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool DatabaseIsValid { get { return itemDocMgr.DatabaseIsValid; } } public override bool CanUpdateDatabase { get { return itemDocMgr.CanUpdateDatabase; } } diff --git a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs index cb64b91..5a11bc7 100644 --- a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs @@ -40,7 +40,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs //------------------------------------------------------------------- // Properties. public String TableName_ItemDoc { get { return SaItemDocsDbDfn.GetTableName(SaItemDocsDbDfn.TableIdx.SaItemDoc); } } - internal SacsDatabase Database { get { return itemDocConsole.Database; } } + internal ISacsDatabase Database { get { return itemDocConsole.Database; } } private DbDataItem.DatabaseInfo DbInfo { get; } public override bool DatabaseIsValid { get { return (Database != null && Database.GetTableNames().Contains(TableName_ItemDoc)); } } public override bool CanUpdateDatabase { get { return DatabaseIsValid; } } diff --git a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionConsole_Dbas.cs b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionConsole_Dbas.cs index d9e2bd3..4f6b771 100644 --- a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionConsole_Dbas.cs @@ -24,7 +24,7 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions //------------------------------------------------------------------- // Construction. - protected SaItemOptionConsole_Dbas(SacsDatabase database) + protected SaItemOptionConsole_Dbas(ISacsDatabase database) { Database = database; itemOptionMgr = new SaItemOptionMgr_Dbas(this); @@ -40,7 +40,7 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool DatabaseIsValid { get { return itemOptionMgr.DatabaseIsValid; } } public override bool CanUpdateDatabase { get { return itemOptionMgr.CanUpdateDatabase; } } diff --git a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs index faab1d9..92fef6a 100644 --- a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs @@ -39,7 +39,7 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions //------------------------------------------------------------------- // Properties. public String TableName_ItemOption { get { return SaItemOptionDbDfn.GetTableName(SaItemOptionDbDfn.TableIdx.SaItemOption); } } - internal SacsDatabase Database { get { return itemOptionConsole.Database; } } + internal ISacsDatabase Database { get { return itemOptionConsole.Database; } } private DbDataItem.DatabaseInfo DbInfo { get; } public override bool DatabaseIsValid { get { return (Database != null && Database.GetTableNames().Contains(TableName_ItemOption)); } } public override bool CanUpdateDatabase { get { return DatabaseIsValid; } } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SaReferenceDataConsole_Dbas.cs b/SacsStandardDbas/Dbas/ReferenceData/SaReferenceDataConsole_Dbas.cs index c28c33c..de2c329 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SaReferenceDataConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SaReferenceDataConsole_Dbas.cs @@ -22,7 +22,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData //------------------------------------------------------------------- // Construction. - protected SaReferenceDataConsole_Dbas (SacsDatabase database) : + protected SaReferenceDataConsole_Dbas (ISacsDatabase database) : base() { Database = database; @@ -38,7 +38,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData //------------------------------------------------------------------- // Properties. - internal SacsDatabase Database { get; set; } + internal ISacsDatabase Database { get; set; } public override bool CanUpdateDatabase { get { return referenceDataMgr.CanUpdateDatabase; } } //------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas.cs index a7428d0..40644d1 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Sarand.Net.Standard.Base.ReferenceData; using Sarand.Net.Standard.Base.Core; using Sarand.Net.Standard.Dbas.Data; +using Sarand.Net.Standard.Base.Dbas; namespace Sarand.Net.Standard.Dbas.ReferenceData { @@ -30,7 +31,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData //------------------------------------------------------------------- // Properties. internal SaReferenceDataConsole_Dbas ReferenceDataConsole { get; } - internal SacsDatabase Database { get { return ReferenceDataConsole.Database; } } + internal ISacsDatabase Database { get { return ReferenceDataConsole.Database; } } private DbDataItem.DatabaseInfo DbInfo { get; } public override bool DatabaseIsValid_Language { get { return (Database != null && (Database.GetTableNames().Contains(ReferenceDataConsole.TableName_Language))); } } public override bool DatabaseIsValid_Region { get { return (Database != null && (Database.GetTableNames().Contains(ReferenceDataConsole.TableName_Region))); } }