Merge pull request #193 from DFE-Digital/release-connect-amendments-a…

…dd-service Merge release connect amendments add service into main
DFE-Digital · Oct 22, 2024 · 9bdae8d · 9bdae8d
2 parents 9022577 + c4f99bd
commit 9bdae8d
Show file tree

Hide file tree

Showing 151 changed files with 31,982 additions and 44,825 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -42,7 +42,7 @@
     <PackageVersion Include="EncryptColumn.Core" Version="1.0.0" />
     <PackageVersion Include="EntityFramework" Version="6.5.1" />
     <PackageVersion Include="Enums.NET" Version="5.0.0" />
-    <PackageVersion Include="FamilyHubs.SharedKernel.Razor" Version="9.3.4" />
+    <PackageVersion Include="FamilyHubs.SharedKernel.Razor" Version="9.5.1" />
     <PackageVersion Include="Fare" Version="2.2.1" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.33.0" />

diff --git a/src/service/idam-api/src/FamilyHubs.Idam.Core/Services/IdamsTelemetryPiiRedactor.cs b/src/service/idam-api/src/FamilyHubs.Idam.Core/Services/IdamsTelemetryPiiRedactor.cs
@@ -27,7 +27,6 @@ namespace FamilyHubs.Idam.Core.Services;
 /// </remarks>>
 public class IdamsTelemetryPiiRedactor : ITelemetryInitializer
 {
-    // longtitude is due to the spelling error in the API. at some point, we should fix that (and all the consumers)
     private static readonly Regex SiteQueryStringRegex = new(@"(?<=(email|name)=)[^&]+", RegexOptions.Compiled);
     private static readonly Regex ApiQueryStringRegex = new(@"(?<=email=)([-+]?[0-9]*\.?[0-9]+)(?=&)|(?<=name=)([-+]?[0-9]*\.?[0-9]+)(?=&)");
     private static readonly Regex EmailRegex = new(@"(?<=email\/)[\w% ]+", RegexOptions.Compiled);

diff --git a/...sts/FamilyHubs.Referral.Api.AcceptanceTests/Tests/Steps/MetricsConnectionRequestsSteps.cs b/...sts/FamilyHubs.Referral.Api.AcceptanceTests/Tests/Steps/MetricsConnectionRequestsSteps.cs
@@ -120,7 +120,6 @@ private static ReferralDto GetReferralDto()
                 OrganisationDto = new OrganisationDto
                 {
                     Id = 237,
-                    ReferralServiceId = 809,
                     Name = "Elop Mentoring",
                     Description = "Elop Mentoring",
                 }

diff --git a/...eferral-api/src/FamilyHubs.Referral.Core/Commands/CreateReferral/CreateReferralCommand.cs b/...eferral-api/src/FamilyHubs.Referral.Core/Commands/CreateReferral/CreateReferralCommand.cs
@@ -178,6 +178,7 @@ private Data.Entities.Referral AttachExistingUserAccount(Data.Entities.Referral
                 Id = sdService.Id,
                 Name = sdService.Name,
                 Description = sdService.Description,
+                OrganizationId = organisation.Id,
                 Organisation = organisation
             };
 

diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Core/ConnectTelemetryPiiRedactor.cs b/src/service/referral-api/src/FamilyHubs.Referral.Core/ConnectTelemetryPiiRedactor.cs
@@ -27,7 +27,6 @@ namespace FamilyHubs.Referral.Core;
 /// </remarks>>
 public class ConnectTelemetryPiiRedactor : ITelemetryInitializer
 {
-    // longtitude is due to the spelling error in the API. at some point, we should fix that (and all the consumers)
     private static readonly Regex SiteQueryStringRegex = new(@"(?<=(email|postcode)=)[^&]+", RegexOptions.Compiled);
     private static readonly Regex PathRegex = new(@"(?<=postcodes\/)[\w% ]+", RegexOptions.Compiled);
     private static readonly string[] TracePropertiesToRedact = { "Uri", "Scope", "QueryString", "HostingRequestStartingLog", "HostingRequestFinishedLog" };

diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Data/Config/ReferralServiceConfiguration.cs b/src/service/referral-api/src/FamilyHubs.Referral.Data/Config/ReferralServiceConfiguration.cs
@@ -10,10 +10,10 @@ public void Configure(EntityTypeBuilder<Entities.ReferralService> builder)
     {
         builder.Navigation(e => e.Organisation).AutoInclude();
 
-        builder.HasOne(s => s.Organisation)
-           .WithOne()
-           .HasForeignKey<Organisation>(lc => lc.ReferralServiceId)
-           .IsRequired(false);
+        builder.HasOne<Organisation>(e => e.Organisation)
+            .WithMany()
+            .HasForeignKey(e => e.OrganizationId)
+            .IsRequired();
 
         builder.Property(t => t.Name)
             .IsRequired()

diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Data/Entities/Organisation.cs b/src/service/referral-api/src/FamilyHubs.Referral.Data/Entities/Organisation.cs
@@ -2,7 +2,6 @@
 
 public class Organisation : EntityBase<long>
 {
-    public long? ReferralServiceId { get; set; }
     public required string Name { get; set; }
     public string? Description { get; set; }
 }
diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Data/Entities/ReferralService.cs b/src/service/referral-api/src/FamilyHubs.Referral.Data/Entities/ReferralService.cs
@@ -5,5 +5,7 @@ public class ReferralService : EntityBase<long>
     public required string Name { get; set; }
     public string? Description { get; set; }
     public string? Url { get; set; }
-    public virtual required Organisation Organisation { get; set; }
+
+    public required long OrganizationId { get; set; }
+    public Organisation Organisation { get; set; } = null!;
 }
diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Data/FamilyHubs.Referral.Data.csproj b/src/service/referral-api/src/FamilyHubs.Referral.Data/FamilyHubs.Referral.Data.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-	  <NoWarn>S1135</NoWarn>
-	  <NuGetAuditMode>direct</NuGetAuditMode>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
+	<PropertyGroup>
+		<NoWarn>S1135</NoWarn>
+		<NuGetAuditMode>direct</NuGetAuditMode>
+		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Ardalis.GuardClauses" />
@@ -20,19 +20,19 @@
 		</PackageReference>
 		<PackageReference Include="NETStandard.Library" />
 		<PackageReference Include="SonarAnalyzer.CSharp">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Data.Sqlite" />
 	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Migrations\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="Migrations\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\shared\referral-shared\src\FamilyHubs.ReferralService.Shared\FamilyHubs.ReferralService.Shared.csproj" />
-    <ProjectReference Include="..\..\..\..\shared\shared-kernel\src\fh-shared-kernel.shared-kernel\FamilyHubs.SharedKernel.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\..\shared\referral-shared\src\FamilyHubs.ReferralService.Shared\FamilyHubs.ReferralService.Shared.csproj" />
+		<ProjectReference Include="..\..\..\..\shared\shared-kernel\src\fh-shared-kernel.shared-kernel\FamilyHubs.SharedKernel.csproj" />
+	</ItemGroup>
 
-</Project>
+</Project>