feat(offers): remove provider from offer (eclipse-tractusx#911)

* feat(offers): remove provider from offer instead of having a separate property for the provider the providing companies name is used * change offer provider_company_id to mandatory (non-nullable) Refs: eclipse-tractusx#811 --------- Co-authored-by: Norbert Truchsess <[email protected]>
tfjanjua · Sep 12, 2024 · 4e3958c · 4e3958c
1 parent 444a8ab
commit 4e3958c
Show file tree

Hide file tree

Showing 54 changed files with 10,432 additions and 600 deletions.
diff --git a/src/administration/Administration.Service/BusinessLogic/IUserRolesBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IUserRolesBusinessLogic.cs
@@ -17,7 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;

diff --git a/src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Microsoft.Extensions.Options;
-using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Async;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq;

diff --git a/src/externalsystems/Custodian.Library/ICustodianService.cs b/src/externalsystems/Custodian.Library/ICustodianService.cs
@@ -20,10 +20,6 @@
 
 using Org.Eclipse.TractusX.Portal.Backend.Custodian.Library.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Custodian.Library;
 

diff --git a/src/externalsystems/IssuerComponent.Library/BusinessLogic/IssuerComponentBusinessLogic.cs b/src/externalsystems/IssuerComponent.Library/BusinessLogic/IssuerComponentBusinessLogic.cs
@@ -24,7 +24,6 @@
 using Org.Eclipse.TractusX.Portal.Backend.IssuerComponent.Library.Models;
 using Org.Eclipse.TractusX.Portal.Backend.IssuerComponent.Library.Service;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Library;

diff --git a/src/keycloak/Keycloak.Factory/KeycloakSettingData.cs b/src/keycloak/Keycloak.Factory/KeycloakSettingData.cs
@@ -21,7 +21,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
-using System.Runtime.Serialization;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory;
 

diff --git a/src/mailing/Mailing.SendMail/MailSettings.cs b/src/mailing/Mailing.SendMail/MailSettings.cs
@@ -20,7 +20,6 @@
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using MimeKit;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail

diff --git a/src/marketplace/Apps.Service/BusinessLogic/AppReleaseBusinessLogic.cs b/src/marketplace/Apps.Service/BusinessLogic/AppReleaseBusinessLogic.cs
diff --git a/src/marketplace/Apps.Service/ViewModels/AppRequestModel.cs b/src/marketplace/Apps.Service/ViewModels/AppRequestModel.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2022 BMW Group AG
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -28,7 +27,6 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels;
 /// Request Model for App Creation.
 /// </summary>
 /// <param name="Title">Title</param>
-/// <param name="Provider">Provider</param>
 /// <param name="SalesManagerId">SalesManagerId</param>
 /// <param name="UseCaseIds">UseCaseIds</param>
 /// <param name="Descriptions">Descriptions</param>
@@ -40,7 +38,6 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels;
 /// <param name="ContactNumber">Price</param>
 public record AppRequestModel(
     string? Title,
-    string Provider,
     Guid? SalesManagerId,
     IEnumerable<Guid> UseCaseIds,
     IEnumerable<LocalizedDescription> Descriptions,

diff --git a/src/marketplace/Offers.Library/DependencyInjection/OfferSetupServiceExtensions.cs b/src/marketplace/Offers.Library/DependencyInjection/OfferSetupServiceExtensions.cs
@@ -18,7 +18,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Token;

diff --git a/src/marketplace/Offers.Library/Service/OfferService.cs b/src/marketplace/Offers.Library/Service/OfferService.cs
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyCertificateBpnData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyCertificateBpnData.cs
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-using System.Reflection.Metadata;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 

diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/OfferReleaseData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/OfferReleaseData.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2022 BMW Group AG
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -25,7 +24,6 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 /// Data Object for the Offer Release data
 /// </summary>
 /// <param name="Name"></param>
-/// <param name="ProviderCompanyId"></param>
 /// <param name="CompanyName"></param>
 /// <param name="IsDescriptionLongNotSet"></param>
 /// <param name="IsDescriptionShortNotSet"></param>
@@ -35,7 +33,6 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 /// <returns></returns>
 public record OfferReleaseData(
     string? Name,
-    Guid? ProviderCompanyId,
     string CompanyName,
     bool IsDescriptionLongNotSet,
     bool IsDescriptionShortNotSet,

diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/ServiceOverviewData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/ServiceOverviewData.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2022 BMW Group AG
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -36,7 +35,7 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 /// <param name="ServiceTypeIds">Collection of the assigned serviceTypeIds.</param>
 public record ServiceOverviewData(
     Guid Id,
-    string Title,
+    string? Title,
     string Provider,
     string? ContactEmail,
     string? Description,

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRepository.cs
@@ -83,12 +83,6 @@ public void CreateUpdateDeleteIdentifiers(Guid companyId, IEnumerable<(UniqueIde
             (entity, initial) => entity.Value = initial.Value,
             (entity, modified) => entity.Value = modified.Value);
 
-    public Task<(bool IsValidCompany, string CompanyName)> GetCompanyNameUntrackedAsync(Guid companyId) =>
-        context.Companies
-            .Where(x => x.Id == companyId)
-            .Select(company => new ValueTuple<bool, string>(true, company.Name))
-            .SingleOrDefaultAsync();
-
     public Task<(string? Bpn, IEnumerable<Guid> TechnicalUserRoleIds)> GetBpnAndTechnicalUserRoleIds(Guid companyId, string technicalUserClientId) =>
         context.Companies
             .AsNoTracking()

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyCertificateRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyCertificateRepository.cs
@@ -19,7 +19,6 @@
 
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyRepository.cs
@@ -46,8 +46,6 @@ public interface ICompanyRepository
 
     void CreateUpdateDeleteIdentifiers(Guid companyId, IEnumerable<(UniqueIdentifierId UniqueIdentifierId, string Value)> initialItems, IEnumerable<(UniqueIdentifierId UniqueIdentifierId, string Value)> modifiedItems);
 
-    Task<(bool IsValidCompany, string CompanyName)> GetCompanyNameUntrackedAsync(Guid companyId);
-
     Task<(string? Bpn, IEnumerable<Guid> TechnicalUserRoleIds)> GetBpnAndTechnicalUserRoleIds(Guid companyId, string technicalUserClientId);
 
     /// <summary>

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferRepository.cs
@@ -40,10 +40,10 @@ public interface IOfferRepository
     /// <summary>
     /// Adds an app to the database
     /// </summary>
-    /// <param name="provider">Provider of the app</param>
     /// <param name="offerType">Type of the app</param>
+    /// <param name="providerCompanyId">the offer providers CompanyId</param>
     /// <param name="setOptionalParameters">Action to set the optional parameters</param>
-    Offer CreateOffer(string provider, OfferTypeId offerType, Action<Offer>? setOptionalParameters = null);
+    Offer CreateOffer(OfferTypeId offerType, Guid providerCompanyId, Action<Offer>? setOptionalParameters = null);
 
     void AttachAndModifyOffer(Guid offerId, Action<Offer> setOptionalParameters, Action<Offer>? initializeParemeters = null);