From 2e27544fecf0363a2d47c59fc77d54562e35c963 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Mon, 10 Jan 2022 15:50:28 +0100
Subject: [PATCH] EDMIService: Update service

---
 DDMonorepo.sln                         |  7 +++++++
 Service.EDMIService/EDMIService.vb     | 23 ++++++++++++++++++-----
 Service.EDMIService/EDMIService.vbproj |  8 ++++++++
 Service.EDMIService/IEDMIService.vb    |  7 +++++++
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/DDMonorepo.sln b/DDMonorepo.sln
index 7fe198dc..18eb44d7 100644
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -142,6 +142,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Mailfunctions", "Mailfuncti
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMIService.Tests\EDMIService.Tests.vbproj", "{E3DA65CA-964D-4896-991A-B5426884E215}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Base", "Modules.Base\Base\Base.vbproj", "{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -380,6 +382,10 @@ Global
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -443,6 +449,7 @@ Global
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}
diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb
index cca35d6b..899aa936 100644
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -11,6 +11,7 @@ Imports DigitalData.Services.EDMIService.Messages
 Imports DigitalData.Services.EDMIService.Exceptions
 Imports DigitalData.Services.EDMIService.Methods
 Imports DigitalData.Services.EDMIService.Methods.SetAttributeValue
+Imports DigitalData.Services.EDMIService.Methods.Database
 
 <ServiceBehavior(InstanceContextMode:=InstanceContextMode.PerSession)>
 Public Class EDMIService
@@ -61,25 +62,25 @@ Public Class EDMIService
 
     Public Function NewFile(Data As NewFile.NewFileRequest) As NewFile.NewFileResponse Implements IEDMIService.NewFile
         _Logger.Debug("Start of Method [NewFile]")
-        Dim oNewFile As New NewFileMethod(LogConfig, MSSQL_IDB, GlobalState)
+        Dim oNewFile As New NewFileMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
         Return oNewFile.Run(Data)
     End Function
 
     Public Function SetAttributeValue(Data As SetAttributeValue.SetAttributeValueRequest) As SetAttributeValue.SetAttributeValueResponse Implements IEDMIService.SetAttributeValue
         _Logger.Debug("Start of Method [SetAttributeValue]")
-        Dim oSetAttributeValue As New SetAttributeValueMethod(LogConfig, MSSQL_IDB, GlobalState)
+        Dim oSetAttributeValue As New SetAttributeValueMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
         Return oSetAttributeValue.Run(Data)
     End Function
 
     Public Function ImportFile(pData As GlobalIndexer.ImportFile.ImportFileRequest) As GlobalIndexer.ImportFile.ImportFileResponse Implements IEDMIService.ImportFile
         _Logger.Debug("Start of Method [ImportFile]")
-        Dim oImportFile As New GlobalIndexer.ImportFile.ImportFileMethod(LogConfig, MSSQL_IDB, GlobalState)
+        Dim oImportFile As New GlobalIndexer.ImportFile.ImportFileMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
         Return oImportFile.Run(pData)
     End Function
 
     Public Function GetFileObject(pData As GetFileObject.GetFileObjectRequest) As GetFileObject.GetFileObjectResponse Implements IEDMIService.GetFileObject
         _Logger.Debug("Start of Method [GetFileObject]")
-        Dim oGetFileObject As New GetFileObject.GetFileObjectMethod(LogConfig, MSSQL_IDB, GlobalState)
+        Dim oGetFileObject As New GetFileObject.GetFileObjectMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
         Return oGetFileObject.Run(pData)
     End Function
 
@@ -91,7 +92,7 @@ Public Class EDMIService
 
 #Region "=== Database ==="
     Public Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult Implements IEDMIService.ReturnDatatableFromCache
-        Dim oReturnDatatableFromCache As New GetDatatableFromCache.GetDatatableFromCacheMethod(LogConfig, MSSQL_ECM, GlobalState)
+        Dim oReturnDatatableFromCache As New GetDatatableFromCache.GetDatatableFromCacheMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
         Dim oResult = oReturnDatatableFromCache.Run(New GetDatatableFromCache.GetDatatableFromCacheRequest With {
             .DataTable = Name,
             .FilterExpression = FilterExpression,
@@ -104,6 +105,18 @@ Public Class EDMIService
             Return New TableResult(oResult.ErrorMessage)
         End If
     End Function
+
+    Public Function ReturnDatatable(pData As GetDatatable.GetDatatableRequest) As GetDatatable.GetDatatableResponse Implements IEDMIService.ReturnDatatable
+        _Logger.Debug("Start of Method [ReturnDatatable]")
+        Dim oGetDatatable As New GetDatatable.GetDatatableMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
+        Return oGetDatatable.Run(pData)
+    End Function
+
+    Public Function ReturnScalarValue(pData As GetScalarValue.GetScalarValueRequest) As GetScalarValue.GetScalarValueResponse Implements IEDMIService.ReturnScalarValue
+        _Logger.Debug("Start of Method [ReturnScalarValue]")
+        Dim oGetScalarValue As New GetScalarValue.GetScalarValueMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
+        Return oGetScalarValue.Run(pData)
+    End Function
 #End Region
 
 #Region "=== Database (MSSQL IDB) ==="
diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj
index f5272e03..f14bf1cf 100644
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -131,6 +131,14 @@
     <Compile Include="BaseMethod.vb" />
     <Compile Include="ClassConstants.vb" />
     <Compile Include="Config.vb" />
+    <Compile Include="Methods\Database\DatabaseName.vb" />
+    <Compile Include="Methods\Database\DatabaseType.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueMethod.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueRequest.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableResponse.vb" />
     <Compile Include="Methods\FileProperties.vb" />
     <Compile Include="Methods\GetAttributeValue\GetAttributeValueMethod.vb" />
     <Compile Include="Methods\GetAttributeValue\GetAttributeValueRequest.vb" />
diff --git a/Service.EDMIService/IEDMIService.vb b/Service.EDMIService/IEDMIService.vb
index 77976c41..3608ad70 100644
--- a/Service.EDMIService/IEDMIService.vb
+++ b/Service.EDMIService/IEDMIService.vb
@@ -4,6 +4,7 @@ Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Services.EDMIService.Exceptions
 Imports DigitalData.Services.EDMIService.Messages
 Imports DigitalData.Services.EDMIService.Methods
+Imports DigitalData.Services.EDMIService.Methods.Database
 
 <ServiceContract(Name:="IEDMIService", [Namespace]:="http://DigitalData.Services.EDMIService")>
 Interface IEDMIService
@@ -18,6 +19,12 @@ Interface IEDMIService
     <FaultContract(GetType(UnexpectedErrorFault))>
     <FaultContract(GetType(DataTableDoesNotExistFault))>
     Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult
+
+    <OperationContract>
+    Function ReturnDatatable(pData As GetDatatable.GetDatatableRequest) As GetDatatable.GetDatatableResponse
+
+    <OperationContract>
+    Function ReturnScalarValue(pData As GetScalarValue.GetScalarValueRequest) As GetScalarValue.GetScalarValueResponse
 #End Region
 
 #Region "Database (Firebird)"