fix(registration): disable duplicate bpn check (#406)

disable the duplicate bpn check for endpoint /api/registration/application/{applicationId}/companyDetailsWithAddress Refs: CPLP-3665
eclipse-tractusx · Jan 12, 2024 · 20ae54f · 20ae54f
1 parent 4405f94
commit 20ae54f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/src/administration/Administration.Service/BusinessLogic/NetworkBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/NetworkBusinessLogic.cs
@@ -184,7 +184,8 @@ public Task RetriggerProcessStep(string externalId, ProcessStepTypeId processSte
         await data.ValidateDatabaseData(
             bpn => _portalRepositories.GetInstance<ICompanyRepository>().CheckBpnExists(bpn),
             alpha2Code => countryRepository.CheckCountryExistsByAlpha2CodeAsync(alpha2Code),
-            (countryAlpha2Code, uniqueIdentifierIds) => countryRepository.GetCountryAssignedIdentifiers(countryAlpha2Code, uniqueIdentifierIds)).ConfigureAwait(false);
+            (countryAlpha2Code, uniqueIdentifierIds) => countryRepository.GetCountryAssignedIdentifiers(countryAlpha2Code, uniqueIdentifierIds),
+            true).ConfigureAwait(false);
 
         if (!data.CompanyRoles.Any())
         {

diff --git a/src/registration/Registration.Common/RegistrationValidation.cs b/src/registration/Registration.Common/RegistrationValidation.cs
@@ -74,9 +74,9 @@ public static void ValidateData(this RegistrationData data)
         }
     }
 
-    public static async Task ValidateDatabaseData(this RegistrationData data, Func<string, Task<bool>> checkBpn, Func<string, Task<bool>> checkCountryExistByAlpha2Code, Func<string, IEnumerable<UniqueIdentifierId>, Task<(bool IsValidCountry, IEnumerable<UniqueIdentifierId> UniqueIdentifierIds)>> getCountryAssignedIdentifiers)
+    public static async Task ValidateDatabaseData(this RegistrationData data, Func<string, Task<bool>> checkBpn, Func<string, Task<bool>> checkCountryExistByAlpha2Code, Func<string, IEnumerable<UniqueIdentifierId>, Task<(bool IsValidCountry, IEnumerable<UniqueIdentifierId> UniqueIdentifierIds)>> getCountryAssignedIdentifiers, bool checkBpnAlreadyExists)
     {
-        if (data.BusinessPartnerNumber != null && await checkBpn(data.BusinessPartnerNumber.ToUpper()).ConfigureAwait(false))
+        if (data.BusinessPartnerNumber != null && checkBpnAlreadyExists && await checkBpn(data.BusinessPartnerNumber.ToUpper()).ConfigureAwait(false))
         {
             throw new ControllerArgumentException($"The Bpn {data.BusinessPartnerNumber} already exists", nameof(data.BusinessPartnerNumber));
         }

diff --git a/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs b/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs
@@ -287,7 +287,8 @@ await companyDetails.ValidateDatabaseData(
                 _portalRepositories.GetInstance<ICountryRepository>()
                     .GetCountryAssignedIdentifiers(
                         countryAlpha2Code,
-                        uniqueIdentifierIds)).ConfigureAwait(false);
+                        uniqueIdentifierIds),
+            false).ConfigureAwait(false);
 
         var applicationRepository = _portalRepositories.GetInstance<IApplicationRepository>();
         var companyRepository = _portalRepositories.GetInstance<ICompanyRepository>();

diff --git a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
@@ -559,12 +559,13 @@ public async Task SetCompanyWithAddressAsync__WithInvalidBpn_ThrowsControllerArg
     }
 
     [Fact]
-    public async Task SetCompanyWithAddressAsync__WithExistingBpn_ThrowsControllerArgumentException()
+    public async Task SetCompanyWithAddressAsync__WithExistingBpn_ModifiesCompany()
     {
         //Arrange
         var applicationId = Guid.NewGuid();
         var companyId = Guid.NewGuid();
         var identityData = A.Fake<IIdentityData>();
+        Company? company = null;
         A.CallTo(() => identityData.IdentityId).Returns(Guid.NewGuid());
         A.CallTo(() => identityData.IdentityTypeId).Returns(IdentityTypeId.COMPANY_USER);
         A.CallTo(() => identityData.CompanyId).Returns(companyId);
@@ -587,12 +588,35 @@ public async Task SetCompanyWithAddressAsync__WithExistingBpn_ThrowsControllerAr
             _identityService,
             _dateTimeProvider);
 
+        var existingData = _fixture.Build<CompanyApplicationDetailData>()
+            .With(x => x.IsUserOfCompany, true)
+            .Create();
+
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, A<Guid>._, companyId))
+            .Returns(existingData);
+
+        A.CallTo(() => _companyRepository.AttachAndModifyCompany(A<Guid>._, A<Action<Company>>._, A<Action<Company>>._))
+            .Invokes((Guid companyId, Action<Company>? initialize, Action<Company> modify) =>
+            {
+                company = new Company(companyId, null!, default, default);
+                initialize?.Invoke(company);
+                modify(company);
+            });
+
         // Act
-        async Task Act() => await sut.SetCompanyDetailDataAsync(applicationId, companyData).ConfigureAwait(false);
+        await sut.SetCompanyDetailDataAsync(applicationId, companyData).ConfigureAwait(false);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ControllerArgumentException>(Act);
-        ex.Message.Should().Be($"The Bpn {companyData.BusinessPartnerNumber} already exists (Parameter 'BusinessPartnerNumber')");
+        A.CallTo(() => _companyRepository.AttachAndModifyCompany(A<Guid>._, A<Action<Company>>._, A<Action<Company>>._))
+            .MustHaveHappenedOnceExactly();
+        A.CallTo(() => _portalRepositories.SaveAsync()).MustHaveHappenedOnceExactly();
+
+        company.Should().NotBeNull();
+        company.Should().Match<Company>(c =>
+            c.Id == companyId &&
+            c.Name == companyData.Name &&
+            c.Shortname == companyData.ShortName &&
+            c.BusinessPartnerNumber == companyData.BusinessPartnerNumber);
     }
 
     [Fact]