feat(bpdm): add sharing state ready toggle (#905)

add toggle to disable the set sharing state ready call of the bpdm service ---------------- Refs: #845 Reviewed-By: Norbert Truchsess <norbert.truchsess@t-online.de>
eclipse-tractusx · Sep 11, 2024 · dc2042c · dc2042c
1 parent 256d7b4
commit dc2042c
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 65 deletions.
diff --git a/src/administration/Administration.Service/appsettings.json b/src/administration/Administration.Service/appsettings.json
@@ -294,7 +294,9 @@
       "ClientSecret": "",
       "Scope": "",
       "TokenAddress": "",
-      "BaseAddress": ""
+      "BaseAddress": "",
+      "UseDimWallet": false,
+      "StartSharingStateAsReady": false
     },
     "Clearinghouse": {
       "Username": "",

diff --git a/src/externalsystems/Bpdm.Library/BpdmServiceSettings.cs b/src/externalsystems/Bpdm.Library/BpdmServiceSettings.cs
@@ -32,4 +32,6 @@ public class BpdmServiceSettings : KeyVaultAuthSettings
     public string BaseAddress { get; set; } = null!;
 
     public bool UseDimWallet { get; set; }
+
+    public bool StartSharingStateAsReady { get; set; }
 }
diff --git a/src/externalsystems/Bpdm.Library/BusinessLogic/BpdmBusinessLogic.cs b/src/externalsystems/Bpdm.Library/BusinessLogic/BpdmBusinessLogic.cs
@@ -28,22 +28,17 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.BusinessLogic;
 
-public class BpdmBusinessLogic : IBpdmBusinessLogic
+public class BpdmBusinessLogic(
+    IPortalRepositories portalRepositories,
+    IBpdmService bpdmService,
+    IOptions<BpdmServiceSettings> options)
+    : IBpdmBusinessLogic
 {
-    private readonly IPortalRepositories _portalRepositories;
-    private readonly IBpdmService _bpdmService;
-    private readonly BpdmServiceSettings _settings;
-
-    public BpdmBusinessLogic(IPortalRepositories portalRepositories, IBpdmService bpdmService, IOptions<BpdmServiceSettings> options)
-    {
-        _portalRepositories = portalRepositories;
-        _bpdmService = bpdmService;
-        _settings = options.Value;
-    }
+    private readonly BpdmServiceSettings _settings = options.Value;
 
     public async Task<IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult> PushLegalEntity(IApplicationChecklistService.WorkerChecklistProcessStepData context, CancellationToken cancellationToken)
     {
-        var result = await _portalRepositories.GetInstance<IApplicationRepository>().GetBpdmDataForApplicationAsync(context.ApplicationId).ConfigureAwait(ConfigureAwaitOptions.None);
+        var result = await portalRepositories.GetInstance<IApplicationRepository>().GetBpdmDataForApplicationAsync(context.ApplicationId).ConfigureAwait(ConfigureAwaitOptions.None);
 
         if (result == default)
         {
@@ -88,8 +83,11 @@ public BpdmBusinessLogic(IPortalRepositories portalRepositories, IBpdmService bp
             data.Region,
             data.Identifiers);
 
-        await _bpdmService.PutInputLegalEntity(bpdmTransferData, cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
-        await _bpdmService.SetSharingStateToReady(context.ApplicationId.ToString(), cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
+        await bpdmService.PutInputLegalEntity(bpdmTransferData, cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
+        if (!_settings.StartSharingStateAsReady)
+        {
+            await bpdmService.SetSharingStateToReady(context.ApplicationId.ToString(), cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
+        }
 
         return new IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult(
             ProcessStepStatusId.DONE,
@@ -102,15 +100,15 @@ public BpdmBusinessLogic(IPortalRepositories portalRepositories, IBpdmService bp
 
     public async Task<IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult> HandlePullLegalEntity(IApplicationChecklistService.WorkerChecklistProcessStepData context, CancellationToken cancellationToken)
     {
-        var result = await _portalRepositories.GetInstance<IApplicationRepository>()
+        var result = await portalRepositories.GetInstance<IApplicationRepository>()
             .GetBpdmDataForApplicationAsync(context.ApplicationId).ConfigureAwait(ConfigureAwaitOptions.None);
 
         if (result == default)
         {
             throw new UnexpectedConditionException($"CompanyApplication {context.ApplicationId} does not exist");
         }
 
-        var sharingState = await _bpdmService.GetSharingState(context.ApplicationId, cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
+        var sharingState = await bpdmService.GetSharingState(context.ApplicationId, cancellationToken).ConfigureAwait(ConfigureAwaitOptions.None);
         if (sharingState.SharingProcessStarted == null)
         {
             return new IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult(ProcessStepStatusId.TODO, null, null, null, false, "SharingProcessStarted was not set");
@@ -132,15 +130,15 @@ await HandlePullLegalEntityInternal(context, result.CompanyId, result.BpdmData,
         BpdmData data,
         CancellationToken cancellationToken)
     {
-        var legalEntity = await _bpdmService.FetchInputLegalEntity(context.ApplicationId.ToString(), cancellationToken)
+        var legalEntity = await bpdmService.FetchInputLegalEntity(context.ApplicationId.ToString(), cancellationToken)
             .ConfigureAwait(ConfigureAwaitOptions.None);
 
         if (string.IsNullOrEmpty(legalEntity.LegalEntity?.Bpnl))
         {
             return new IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult(ProcessStepStatusId.TODO, null, null, null, false, null);
         }
 
-        _portalRepositories.GetInstance<ICompanyRepository>().AttachAndModifyCompany(
+        portalRepositories.GetInstance<ICompanyRepository>().AttachAndModifyCompany(
             companyId,
             company =>
             {

diff --git a/src/processes/Processes.Worker/appsettings.json b/src/processes/Processes.Worker/appsettings.json
@@ -321,7 +321,8 @@
       "Scope": "",
       "TokenAddress": "",
       "BaseAddress": "",
-      "UseDimWallet": false
+      "UseDimWallet": false,
+      "StartSharingStateAsReady": false
     },
     "SdFactory":{
       "Username": "",

diff --git a/tests/administration/Administration.Service.Tests/appsettings.IntegrationTests.json b/tests/administration/Administration.Service.Tests/appsettings.IntegrationTests.json
@@ -303,7 +303,9 @@
       "ClientSecret": "test",
       "Scope": "test",
       "TokenAddress": "test",
-      "BaseAddress": "test"
+      "BaseAddress": "test",
+      "UseDimWallet": false,
+      "StartSharingStateAsReady": false
     },
     "Clearinghouse": {
       "Username": "test",