fix: revert exception handling for connector wo tech user change (#1441)

* Revert "fix: add connector type check for validate technical user (#1427)"

This reverts commit 551c069.

* Revert "fix: add exception handling for connector with out tech user (#1411)"

This reverts commit 6dbe4e0.

* doc: remove changelog entry for reverted connector tech user validation

Author: typecastcloud

CHANGELOG.md

@@ -15,7 +15,6 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel
 
 * **Connector**
   * remove pending subsciptions from managed connectors [#1418](https://github.com/eclipse-tractusx/portal-backend/issues/1418)
-  * add connector type check for validate technical user [#1427](https://github.com/eclipse-tractusx/portal-backend/pull/1427)
 
 * **Subscription Configuration**
   * switch auth and service url in subscription payload [#1403](https://github.com/eclipse-tractusx/portal-backend/pull/1403)
@@ -29,7 +28,6 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel
 
 * **Error Handling**
   * adjust conflict exception error message [#1395](https://github.com/eclipse-tractusx/portal-backend/issues/1395)
-  * add exception handling for connector without tech user [#1411](https://github.com/eclipse-tractusx/portal-backend/pull/1411)
   * fix json deserialization errors resulting in Error 500 [#1423](https://github.com/eclipse-tractusx/portal-backend/pull/1423)
 
 ### Technical Support

src/administration/Administration.Service/BusinessLogic/ConnectorsBusinessLogic.cs

@@ -125,7 +125,7 @@ private async Task<Guid> CreateConnectorInternalAsync(ConnectorInputModel connec
             throw UnexpectedConditionException.Create(AdministrationConnectorErrors.CONNECTOR_UNEXPECTED_NO_BPN_ASSIGNED, new ErrorParameter[] { new(nameof(companyId), companyId.ToString()) });
         }
 
-        await ValidateTechnicalUser(ConnectorTypeId.COMPANY_CONNECTOR, name, technicalUserId, companyId).ConfigureAwait(ConfigureAwaitOptions.None);
+        await ValidateTechnicalUser(technicalUserId, companyId).ConfigureAwait(ConfigureAwaitOptions.None);
 
         var connectorRequestModel = new ConnectorRequestModel(name, connectorUrl, ConnectorTypeId.COMPANY_CONNECTOR, location, companyId, companyId, technicalUserId);
         return await CreateAndRegisterConnectorAsync(
@@ -174,7 +174,7 @@ private async Task<Guid> CreateManagedConnectorInternalAsync(ManagedConnectorInp
             throw ConflictException.Create(AdministrationConnectorErrors.CONNECTOR_CONFLICT_SET_BPN, new ErrorParameter[] { new("companyId", result.CompanyId.ToString()) });
         }
 
-        await ValidateTechnicalUser(ConnectorTypeId.CONNECTOR_AS_A_SERVICE, name, technicalUserId, result.CompanyId).ConfigureAwait(ConfigureAwaitOptions.None);
+        await ValidateTechnicalUser(technicalUserId, result.CompanyId).ConfigureAwait(ConfigureAwaitOptions.None);
 
         var connectorRequestModel = new ConnectorRequestModel(name, connectorUrl, ConnectorTypeId.CONNECTOR_AS_A_SERVICE, location, companyId, result.CompanyId, technicalUserId);
         return await CreateAndRegisterConnectorAsync(
@@ -204,18 +204,15 @@ private async Task CheckDuplicateConnector(string name, string connectorUrl)
         }
     }
 
-    private async Task ValidateTechnicalUser(ConnectorTypeId type, string name, Guid? technicalUserId, Guid companyId)
+    private async Task ValidateTechnicalUser(Guid? technicalUserId, Guid companyId)
     {
         if (technicalUserId == null)
         {
-            if (type != ConnectorTypeId.COMPANY_CONNECTOR)
-                return;
-
-            throw ControllerArgumentException.Create(AdministrationConnectorErrors.CONNECTOR_MISSING_TECH_USER, [new ErrorParameter("name", name)]);
+            return;
         }
 
         var (activeUserExists, linkedToConnectorOrOffer) = await portalRepositories.GetInstance<ITechnicalUserRepository>()
-                .CheckTechnicalUserDetailsAsync(technicalUserId!.Value, companyId).ConfigureAwait(ConfigureAwaitOptions.None);
+                .CheckTechnicalUserDetailsAsync(technicalUserId.Value, companyId).ConfigureAwait(ConfigureAwaitOptions.None);
 
         if (!activeUserExists)
         {

src/administration/Administration.Service/ErrorHandling/AdministrationConnectorErrorMessageContainer.cs

@@ -45,8 +45,7 @@ public class AdministrationConnectorErrorMessageContainer : IErrorMessageContain
         new((int)AdministrationConnectorErrors.CONNECTOR_NOT_HOST_COMPANY,"Company {companyId} is not the connectors host company"),
         new((int)AdministrationConnectorErrors.CONNECTOR_CONFLICT_INACTIVE_STATE,"Connector {connectorId} is in state {connectorStatusId}"),
         new((int)AdministrationConnectorErrors.CONNECTOR_DUPLICATE,"Connector {name} does already exists for url {connectorUrl}"),
-        new((int)AdministrationConnectorErrors.CONNECTOR_ARGUMENT_TECH_USER_IN_USE,"Technical User {technicalUserId} is already used by another connector or offer"),
-        new((int)AdministrationConnectorErrors.CONNECTOR_MISSING_TECH_USER,"Connector {name} must have a technical user")
+        new((int)AdministrationConnectorErrors.CONNECTOR_ARGUMENT_TECH_USER_IN_USE,"Technical User {technicalUserId} is already used by another connector or offer")
     ]);
 
     public Type Type { get => typeof(AdministrationConnectorErrors); }
@@ -75,6 +74,5 @@ public enum AdministrationConnectorErrors
     CONNECTOR_NOT_HOST_COMPANY,
     CONNECTOR_CONFLICT_INACTIVE_STATE,
     CONNECTOR_DUPLICATE,
-    CONNECTOR_ARGUMENT_TECH_USER_IN_USE,
-    CONNECTOR_MISSING_TECH_USER
+    CONNECTOR_ARGUMENT_TECH_USER_IN_USE
 }

tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs

@@ -240,21 +240,7 @@ public async Task GetAllProvidedConnectorsDataWithCheckTypeConnectorAsService_Wi
     }
     #endregion
 
-    #region Create Connector 
-
-    [Fact]
-    public async Task CreateConnectorAsync_WithoutTechnicalUser_ThrowsException()
-    {
-        // Arrange
-        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, null);
-
-        // Act
-        async Task Act() => await _logic.CreateConnectorAsync(connectorInput, CancellationToken.None);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<ControllerArgumentException>(Act);
-        ex.Message.Should().Be(AdministrationConnectorErrors.CONNECTOR_MISSING_TECH_USER.ToString());
-    }
+    #region Create Connector
 
     [Theory]
     [InlineData(true)]
@@ -372,10 +358,8 @@ public async Task CreateConnectorAsync_WithLinkedTechnicalUser_ThrowsControllerA
     public async Task CreateConnectorAsync_WithClientIdNull_DoesntSaveData()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
-        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, sa01);
+        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, null);
 
-        A.CallTo(() => _technicalUserRepository.CheckTechnicalUserDetailsAsync(A<Guid>._, A<Guid>._)).Returns((true, false));
         // Act
         var result = await _logic.CreateConnectorAsync(connectorInput, CancellationToken.None);
 
@@ -388,7 +372,6 @@ public async Task CreateConnectorAsync_WithClientIdNull_DoesntSaveData()
     public async Task CreateConnectorAsync_WithoutSelfDescriptionDocumentAndSdConnectionDisabled_CallsExpected()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
         var sut = new ConnectorsBusinessLogic(_portalRepositories, Options.Create(new ConnectorsSettings
         {
             MaxPageSize = 15,
@@ -414,9 +397,8 @@ public async Task CreateConnectorAsync_WithoutSelfDescriptionDocumentAndSdConnec
             ]
         }), _sdFactoryBusinessLogic, _identityService, _serviceAccountManagement, _dateTimeProvider, A.Fake<ILogger<ConnectorsBusinessLogic>>());
 
-        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, sa01);
+        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, null);
         A.CallTo(() => _identity.CompanyId).Returns(CompanyIdWithoutSdDocument);
-        A.CallTo(() => _technicalUserRepository.CheckTechnicalUserDetailsAsync(A<Guid>._, A<Guid>._)).Returns((true, false));
 
         // Act
         await sut.CreateConnectorAsync(connectorInput, CancellationToken.None);
@@ -430,10 +412,9 @@ public async Task CreateConnectorAsync_WithoutSelfDescriptionDocumentAndSdConnec
     public async Task CreateConnectorAsync_WithoutSelfDescriptionDocument_ThrowsUnexpectedException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
-        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, sa01);
+        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, null);
         A.CallTo(() => _identity.CompanyId).Returns(CompanyIdWithoutSdDocument);
-        A.CallTo(() => _technicalUserRepository.CheckTechnicalUserDetailsAsync(A<Guid>._, A<Guid>._)).Returns((true, false));
+
         // Act
         async Task Act() => await _logic.CreateConnectorAsync(connectorInput, CancellationToken.None);
 
@@ -475,9 +456,7 @@ public async Task CreateConnectorAsync_WithCompanyWithoutBpn_ThrowsUnexpectedCon
     public async Task CreateConnectorAsync_WithFailingDapsService_ReturnsCreatedConnectorData()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
-        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, sa01);
-        A.CallTo(() => _technicalUserRepository.CheckTechnicalUserDetailsAsync(A<Guid>._, A<Guid>._)).Returns((true, false));
+        var connectorInput = new ConnectorInputModel("connectorName", "https://test.de", CountryCode_de, null);
 
         // Act
         var result = await _logic.CreateConnectorAsync(connectorInput, CancellationToken.None);
@@ -541,13 +520,12 @@ public async Task CreateManagedConnectorAsync_WithValidInput_ReturnsCreatedConne
     }
 
     [Theory]
-    [InlineData(true, "ac1cf001-7fbc-1f2f-817f-bce058020002")] // Valid technical user
-    [InlineData(false, null)]
-    public async Task CreateManagedConnectorAsync_WithTechnicalUser_ReturnsCreatedConnectorData(bool clearingHouseDisabled, string? technicalUserIdString)
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task CreateManagedConnectorAsync_WithTechnicalUser_ReturnsCreatedConnectorData(bool clearingHouseDisabled)
     {
         // Arrange
-        Guid? technicalUserId = technicalUserIdString != null ? Guid.Parse(technicalUserIdString) : null;
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, _validOfferSubscriptionId, technicalUserId);
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, _validOfferSubscriptionId, null);
         var sut = new ConnectorsBusinessLogic(_portalRepositories, Options.Create(new ConnectorsSettings
         {
             MaxPageSize = 15,
@@ -574,7 +552,6 @@ public async Task CreateManagedConnectorAsync_WithTechnicalUser_ReturnsCreatedCo
         }), _sdFactoryBusinessLogic, _identityService, _serviceAccountManagement, _dateTimeProvider, A.Fake<ILogger<ConnectorsBusinessLogic>>());
 
         SetupTechnicalIdentity();
-        A.CallTo(() => _technicalUserRepository.CheckTechnicalUserDetailsAsync(A<Guid>._, A<Guid>._)).Returns((true, false));
 
         // Act
         var result = await sut.CreateManagedConnectorAsync(connectorInput, CancellationToken.None);
@@ -611,8 +588,7 @@ public async Task CreateManagedConnectorAsync_WithExistingConnector_ThrowsConfli
     public async Task CreateManagedConnectorAsync_WithInvalidLocation_ThrowsControllerArgumentException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", "invalid", _validOfferSubscriptionId, sa01);
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", "invalid", _validOfferSubscriptionId, null);
 
         // Act
         async Task Act() => await _logic.CreateManagedConnectorAsync(connectorInput, CancellationToken.None);
@@ -630,11 +606,10 @@ public async Task CreateManagedConnectorAsync_WithInvalidLocation_ThrowsControll
     public async Task CreateManagedConnectorAsync_WithNotExistingSubscription_ThrowsNotFoundException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionRepository.CheckOfferSubscriptionWithOfferProvider(subscriptionId, ValidCompanyId))
             .Returns((false, default, default, default, default, default, default));
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, sa01);
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, null);
 
         SetupTechnicalIdentity();
 
@@ -650,11 +625,10 @@ public async Task CreateManagedConnectorAsync_WithNotExistingSubscription_Throws
     public async Task CreateManagedConnectorAsync_WithCallerNotOfferProvider_ThrowsForbiddenException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionRepository.CheckOfferSubscriptionWithOfferProvider(subscriptionId, ValidCompanyId))
             .Returns((true, false, default, default, default, default, default));
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, sa01);
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, null);
 
         SetupTechnicalIdentity();
 
@@ -670,11 +644,10 @@ public async Task CreateManagedConnectorAsync_WithCallerNotOfferProvider_ThrowsF
     public async Task CreateManagedConnectorAsync_WithOfferAlreadyLinked_ThrowsUnexpectedConditionException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionRepository.CheckOfferSubscriptionWithOfferProvider(subscriptionId, ValidCompanyId))
             .Returns((true, true, true, default, default, default, default));
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, sa01);
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, null);
 
         SetupTechnicalIdentity();
 
@@ -690,11 +663,10 @@ public async Task CreateManagedConnectorAsync_WithOfferAlreadyLinked_ThrowsUnexp
     public async Task CreateManagedConnectorAsync_WithInactiveSubscription_ThrowsUnexpectedConditionException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionRepository.CheckOfferSubscriptionWithOfferProvider(subscriptionId, ValidCompanyId))
             .Returns((true, true, false, OfferSubscriptionStatusId.INACTIVE, default, default, default));
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, sa01);
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, null);
 
         SetupTechnicalIdentity();
 
@@ -710,12 +682,10 @@ public async Task CreateManagedConnectorAsync_WithInactiveSubscription_ThrowsUne
     public async Task CreateManagedConnectorAsync_WithoutExistingSelfDescriptionDocument_ThrowsUnexpectedException()
     {
         // Arrange
-        var sa01 = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionRepository.CheckOfferSubscriptionWithOfferProvider(subscriptionId, A<Guid>.That.Matches(x => x == ValidCompanyId)))
             .Returns((true, true, false, OfferSubscriptionStatusId.ACTIVE, null, ValidCompanyId, ValidCompanyBpn));
-        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, sa01);
-        A.CallTo(() => _technicalUserRepository.CheckTechnicalUserDetailsAsync(A<Guid>._, A<Guid>._)).Returns((true, false));
+        var connectorInput = new ManagedConnectorInputModel("connectorName", "https://test.de", CountryCode_de, subscriptionId, null);
 
         // Act
         async Task Act() => await _logic.CreateManagedConnectorAsync(connectorInput, CancellationToken.None);