diff --git a/F4SDM42WebApi/C4ITF4SDM42WebApi.dll.host.config b/F4SDM42WebApi/C4ITF4SDM42WebApi.dll.host.config
index b527993..512c995 100644
--- a/F4SDM42WebApi/C4ITF4SDM42WebApi.dll.host.config
+++ b/F4SDM42WebApi/C4ITF4SDM42WebApi.dll.host.config
@@ -2,6 +2,14 @@
+
+
+
+
+
+
+
+
diff --git a/F4SDM42WebApi/F4SD - M42WebApi.csproj b/F4SDM42WebApi/F4SD - M42WebApi.csproj
index bfab0bf..c087e1d 100644
--- a/F4SDM42WebApi/F4SD - M42WebApi.csproj
+++ b/F4SDM42WebApi/F4SD - M42WebApi.csproj
@@ -13,7 +13,7 @@
false
6673a25d-33d6-4072-91d9-abed4be1a966
C4ITF4SD*.*
- 1.4.0.19
+ 1.4.0.20
true
@@ -30,8 +30,8 @@
M42Libraries\26.1\Matrix42.Contracts.Platform.dll
false
-
- M42Libraries\26.1\Matrix42.BizLogic.Journal.dll
+
+ M42Libraries\26.1\Matrix42.Contracts.ServiceManagement.dll
false
diff --git a/F4SDM42WebApi/F4SDHelperService.cs b/F4SDM42WebApi/F4SDHelperService.cs
index c2e4657..6a3141d 100644
--- a/F4SDM42WebApi/F4SDHelperService.cs
+++ b/F4SDM42WebApi/F4SDHelperService.cs
@@ -1,7 +1,6 @@
using C4IT.F4SDM;
using C4IT.FASD.Base;
using C4IT.Logging;
-using Matrix42.BizLogic.Common.Journal;
using Matrix42.Common;
using Newtonsoft.Json;
using System;
@@ -1409,29 +1408,20 @@ namespace C4IT.F4SD
{
await Task.Delay(0);
List journalEntries = new List();
- var entries = JournalManager.GetObjectEntries(
- activityEOID,
- false,
- null,
- 0,
- 50,
- false,
- "{2}",
- 120);
-
- LogEntry($"{entries.Count} Journal entries found for ObjectID={activityEOID}", LogLevels.Debug);
- for (int i = 0; i < entries.Count; i++)
+ var entries = F4SDM42WebApiController.defaultInstance.GetJournalService().GetJournalList(activityEOID, false, 0, 50, "{2}", 120);
+ LogEntry($"{entries.Length} Journal entries found for ObjectID={activityEOID}", LogLevels.Debug);
+ for (int i = 0; i < entries.Length; i++)
{
- var item = entries[i];
- var text = item.Comments ?? string.Empty;
+ Matrix42.Contracts.Platform.Data.JournalEntryInfo item = entries[i];
+ var text = item.Text ?? string.Empty;
var createdDate = item.CreatedDate ?? DateTime.MinValue;
- LogEntry($"Journal entry {i + 1}/{entries.Count}: ID={item.Id}, CreatedDate={createdDate}, CreatedBy={item.CreatorName}, Header={item.Header}", LogLevels.Debug);
+ LogEntry($"Journal entry {i + 1}/{entries.Length}: ID={item.Id}, CreatedDate={createdDate}, CreatedBy={item.Creator}, Header={item.Header}", LogLevels.Debug);
journalEntries.Add(new cTicketJournalItem()
{
JournalId = item.Id,
ActivityObjectId = activityEOID,
- CreatedBy = item.CreatorName,
+ CreatedBy = item.Creator,
CreationDate = createdDate,
DescriptionHtml = text,
Description = string.IsNullOrEmpty(text) ? string.Empty : Matrix42.Common.Html.HtmlConverter.ConvertHtmlToPlainText(text),
diff --git a/F4SDM42WebApi/F4SDM42WebApiController.cs b/F4SDM42WebApi/F4SDM42WebApiController.cs
index 279b24a..5b55b55 100644
--- a/F4SDM42WebApi/F4SDM42WebApiController.cs
+++ b/F4SDM42WebApi/F4SDM42WebApiController.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using Matrix42.Common;
using Matrix42.Contracts.Common.Security;
+using Matrix42.Contracts.ServiceManagement.ServiceContracts;
using Matrix42.Hosting.Contracts;
using Matrix42.Pandora.Contracts;
using Matrix42.Persistence.Contracts;
@@ -89,6 +90,11 @@ namespace C4IT.F4SD
throw new InvalidOperationException($"Required Matrix42 service is not registered: {typeof(T).FullName}");
}
+ internal IJournalService GetJournalService()
+ {
+ return GetRequiredService();
+ }
+
[Route("getDirectLinkCreateTicket"), HttpGet]
public async Task getDirectLinkCreateTicket(string sid = "", string assetname = "")
{