diff --git a/src/marketplace/Apps.Service/BusinessLogic/AppsBusinessLogic.cs b/src/marketplace/Apps.Service/BusinessLogic/AppsBusinessLogic.cs index 413bc7f8f5..1d2b99203c 100644 --- a/src/marketplace/Apps.Service/BusinessLogic/AppsBusinessLogic.cs +++ b/src/marketplace/Apps.Service/BusinessLogic/AppsBusinessLogic.cs @@ -170,7 +170,8 @@ public async Task AddFavouriteAppForUserAsync(Guid appId) item.OfferId, item.ServiceName, item.CompanySubscriptionStatuses, - item.Image == Guid.Empty ? null : item.Image))); + item.Image == Guid.Empty ? null : item.Image, + item.ProcessStepTypeId == default ? null : item.ProcessStepTypeId))); } return await Pagination.CreateResponseAsync(page, size, _settings.ApplicationsMaxPageSize, GetCompanyProvidedAppSubscriptionStatusData).ConfigureAwait(false); } diff --git a/src/marketplace/Offers.Library/Models/OfferCompanySubscriptionStatusResponse.cs b/src/marketplace/Offers.Library/Models/OfferCompanySubscriptionStatusResponse.cs index 1d1b5fe86e..dc1fdeb0d9 100644 --- a/src/marketplace/Offers.Library/Models/OfferCompanySubscriptionStatusResponse.cs +++ b/src/marketplace/Offers.Library/Models/OfferCompanySubscriptionStatusResponse.cs @@ -19,6 +19,7 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; namespace Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; @@ -34,5 +35,6 @@ public record OfferCompanySubscriptionStatusResponse( Guid OfferId, string? OfferName, IEnumerable CompanySubscriptionStatuses, - Guid? Image + Guid? Image, + ProcessStepTypeId? ProcessStepTypeId ); diff --git a/src/marketplace/Services.Service/BusinessLogic/ServiceBusinessLogic.cs b/src/marketplace/Services.Service/BusinessLogic/ServiceBusinessLogic.cs index 32b79a0cef..89175d40b3 100644 --- a/src/marketplace/Services.Service/BusinessLogic/ServiceBusinessLogic.cs +++ b/src/marketplace/Services.Service/BusinessLogic/ServiceBusinessLogic.cs @@ -147,7 +147,8 @@ public Task AutoSetupServiceAsync(OfferAutoSetupData item.OfferId, item.ServiceName, item.CompanySubscriptionStatuses, - item.Image == Guid.Empty ? null : item.Image))); + item.Image == Guid.Empty ? null : item.Image, + item.ProcessStepTypeId == default ? null : item.ProcessStepTypeId))); } return await Pagination.CreateResponseAsync(page, size, _settings.ApplicationsMaxPageSize, GetCompanyProvidedAppSubscriptionStatusData).ConfigureAwait(false); } diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/OfferCompanySubscriptionStatusData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/OfferCompanySubscriptionStatusData.cs index 2451610794..b46ecd623c 100644 --- a/src/portalbackend/PortalBackend.DBAccess/Models/OfferCompanySubscriptionStatusData.cs +++ b/src/portalbackend/PortalBackend.DBAccess/Models/OfferCompanySubscriptionStatusData.cs @@ -18,6 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; + namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; /// @@ -53,4 +55,10 @@ public OfferCompanySubscriptionStatusData() /// /// public Guid Image { get; set; } + + /// + /// Id of the ProcessStep Type + /// + /// + public ProcessStepTypeId ProcessStepTypeId { get; set; } } diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionDetailData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionDetailData.cs index 4407e3c5e6..dbae3a5460 100644 --- a/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionDetailData.cs +++ b/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionDetailData.cs @@ -70,7 +70,8 @@ public record AppProviderSubscriptionDetailData( IEnumerable Contact, IEnumerable TechnicalUserData, string? TenantUrl, - string AppInstanceId + string AppInstanceId, + ProcessStepTypeId? ProcessStepTypeId ); /// diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs index bdc16659b8..2aa2859afd 100644 --- a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs +++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs @@ -86,7 +86,12 @@ public OfferSubscription CreateOfferSubscription(Guid offerId, Guid companyId, O Image = g.Documents .Where(document => document.DocumentTypeId == DocumentTypeId.APP_LEADIMAGE && document.DocumentStatusId == DocumentStatusId.LOCKED) .Select(document => document.Id) - .FirstOrDefault() + .FirstOrDefault(), + ProcessStepTypeId = g.OfferSubscriptions + .Where(os => os.ProcessId != null) + .Select(os => os.Process!.ProcessSteps + .OrderByDescending(ps => ps.DateCreated) + .Select(ps => ps.ProcessStepTypeId).FirstOrDefault()).FirstOrDefault() }) .SingleOrDefaultAsync(); @@ -244,7 +249,9 @@ public OfferSubscription AttachAndModifyOfferSubscription(Guid offerSubscription x.Company.Identities.Where(i => i.IdentityTypeId == IdentityTypeId.COMPANY_USER).Select(id => id.CompanyUser!).Where(cu => cu.Email != null && cu.Identity!.IdentityAssignedRoles.Select(ur => ur.UserRole!).Any(ur => userRoleIds.Contains(ur.Id))).Select(cu => cu.Email!), x.Subscription.CompanyServiceAccounts.Select(sa => new SubscriptionTechnicalUserData(sa.Id, sa.Name, sa.Identity!.IdentityAssignedRoles.Select(ur => ur.UserRole!).Select(ur => ur.UserRoleText))), x.Subscription.AppSubscriptionDetail!.AppSubscriptionUrl, - x.Subscription.AppSubscriptionDetail!.AppInstance!.IamClient!.ClientClientId) + x.Subscription.AppSubscriptionDetail!.AppInstance!.IamClient!.ClientClientId, + x.Subscription.Process!.ProcessSteps.Any() ? + x.Subscription.Process!.ProcessSteps.OrderByDescending(ps => ps.DateCreated).Select(ps => ps.ProcessStepTypeId).FirstOrDefault() : null) : null)) .SingleOrDefaultAsync(); diff --git a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs index f61f60454c..4ffbc0138b 100644 --- a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs +++ b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs @@ -298,11 +298,11 @@ public async Task GetCompanyProvidedAppSubscriptionStatusesForUserAsync_ReturnsE // Assert result.Meta.NumberOfElements.Should().Be(5); result.Content.Should().HaveCount(5).And.Satisfy( - x => x.OfferId == data[0].OfferId && x.OfferName == data[0].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[0].CompanySubscriptionStatuses) && x.Image == data[0].Image, - x => x.OfferId == data[1].OfferId && x.OfferName == data[1].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[1].CompanySubscriptionStatuses) && x.Image == data[1].Image, - x => x.OfferId == data[2].OfferId && x.OfferName == data[2].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[2].CompanySubscriptionStatuses) && x.Image == data[2].Image, - x => x.OfferId == data[3].OfferId && x.OfferName == data[3].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[3].CompanySubscriptionStatuses) && x.Image == data[3].Image, - x => x.OfferId == data[4].OfferId && x.OfferName == data[4].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[4].CompanySubscriptionStatuses) && x.Image == data[4].Image + x => x.OfferId == data[0].OfferId && x.OfferName == data[0].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[0].CompanySubscriptionStatuses) && x.Image == data[0].Image && x.ProcessStepTypeId == data[0].ProcessStepTypeId, + x => x.OfferId == data[1].OfferId && x.OfferName == data[1].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[1].CompanySubscriptionStatuses) && x.Image == data[1].Image && x.ProcessStepTypeId == data[1].ProcessStepTypeId, + x => x.OfferId == data[2].OfferId && x.OfferName == data[2].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[2].CompanySubscriptionStatuses) && x.Image == data[2].Image && x.ProcessStepTypeId == data[2].ProcessStepTypeId, + x => x.OfferId == data[3].OfferId && x.OfferName == data[3].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[3].CompanySubscriptionStatuses) && x.Image == data[3].Image && x.ProcessStepTypeId == data[3].ProcessStepTypeId, + x => x.OfferId == data[4].OfferId && x.OfferName == data[4].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[4].CompanySubscriptionStatuses) && x.Image == data[4].Image && x.ProcessStepTypeId == data[4].ProcessStepTypeId ); A.CallTo(() => _offerSubscriptionRepository.GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync(_identity.CompanyId, OfferTypeId.APP, default, A>.That.IsSameSequenceAs(new[] { OfferSubscriptionStatusId.PENDING, OfferSubscriptionStatusId.ACTIVE, OfferSubscriptionStatusId.INACTIVE }), offerId)) .MustHaveHappenedOnceExactly(); diff --git a/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs b/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs index 39ad8bf732..a459314780 100644 --- a/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs +++ b/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs @@ -210,11 +210,11 @@ public async Task GetCompanyProvidedServiceSubscriptionStatusesForUserAsync_Retu // Assert result.Meta.NumberOfElements.Should().Be(5); result.Content.Should().HaveCount(5).And.Satisfy( - x => x.OfferId == data[0].OfferId && x.OfferName == data[0].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[0].CompanySubscriptionStatuses) && x.Image == data[0].Image, - x => x.OfferId == data[1].OfferId && x.OfferName == data[1].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[1].CompanySubscriptionStatuses) && x.Image == data[1].Image, - x => x.OfferId == data[2].OfferId && x.OfferName == data[2].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[2].CompanySubscriptionStatuses) && x.Image == data[2].Image, - x => x.OfferId == data[3].OfferId && x.OfferName == data[3].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[3].CompanySubscriptionStatuses) && x.Image == data[3].Image, - x => x.OfferId == data[4].OfferId && x.OfferName == data[4].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[4].CompanySubscriptionStatuses) && x.Image == data[4].Image + x => x.OfferId == data[0].OfferId && x.OfferName == data[0].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[0].CompanySubscriptionStatuses) && x.Image == data[0].Image && x.ProcessStepTypeId == data[0].ProcessStepTypeId, + x => x.OfferId == data[1].OfferId && x.OfferName == data[1].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[1].CompanySubscriptionStatuses) && x.Image == data[1].Image && x.ProcessStepTypeId == data[1].ProcessStepTypeId, + x => x.OfferId == data[2].OfferId && x.OfferName == data[2].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[2].CompanySubscriptionStatuses) && x.Image == data[2].Image && x.ProcessStepTypeId == data[2].ProcessStepTypeId, + x => x.OfferId == data[3].OfferId && x.OfferName == data[3].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[3].CompanySubscriptionStatuses) && x.Image == data[3].Image && x.ProcessStepTypeId == data[3].ProcessStepTypeId, + x => x.OfferId == data[4].OfferId && x.OfferName == data[4].ServiceName && x.CompanySubscriptionStatuses.SequenceEqual(data[4].CompanySubscriptionStatuses) && x.Image == data[4].Image && x.ProcessStepTypeId == data[4].ProcessStepTypeId ); A.CallTo(() => _offerSubscriptionsRepository.GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync(_identity.CompanyId, OfferTypeId.SERVICE, null, A>.That.IsSameSequenceAs(new[] { OfferSubscriptionStatusId.PENDING, OfferSubscriptionStatusId.ACTIVE, OfferSubscriptionStatusId.INACTIVE }), offerId)) .MustHaveHappenedOnceExactly(); diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs index c685cd8cc4..5b0cf73552 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs @@ -136,19 +136,19 @@ public async Task GetAllBusinessAppDataForUserIdAsync_WithValidUser_ReturnsExpec #region GetOwnCompanyProvidedOfferSubscriptionStatusesUntracked [Theory] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, true)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.SERVICE, new OfferSubscriptionStatusId[] { }, 0, false)] - [InlineData(SubscriptionStatusSorting.OfferIdDesc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, false)] - [InlineData(SubscriptionStatusSorting.CompanyNameAsc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, true)] - [InlineData(SubscriptionStatusSorting.CompanyNameDesc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, true)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, "a16e73b9-5277-4b69-9f8d-3b227495dfea", OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 1, false)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, "a16e73b9-5277-4b69-9f8d-3b227495dfae", OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 1, true)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, "deadbeef-dead-beef-dead-beefdeadbeef", OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 0, false)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.ACTIVE }, 1, false)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.INACTIVE }, 1, false)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING }, 1, false)] - [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING, OfferSubscriptionStatusId.ACTIVE }, 2, false)] - public async Task GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync_ReturnsExpectedNotificationDetailData(SubscriptionStatusSorting sorting, string? offerIdTxt, OfferTypeId offerTypeId, IEnumerable offerSubscriptionStatusIds, int count, bool technicalUser) + [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, true, ProcessStepTypeId.SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.SERVICE, new OfferSubscriptionStatusId[] { }, 0, false, null)] + [InlineData(SubscriptionStatusSorting.OfferIdDesc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, false, ProcessStepTypeId.ACTIVATE_SUBSCRIPTION)] + [InlineData(SubscriptionStatusSorting.CompanyNameAsc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, true, ProcessStepTypeId.SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION)] + [InlineData(SubscriptionStatusSorting.CompanyNameDesc, null, OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 2, true, ProcessStepTypeId.SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, "a16e73b9-5277-4b69-9f8d-3b227495dfea", OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 1, false, ProcessStepTypeId.ACTIVATE_SUBSCRIPTION)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, "a16e73b9-5277-4b69-9f8d-3b227495dfae", OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 1, true, ProcessStepTypeId.SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, "deadbeef-dead-beef-dead-beefdeadbeef", OfferTypeId.SERVICE, new[] { OfferSubscriptionStatusId.ACTIVE }, 0, false, null)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.ACTIVE }, 1, false, ProcessStepTypeId.RETRIGGER_PROVIDER)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.INACTIVE }, 1, false, ProcessStepTypeId.START_AUTOSETUP)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING }, 1, false, ProcessStepTypeId.TRIGGER_PROVIDER_CALLBACK)] + [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING, OfferSubscriptionStatusId.ACTIVE }, 2, false, ProcessStepTypeId.RETRIGGER_PROVIDER)] + public async Task GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync_ReturnsExpectedNotificationDetailData(SubscriptionStatusSorting sorting, string? offerIdTxt, OfferTypeId offerTypeId, IEnumerable offerSubscriptionStatusIds, int count, bool technicalUser, ProcessStepTypeId? processStepTypeId) { // Arrange Guid? offerId = offerIdTxt == null ? null : new Guid(offerIdTxt); @@ -165,6 +165,7 @@ public async Task GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync_R results.Data.Should().HaveCount(count); results.Data.Should().AllBeOfType().Which.First().CompanySubscriptionStatuses.Should().HaveCount(1); results.Data.Should().AllBeOfType().Which.First().CompanySubscriptionStatuses.Should().Match(x => x.Count() == 1 && x.First().TechnicalUser == technicalUser); + results.Data.Should().AllBeOfType().Which.First().ProcessStepTypeId.Should().Match(x => x == processStepTypeId); } else { @@ -297,7 +298,8 @@ public async Task GetAppSubscriptionDetailForProviderAsync_ReturnsExpected() x.Contact.SequenceEqual(new[] { "tobeadded@cx.com" }) && x.OfferSubscriptionStatus == OfferSubscriptionStatusId.ACTIVE && x.TenantUrl == "https://ec-qas.d13fe27.kyma.ondemand.com" && - x.AppInstanceId == "https://catenax-int-dismantler-s66pftcc.authentication.eu10.hana.ondemand.com"); + x.AppInstanceId == "https://catenax-int-dismantler-s66pftcc.authentication.eu10.hana.ondemand.com" && + x.ProcessStepTypeId == ProcessStepTypeId.ACTIVATE_SUBSCRIPTION); } [Fact] diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/offer_subscriptions.test.json b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/offer_subscriptions.test.json index f2b633e8f3..9ef24181ca 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/offer_subscriptions.test.json +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/offer_subscriptions.test.json @@ -17,7 +17,8 @@ "id": "3DE6A31F-A5D1-4F60-AA3A-4B1A769BECBF", "last_editor_id": null, "display_name": null, - "description": null + "description": null, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe09" }, { "company_id": "2dc4249f-b5ca-4d42-bef1-7a7a950a4f87", @@ -37,7 +38,8 @@ "id": "e80b5f5c-3a16-480b-b82e-1cc06a71fddc", "last_editor_id": null, "display_name": null, - "description": null + "description": null, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe10" }, { "company_id": "2dc4249f-b5ca-4d42-bef1-7a7a950a4f87", @@ -58,7 +60,8 @@ "id": "81a8211d-6261-4969-8123-a420364ae997", "last_editor_id": null, "display_name": null, - "description": null + "description": null, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe11" }, { "company_id": "ac861325-bc54-4583-bcdc-9e9f2a38ff84", @@ -68,7 +71,8 @@ "id": "783eb74f-0fe4-4652-a97e-913141539cf3", "last_editor_id": null, "display_name": null, - "description": null + "description": null, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe12" }, { "company_id": "ac861325-bc54-4583-bcdc-9e9f2a38ff84", @@ -78,7 +82,8 @@ "id": "d395798b-07df-48b6-8e18-fb0f1f23c3ca", "last_editor_id": null, "display_name": null, - "description": null + "description": null, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe13" }, { "company_id": "41fd2ab8-71cd-4546-9bef-a388d91b2542", diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/process_steps.test.json b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/process_steps.test.json index ae0ce08611..c6f3f5def1 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/process_steps.test.json +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/process_steps.test.json @@ -150,5 +150,69 @@ "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe07", "date_created": "2023-02-21 08:15:20.479000 +00:00", "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68069", + "process_step_type_id": 102, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe10", + "date_created": "2023-10-10 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68070", + "process_step_type_id": 103, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe10", + "date_created": "2023-10-11 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68071", + "process_step_type_id": 101, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe09", + "date_created": "2023-02-21 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68072", + "process_step_type_id": 102, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe09", + "date_created": "2023-10-10 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68073", + "process_step_type_id": 105, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe09", + "date_created": "2023-10-11 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68074", + "process_step_type_id": 106, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe11", + "date_created": "2023-10-11 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68075", + "process_step_type_id": 107, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe12", + "date_created": "2023-10-11 08:15:20.479000 +00:00", + "date_last_changed": null + }, + { + "id": "72616420-72a0-42cc-bbdd-0b1a95f68076", + "process_step_type_id": 101, + "process_step_status_id": 1, + "process_id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe13", + "date_created": "2023-10-11 08:15:20.479000 +00:00", + "date_last_changed": null } ] diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/processes.test.json b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/processes.test.json index f4ffcf21fe..11c96797bd 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/processes.test.json +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/Seeder/Data/processes.test.json @@ -34,5 +34,35 @@ "process_type_id" : 1, "lock_expiry_date" : "2023-03-01 00:00:00.000000 +00:00", "version" : "deadbeef-dead-beef-dead-beefdeadbeef" + }, + { + "id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe09", + "process_type_id" : 3, + "lock_expiry_date" : "2023-10-10 00:00:00.000000 +00:00", + "version" : "deadbeef-dead-beef-dead-beefdeadbeef" + }, + { + "id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe10", + "process_type_id" : 3, + "lock_expiry_date" : "2023-10-10 00:00:00.000000 +00:00", + "version" : "deadbeef-dead-beef-dead-beefdeadbeef" + }, + { + "id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe11", + "process_type_id" : 3, + "lock_expiry_date" : "2023-10-10 00:00:00.000000 +00:00", + "version" : "deadbeef-dead-beef-dead-beefdeadbeef" + }, + { + "id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe12", + "process_type_id" : 3, + "lock_expiry_date" : "2023-10-10 00:00:00.000000 +00:00", + "version" : "deadbeef-dead-beef-dead-beefdeadbeef" + }, + { + "id": "0cc208c3-bdf6-456c-af81-6c3ebe14fe13", + "process_type_id" : 3, + "lock_expiry_date" : "2023-10-10 00:00:00.000000 +00:00", + "version" : "deadbeef-dead-beef-dead-beefdeadbeef" } ]