fix review-findings rebuilding migration

eclipse-tractusx · Nov 28, 2023 · 2f4aaef · 2f4aaef
1 parent 78da570
commit 2f4aaef
Show file tree

Hide file tree

Showing 14 changed files with 3,601 additions and 11,645 deletions.
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/ClearinghouseData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/ClearinghouseData.cs
@@ -35,7 +35,7 @@ public record ParticipantDetails(
     [property: JsonPropertyName("bpn")] string? Bpn,
     [property: JsonPropertyName("region")] string? Region,
     [property: JsonPropertyName("zipCode")] string? ZipCode,
-    [property: JsonPropertyName("country")] string Country,
+    [property: JsonPropertyName("country")] string? Country,
     [property: JsonPropertyName("countryAlpha2Code")] string CountryAlpha2Code
 );
 

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ApplicationRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ApplicationRepository.cs
@@ -125,7 +125,7 @@ public void DeleteInvitations(IEnumerable<Guid> invitationIds) =>
                     data.Company.AddressId,
                     data.Company.Address!.Streetname,
                     data.Company.Address.City,
-                    data.Company.Address.Country!.CountryNameDe,
+                    data.Company.Address.Country!.CountryLongNames.Where(cln => cln.ShortName == "de").Select(cln => cln.LongName).SingleOrDefault(),
                     data.Company.CompanyIdentifiers.Select(x => x.UniqueIdentifierId),
                     data.Company.CompanyAssignedRoles.Select(companyAssignedRole => companyAssignedRole.CompanyRoleId)),
                 data.Consents.Select(consent =>
@@ -262,7 +262,7 @@ public IQueryable<CompanyApplication> GetAllCompanyApplicationsDetailsQuery(stri
                     companyApplication.Company.Address.Streetadditional,
                     companyApplication.Company.Address.Streetnumber,
                     companyApplication.Company.Address.Zipcode,
-                    companyApplication.Company.Address.Country!.CountryNameDe,
+                    companyApplication.Company.Address.Country!.CountryLongNames.Where(cln => cln.ShortName == "de").Select(cln => cln.LongName).SingleOrDefault(),
                     companyApplication.Company.CompanyAssignedRoles.SelectMany(assigned =>
                         assigned.CompanyRole!.AgreementAssignedCompanyRoles.Select(x =>
                             new AgreementsData(
@@ -359,7 +359,7 @@ public IQueryable<CompanyApplication> GetAllCompanyApplicationsDetailsQuery(stri
                         ca.Company.BusinessPartnerNumber,
                         ca.Address.Region,
                         ca.Address.Zipcode,
-                        ca.Address.Country!.CountryNameEn,
+                        ca.Address.Country!.CountryLongNames.Where(cln => cln.ShortName == "en").Select(cln => cln.LongName).SingleOrDefault(),
                         ca.Address.CountryAlpha2Code),
                 ca.CompanyIdentifiers.Select(ci => new UniqueIdData(ci.UniqueIdentifier!.Label, ci.Value))))
             .SingleOrDefaultAsync();

diff --git a/...PortalBackend.Migrations/Migrations/20231122104721_CPLP-3451-CountryLongNames.Designer.cs b/...PortalBackend.Migrations/Migrations/20231122104721_CPLP-3451-CountryLongNames.Designer.cs
diff --git a/...lbackend/PortalBackend.Migrations/Migrations/20231122104721_CPLP-3451-CountryLongNames.cs b/...lbackend/PortalBackend.Migrations/Migrations/20231122104721_CPLP-3451-CountryLongNames.cs