Upgrade package Mongologger to San.MongoLogger version 1.0.0-preview.3
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<PackageId>Caspian.WorkflowFramework</PackageId>
|
<PackageId>Caspian.WorkflowFramework</PackageId>
|
||||||
<Version>1.0.1-preview2</Version>
|
<Version>1.0.1-preview.3</Version>
|
||||||
<Authors>Digital banking team</Authors>
|
<Authors>Digital banking team</Authors>
|
||||||
<Company>Caspian</Company>
|
<Company>Caspian</Company>
|
||||||
<Product>Caspian.WorkflowFramework</Product>
|
<Product>Caspian.WorkflowFramework</Product>
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
|
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
|
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
|
||||||
<PackageReference Include="MongoLogger" Version="1.9.2.8" />
|
<PackageReference Include="San.MongoLogger" Version="1.0.0-preview.9" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ using Elsa.EntityFrameworkCore.Modules.Management;
|
|||||||
using Elsa.EntityFrameworkCore.Modules.Runtime;
|
using Elsa.EntityFrameworkCore.Modules.Runtime;
|
||||||
using Elsa.EntityFrameworkCore.Modules.Identity;
|
using Elsa.EntityFrameworkCore.Modules.Identity;
|
||||||
using Elsa.Email;
|
using Elsa.Email;
|
||||||
using MongoLogger;
|
using San.MongoLogger;
|
||||||
using MongoLogger.Models;
|
using San.MongoLogger.Models;
|
||||||
|
|
||||||
namespace Caspian.WorkflowFramework;
|
namespace Caspian.WorkflowFramework;
|
||||||
|
|
||||||
public static class DependencyInjectionq
|
public static class DependencyInjection
|
||||||
{
|
{
|
||||||
public static void AddWorkflowFramework(this IHostApplicationBuilder builder, string connectionString)
|
public static void AddWorkflowFramework(this IHostApplicationBuilder builder, string connectionString)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ using Elsa.Workflows.Runtime.Messages;
|
|||||||
using Elsa.Workflows.Models;
|
using Elsa.Workflows.Models;
|
||||||
using Elsa.Common.Models;
|
using Elsa.Common.Models;
|
||||||
using Caspian.WorkflowFramework.Utility;
|
using Caspian.WorkflowFramework.Utility;
|
||||||
using MongoLogger;
|
using San.MongoLogger;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
namespace Caspian.WorkflowFramework.Services
|
namespace Caspian.WorkflowFramework.Services
|
||||||
@@ -44,9 +44,10 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<WorkflowResponse<WorkflowModel>> CreateAndExecuteAsync(CreateAndExecuteWorkflowModel input)
|
public async Task<WorkflowResponse<WorkflowModel>> CreateAndExecuteAsync(CreateAndExecuteWorkflowModel input)
|
||||||
{
|
{
|
||||||
|
var sw = Stopwatch.StartNew();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_logger.Log("Start of CreateAndExecuteAsync", JsonConvert.SerializeObject(input));
|
_logger.Log("Start of CreateAndExecuteAsync", input);
|
||||||
|
|
||||||
WorkflowResponse<WorkflowModel> response;
|
WorkflowResponse<WorkflowModel> response;
|
||||||
|
|
||||||
@@ -68,7 +69,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = null
|
Data = null
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, JsonConvert.SerializeObject(response));
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, response, sw.ElapsedMilliseconds);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -100,7 +103,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = workflowModel
|
Data = workflowModel
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, JsonConvert.SerializeObject(response));
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, response, sw.ElapsedMilliseconds);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -113,7 +118,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = null
|
Data = null
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("Exception occurs in CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, JsonConvert.SerializeObject(response), ex);
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("Exception occurs in CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, response, sw.ElapsedMilliseconds, ex);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -124,9 +131,10 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<WorkflowResponse<WorkflowModel>> PublishEventAsync(PublishEventModel input)
|
public async Task<WorkflowResponse<WorkflowModel>> PublishEventAsync(PublishEventModel input)
|
||||||
{
|
{
|
||||||
|
var sw = Stopwatch.StartNew();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_logger.Log("Start of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(input));
|
_logger.Log("Start of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, input);
|
||||||
|
|
||||||
WorkflowResponse<WorkflowModel> response;
|
WorkflowResponse<WorkflowModel> response;
|
||||||
|
|
||||||
@@ -142,7 +150,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = null
|
Data = null
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -165,7 +175,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = workflowModel
|
Data = workflowModel
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -178,7 +190,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = null
|
Data = null
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("Exception occurs in PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response), ex);
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("Exception occurs in PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds, ex);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -189,9 +203,10 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<WorkflowResponse<WorkflowModel>> InquiryStateAsync(InquiryStateModel input)
|
public async Task<WorkflowResponse<WorkflowModel>> InquiryStateAsync(InquiryStateModel input)
|
||||||
{
|
{
|
||||||
|
var sw = Stopwatch.StartNew();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_logger.Log("Start of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(input));
|
_logger.Log("Start of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, input);
|
||||||
|
|
||||||
WorkflowResponse<WorkflowModel> response;
|
WorkflowResponse<WorkflowModel> response;
|
||||||
|
|
||||||
@@ -207,7 +222,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = null
|
Data = null
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -228,7 +245,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = workflowModel
|
Data = workflowModel
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -241,7 +260,9 @@ namespace Caspian.WorkflowFramework.Services
|
|||||||
Data = null
|
Data = null
|
||||||
};
|
};
|
||||||
|
|
||||||
_logger.Log("Exception occurs in InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response), ex);
|
sw.Stop();
|
||||||
|
|
||||||
|
_logger.Log("Exception occurs in InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds, ex);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<clear />
|
||||||
|
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
|
||||||
|
<add key="Elsa 3 Preview" value="https://f.feedz.io/elsa-workflows/elsa-3/nuget/index.json" />
|
||||||
|
<add key="Webhooks Core Preview" value="https://f.feedz.io/sfmskywalker/webhooks-core/nuget/index.json" />
|
||||||
|
<add key="Local Package source" value="D:\MyNugetPackages" />
|
||||||
|
</packageSources>
|
||||||
|
<packageSourceMapping>
|
||||||
|
<packageSource key="NuGet official package source">
|
||||||
|
<package pattern="*" />
|
||||||
|
</packageSource>
|
||||||
|
<packageSource key="Elsa 3 Preview">
|
||||||
|
<package pattern="Elsa" />
|
||||||
|
<package pattern="Elsa.*" />
|
||||||
|
<package pattern="Elsa.Studio.*" />
|
||||||
|
</packageSource>
|
||||||
|
<packageSource key="Webhooks Core Preview">
|
||||||
|
<package pattern="WebhooksCore" />
|
||||||
|
<package pattern="WebhooksCore.*" />
|
||||||
|
</packageSource>
|
||||||
|
</packageSourceMapping>
|
||||||
|
</configuration>
|
||||||
@@ -3,7 +3,7 @@ using SampleWorkflowWeb.Models;
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using SampleWorkflowWeb.Services;
|
using SampleWorkflowWeb.Services;
|
||||||
using SampleWorkflowWeb.Dao;
|
using SampleWorkflowWeb.Dao;
|
||||||
using MongoLogger;
|
using San.MongoLogger;
|
||||||
using Caspian.WorkflowFramework.Contracts;
|
using Caspian.WorkflowFramework.Contracts;
|
||||||
using Elsa.Common.Models;
|
using Elsa.Common.Models;
|
||||||
using PublishEventModel = Caspian.WorkflowFramework.Models.PublishEventModel;
|
using PublishEventModel = Caspian.WorkflowFramework.Models.PublishEventModel;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ using Caspian.WorkflowFramework.Contracts;
|
|||||||
using PackageNS = Caspian.WorkflowFramework.Models;
|
using PackageNS = Caspian.WorkflowFramework.Models;
|
||||||
using Elsa.Common.Models;
|
using Elsa.Common.Models;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using MongoLogger;
|
using San.MongoLogger;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ namespace SampleWorkflowWeb.Controllers
|
|||||||
{
|
{
|
||||||
var response = await _workflowService.CreateAndExecuteAsync(new PackageNS.CreateAndExecuteWorkflowModel()
|
var response = await _workflowService.CreateAndExecuteAsync(new PackageNS.CreateAndExecuteWorkflowModel()
|
||||||
{
|
{
|
||||||
Name = "TransferWorkflow",
|
Name = "TransfersWorkflow",
|
||||||
UserId = userId,
|
UserId = userId,
|
||||||
Version = VersionOptions.Published
|
Version = VersionOptions.Published
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using SampleWorkflowWeb.Services;
|
using SampleWorkflowWeb.Services;
|
||||||
using Caspian.WorkflowFramework;
|
using Caspian.WorkflowFramework;
|
||||||
using MongoLogger;
|
using San.MongoLogger;
|
||||||
using MongoLogger.Models;
|
using San.MongoLogger.Models;
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
|
|||||||
@@ -13,11 +13,27 @@
|
|||||||
"LogsCollectionName": "TestWorkflowCollection",
|
"LogsCollectionName": "TestWorkflowCollection",
|
||||||
"ConnectionString": "mongodb://localhost",
|
"ConnectionString": "mongodb://localhost",
|
||||||
"DatabaseName": "TestWorkflowDb",
|
"DatabaseName": "TestWorkflowDb",
|
||||||
"SqlConnectionString": "",
|
"BatchSize": 0,
|
||||||
"SqlScriptString": "",
|
|
||||||
"ActiveLogFile": true,
|
|
||||||
"FileLogPath": "c:\\",
|
|
||||||
"RollingInterval": "Daily", //none, Minutely, Daily, Weekly, Monthly, Yearly, Hourly
|
"RollingInterval": "Daily", //none, Minutely, Daily, Weekly, Monthly, Yearly, Hourly
|
||||||
"BatchSize": 1
|
"MaskList": [
|
||||||
|
"code",
|
||||||
|
"depositNumber",
|
||||||
|
"username",
|
||||||
|
"customerNo",
|
||||||
|
"password",
|
||||||
|
"sessionId",
|
||||||
|
"mainAccount",
|
||||||
|
"accountNumber",
|
||||||
|
"owners",
|
||||||
|
"balance",
|
||||||
|
"accountNo",
|
||||||
|
"depositUniqueId",
|
||||||
|
"externalRefList",
|
||||||
|
"externalref",
|
||||||
|
"sameSignatureDepositNumber",
|
||||||
|
"mobileNumber",
|
||||||
|
"destinationNumber",
|
||||||
|
"cardNumber"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user