EDMI.API: Version 1.2.3

GUIs.Test.GraphQLTest/frmMain.Designer.vb

@@ -251,6 +251,7 @@ Partial Class frmMain
         Me.txtOperation.Name = "txtOperation"
         Me.txtOperation.Size = New System.Drawing.Size(458, 20)
         Me.txtOperation.TabIndex = 1
+        Me.txtOperation.Text = "Auftraege"
         '
         'btnLogin
         '

GUIs.Test.GraphQLTest/frmMain.vb

@@ -153,7 +153,9 @@ Public Class frmMain
                         End Using
                     End Using
 
-                    Dim oObj As JObject = JsonConvert.DeserializeObject(oResult)
+                    'Dim oObj As JObject = JsonConvert.DeserializeObject(oResult)
+                    Dim oObj As JObject = JObject.Parse(oResult)
+
                     Dim oData As SAPData = ConvertResponse(oResult)
 
                     _Logger.Debug("Inserting [{0}] items for datapool [{1}]", oData.sapdaten.Count, oDatapool)
@@ -203,7 +205,13 @@ Public Class frmMain
                     End Using
                 End Using
 
-                Dim oObj As JObject = JsonConvert.DeserializeObject(oResult)
+                Dim oPath = "data.auftraege.auftraege"
+                Dim oObj As JObject = JObject.Parse(oResult)
+                If _Interface.ReadJSONPathFragmented(oObj, oPath) = False Then
+                    MsgBox($"JSONPath [{oPath}] was not successfully read", MsgBoxStyle.Critical, Text)
+                End If
+                'Dim oObj As JObject = JsonConvert.DeserializeObject(oResult)
+
                 Dim oIndentedJson As String = JsonConvert.SerializeObject(oObj, Formatting.Indented)
                 txtResult.Text = oIndentedJson
 
@@ -217,6 +225,7 @@ Public Class frmMain
             MsgBox(ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
+
     Sub SaveConfig()
         _Config.Config.ConnectionString = txtConnectionString.Text
         _Config.Config.BaseUrl = txtBaseUrl.Text

Modules.EDMIAPI/Client.vb

@@ -44,13 +44,22 @@ Public Class Client
     ''' Creates a new EDMI Client object
     ''' </summary>
     ''' <param name="LogConfig">LogConfig object</param>
-    ''' <param name="ServiceAdress">The full service url to connect to, for example: net.tcp://1.1.1.1:1111/some/path</param>
+    ''' <param name="ServiceAdress">The IP address/hostname and port, separated by semicolon or colon, ex localhost:9000</param>
     Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
         _logger = LogConfig.GetLogger()
 
+        Dim oServiceAddress As String = ServiceAdress
+        Dim oAddressArray() As String
+
+        If oServiceAddress.Contains(";") Then
+            oAddressArray = oServiceAddress.Split(";")
+        Else
+            oAddressArray = oServiceAddress.Split(":")
+        End If
+
         Try
             Dim oBinding = Channel.GetBinding()
-            Dim oAddress = New EndpointAddress(ServiceAdress)
+            Dim oAddress = New EndpointAddress($"net.tcp://{oAddressArray(0)}:{oAddressArray(1)}/DigitalData/Services/Main")
             Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
 
             _channelFactory = oFactory

Modules.EDMIAPI/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.2.2.0")>
-<Assembly: AssemblyFileVersion("1.2.2.0")>
+<Assembly: AssemblyVersion("1.2.3.0")>
+<Assembly: AssemblyFileVersion("1.2.3.0")>

Modules.Interfaces/GraphQLInterface.vb

@@ -118,6 +118,30 @@ Public Class GraphQLInterface
         End Try
     End Function
 
+    Public Function ReadJSONPathFragmented(pObject As Linq.JObject, pJsonPath As String)
+        Dim oSplitPath As List(Of String) = pJsonPath.Split(".").ToList()
+        Dim oCurrentPath As String = String.Empty
+
+        For Each oPart In oSplitPath
+            If oCurrentPath = String.Empty Then
+                oCurrentPath = oPart
+            Else
+                oCurrentPath &= "." & oPart
+            End If
+
+            _logger.Debug("Selecting Path Fragment [{0}]", oCurrentPath)
+
+            Try
+                pObject.SelectToken(oCurrentPath, errorWhenNoMatch:=True)
+            Catch ex As Exception
+                _logger.Warn("Path Fragment [{0}] did not return a valid token", oCurrentPath)
+                Return False
+            End Try
+        Next
+
+        Return True
+    End Function
+
     Private Function GetRequest(Url As String, PostData As Byte()) As HttpWebRequest
         Try
             Dim oRequest As HttpWebRequest = WebRequest.Create($"{_baseUrl}{Url}")

Modules.Interfaces/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.5.8.0")>
-<Assembly: AssemblyFileVersion("1.5.8.0")>
+<Assembly: AssemblyVersion("1.5.9.0")>
+<Assembly: AssemblyFileVersion("1.5.9.0")>

Modules.Jobs/EDMI/GraphQL/GraphQLJob.vb

@@ -16,6 +16,8 @@ Public Class GraphQLJob
     Inherits JobBase
     Implements IJob(Of GraphQLArgs)
 
+    Private _GraphQL As GraphQLInterface = Nothing
+
     Private Const PLACEHOLDER_STATIC = "STATIC:"
 
     Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer)
@@ -27,18 +29,16 @@ Public Class GraphQLJob
             Dim oConfigPath As String = Args.QueryConfigPath
             Dim oConfigManager As New ConfigManager(Of GraphQLConfig)(_LogConfig, oConfigPath)
 
-            Dim oInterface As GraphQLInterface
-
             With oConfigManager.Config
-                oInterface = New GraphQLInterface(_LogConfig, .BaseUrl, .Email, .Password, .CertificateFingerprint)
+                _GraphQL = New GraphQLInterface(_LogConfig, .BaseUrl, .Email, .Password, .CertificateFingerprint)
             End With
 
             ' Login to get cookie
             _Logger.Debug("Logging in")
-            Dim oLoginResponse = oInterface.Login()
+            Dim oLoginResponse = _GraphQL.Login()
 
             ' save cookie for future requests
-            oInterface.SaveCookies(oLoginResponse.Cookies.Item(0))
+            _GraphQL.SaveCookies(oLoginResponse.Cookies.Item(0))
 
             _Logger.Debug("Loading Queries")
 
@@ -85,7 +85,7 @@ Public Class GraphQLJob
                     _Logger.Info("Getting data..", oQuery.Name)
 
                     ' get the data from GraphQL
-                    Dim oDataResponse = oInterface.GetData(oQuery.QueryString, oQuery.OperationName)
+                    Dim oDataResponse = _GraphQL.GetData(oQuery.QueryString, oQuery.OperationName)
                     Dim oResult As String
 
                     ' write data to string
@@ -144,7 +144,7 @@ Public Class GraphQLJob
 
             ' logout
             _Logger.Debug("Logging out")
-            Dim oLogoutResponse = oInterface.Logout()
+            Dim oLogoutResponse = _GraphQL.Logout()
         Catch ex As Exception
             _Logger.Error(ex)
             Throw ex
@@ -153,24 +153,26 @@ Public Class GraphQLJob
 
     Private Function HandleResponse(JsonString As String, QueryData As GraphQL.Query, DB As Database.MSSQLServer) As GraphQL.Query
         Dim oObj As JObject = JObject.Parse(JsonString)
-        Dim oResultList As JToken = oObj.SelectToken(QueryData.MappingBasePath)
+        Dim oResultList As JToken
+
+        If _GraphQL.ReadJSONPathFragmented(oObj, QueryData.MappingBasePath) = False Then
+            _Logger.Warn("There is an error in the MappingBasePath [{1}] configuration of query [{0}]", QueryData.Name, QueryData.MappingBasePath)
+        End If
+
+        Try
+            oResultList = oObj.SelectToken(QueryData.MappingBasePath, errorWhenNoMatch:=True)
+        Catch ex As Exception
+            _Logger.Warn("HandleResponse: Could not find BasePath: [{0}] for query [{1}]", QueryData.MappingBasePath, QueryData.Name)
+            _Logger.Error(ex)
+            Return Nothing
+        End Try
 
         If oResultList Is Nothing Then
             _Logger.Warn("HandleResponse: Could not find BasePath: [{0}] for query [{1}]", QueryData.MappingBasePath, QueryData.Name)
             Return Nothing
         End If
 
-        _Logger.Info("Processing Queue [{0}] with [{1}] Items", QueryData.Name, oResultList.Count)
-
-        'If QueryData.ClearBeforeFill Then
-        '    _Logger.Info("Clearing Table {0} before insert", QueryData.DestinationTable)
-        '    _Logger.Info("Clear Command: [{0}]", QueryData.ClearCommand)
-        '    Try
-        '        DB.ExecuteNonQuery(QueryData.ClearCommand)
-        '    Catch ex As Exception
-        '        _Logger.Error(ex)
-        '    End Try
-        'End If
+        _Logger.Info("HandleResponse: Processing Queue [{0}] with [{1}] Items", QueryData.Name, oResultList.Count)
 
         For Each oResultItem As JToken In oResultList
             Try

Modules.Jobs/My Project/AssemblyInfo.vb

@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("1.8.0.0")>
-<Assembly: AssemblyFileVersion("1.8.0.0")>
+<Assembly: AssemblyVersion("1.8.1.0")>
+<Assembly: AssemblyFileVersion("1.8.1.0")>