feat(app) : added subscriptionId field to activeSubscription Endpoint (…

…#258) Refs: CPLP-3233 Reviewed-By: Phil Schneider <[email protected]>
eclipse-tractusx · Sep 11, 2023 · fcef047 · fcef047
1 parent 0ae6589
commit fcef047
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionStatusData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionStatusData.cs
@@ -51,7 +51,8 @@ public record ActiveOfferSubscriptionStatusData(
     [property: JsonPropertyName("offerId")] Guid OfferId,
     [property: JsonPropertyName("name")] string? OfferName,
     [property: JsonPropertyName("provider")] string Provider,
-    [property: JsonPropertyName("image")] Guid? DocumentId
+    [property: JsonPropertyName("image")] Guid? DocumentId,
+    [property: JsonPropertyName("subscriptionId")] Guid OfferSubscriptionId
 );
 
 /// <summary>

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs
@@ -523,7 +523,8 @@ public IAsyncEnumerable<ActiveOfferSubscriptionStatusData> GetOwnCompanyActiveSu
                     .Where(document =>
                         document.DocumentTypeId == documentTypeId
                         && document.DocumentStatusId == DocumentStatusId.LOCKED)
-                    .Select(document => document.Id).FirstOrDefault()
+                    .Select(document => document.Id).FirstOrDefault(),
+                os.Id
             )).ToAsyncEnumerable();
 
     /// <inheritdoc>

diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs
@@ -996,7 +996,8 @@ public async Task GetOwnCompanyActiveSubscribedOfferSubscriptionStatusesUntracke
             x => x.OfferId == new Guid("ac1cf001-7fbc-1f2f-817f-bce0572c0007") &&
                 x.OfferName == "Trace-X" &&
                 x.Provider == "Catena-X" &&
-                x.DocumentId == new Guid("e020787d-1e04-4c0b-9c06-bd1cd44724b1"));
+                x.DocumentId == new Guid("e020787d-1e04-4c0b-9c06-bd1cd44724b1") &&
+                x.OfferSubscriptionId == new Guid("ed4de48d-fd4b-4384-a72f-ecae3c6cc5ba"));
     }
 
     [Fact]