diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyApplicationWithStatus.cs b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyApplicationWithStatus.cs index 9c0198d6d7..4d8e156e90 100644 --- a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyApplicationWithStatus.cs +++ b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyApplicationWithStatus.cs @@ -26,8 +26,10 @@ public record CompanyApplicationWithStatus ( Guid ApplicationId, CompanyApplicationStatusId ApplicationStatus, + CompanyApplicationTypeId ApplicationType, IEnumerable ApplicationChecklist ); + public record ApplicationChecklistData(ApplicationChecklistEntryTypeId TypeId, ApplicationChecklistEntryStatusId StatusId); public record CompanyApplicationDeclineData( diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/UserRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/UserRepository.cs index e5ca10f0d3..904b33ef17 100644 --- a/src/portalbackend/PortalBackend.DBAccess/Repositories/UserRepository.cs +++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/UserRepository.cs @@ -48,6 +48,7 @@ public IAsyncEnumerable GetApplicationsWithStatusU .Select(companyApplication => new CompanyApplicationWithStatus( companyApplication.Id, companyApplication.ApplicationStatusId, + companyApplication.CompanyApplicationTypeId, companyApplication.ApplicationChecklistEntries.Select(ace => new ApplicationChecklistData(ace.ApplicationChecklistEntryTypeId, ace.ApplicationChecklistEntryStatusId)))) .AsAsyncEnumerable(); diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/UserRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/UserRepositoryTests.cs index d72402a755..ecbd659f32 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/UserRepositoryTests.cs +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/UserRepositoryTests.cs @@ -370,7 +370,8 @@ public async Task GetApplicationsWithStatusUntrackedAsync_ReturnsExpected() // Assert result.Should().NotBeNull().And.Satisfy(x => x.ApplicationId == new Guid("6b2d1263-c073-4a48-bfaf-704dc154ca9e") && - x.ApplicationStatus == CompanyApplicationStatusId.SUBMITTED); + x.ApplicationStatus == CompanyApplicationStatusId.SUBMITTED && + x.ApplicationType == CompanyApplicationTypeId.INTERNAL); result.Single().ApplicationChecklist.Should().Satisfy( y => y.TypeId == ApplicationChecklistEntryTypeId.APPLICATION_ACTIVATION && y.StatusId == ApplicationChecklistEntryStatusId.TO_DO, y => y.TypeId == ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER && y.StatusId == ApplicationChecklistEntryStatusId.DONE, diff --git a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs index 9191547940..aca2bbf783 100644 --- a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs +++ b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs @@ -323,6 +323,7 @@ public async Task GetAllApplicationsForUserWithStatus_WithValidUser_GetsAllRoles new CompanyApplicationWithStatus( _fixture.Create(), CompanyApplicationStatusId.VERIFY, + CompanyApplicationTypeId.INTERNAL, new[] { new ApplicationChecklistData(ApplicationChecklistEntryTypeId.APPLICATION_ACTIVATION,