15-12-2022

ECM.JobRunner.Windows/WCF/Methods/GetJobConfig.vb

@@ -13,36 +13,22 @@ Public Class GetJobConfig
         End Sub
 
         Public Function Run() As GetJobConfigResponse
-            Return New GetJobConfigResponse With {
-                .JobTypes = State.JobTypes,
-                .JobDefinitions = State.JobDefinitions,
-                .ProfileDefinitions = New GetJobConfigResponse.ProfileDefinitionConfig With {
-                    .ImportProfiles = State.ProfileDefintions.ImportProfiles.
-                        Select(AddressOf FillJobForProfile).
-                        Select(AddressOf FillStepsForProfile).
-                        ToList()
-                },
-                .WindreamObjectTypes = State.ObjectTypes
-            }
+            Try
+                Return New GetJobConfigResponse With {
+                    .JobTypes = State.JobTypes,
+                    .JobDefinitions = State.JobDefinitions,
+                    .ProfileDefinitions = New GetJobConfigResponse.ProfileDefinitionConfig With {
+                        .ImportProfiles = State.ProfileDefintions.ImportProfiles
+                    },
+                    .WindreamObjectTypes = State.ObjectTypes
+                }
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return New GetJobConfigResponse() With {.OK = False, .ErrorMessage = ex.Message}
+            End Try
         End Function
 
-        Private Function FillJobForProfile(pProfile As ImportProfile) As ImportProfile
-            Dim oJob = State.JobDefinitions.
-                Where(Function(job) job.Id = pProfile.JobId).
-                FirstOrDefault()
 
-            pProfile.Job = oJob
-            Return pProfile
-        End Function
-
-        Private Function FillStepsForProfile(pProfile As ImportProfile) As ImportProfile
-            Dim oSteps = State.ProfileDefintions.ImportProfileSteps.
-                Where(Function(s) s.ProfileId = pProfile.Id).
-                ToList()
-
-            pProfile.Steps = oSteps
-            Return pProfile
-        End Function
     End Class
 
     Public Class GetJobConfigResponse
@@ -61,6 +47,7 @@ Public Class GetJobConfig
         Public Property ProfileDefinitions As New ProfileDefinitionConfig
 
         Public Class ProfileDefinitionConfig
+            <DataMember>
             Public Property ImportProfiles As List(Of ImportProfile)
         End Class
     End Class