Merge branch 'main' into feature/posts

NielsPilgaard · Dec 8, 2024 · 14031d3 · 14031d3
2 parents 8a40302 + 3bd483a
commit 14031d3
Show file tree

Hide file tree

Showing 51 changed files with 472 additions and 382 deletions.
diff --git a/.github/workflows/container_apps_chat_cd.yml b/.github/workflows/container_apps_chat_cd.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "8.x"
+          dotnet-version: "9.x"
 
       - name: Test
         run: dotnet test "${{ env.TEST_DIRECTORY }}" --filter Category!=ManualTest

diff --git a/.github/workflows/container_apps_chat_ci.yml b/.github/workflows/container_apps_chat_ci.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "8.x"
+          dotnet-version: "9.x"
 
       - name: Test
         # Dependabot cannot access secrets, so we disable this step for Dependabot

diff --git a/.github/workflows/website_backend_ci.yml b/.github/workflows/website_backend_ci.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "8.x"
+          dotnet-version: "9.x"
 
       - name: Test
         # Dependabot cannot access secrets, so we disable this step for Dependabot

diff --git a/.github/workflows/website_cd.yml b/.github/workflows/website_cd.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "8.x"
+          dotnet-version: "9.x"
 
       - name: Restore Nugets
         run: dotnet restore "${{ env.WORKING_DIRECTORY }}"

diff --git a/.github/workflows/website_frontend_ci.yml b/.github/workflows/website_frontend_ci.yml
@@ -17,7 +17,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright/dotnet:v1.45.1-jammy
+      image: mcr.microsoft.com/playwright/dotnet:v1.49.0-jammy
       options: --user 1001
     steps:
       - name: Checkout
@@ -26,7 +26,7 @@ jobs:
       - name: Set up dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "8.x"
+          dotnet-version: "9.x"
 
       - name: Test
         run: >

diff --git a/benchmarks/Jordnaer.Benchmarks/Jordnaer.Benchmarks.csproj b/benchmarks/Jordnaer.Benchmarks/Jordnaer.Benchmarks.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageReference Include="Bogus" Version="35.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.7" />
+    <PackageReference Include="Bogus" Version="35.6.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/container_apps/Jordnaer.Chat/Jordnaer.Chat.csproj b/src/container_apps/Jordnaer.Chat/Jordnaer.Chat.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>6af4abd1-e8ca-4aa2-a593-15395d30dc2a</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..\..</DockerfileContext>
@@ -11,12 +11,12 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
 
     <PackageReference Include="MassTransit.AspNetCore" Version="7.3.1" />
-    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.2.3" />
+    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.3.3" />
 
-    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/container_apps/Jordnaer.Chat/Program.cs b/src/container_apps/Jordnaer.Chat/Program.cs
@@ -11,8 +11,6 @@
 {
 	var builder = WebApplication.CreateBuilder(args);
 
-	builder.AddAzureAppConfiguration();
-
 	builder.AddSerilog();
 
 	builder.AddDatabase();

diff --git a/src/shared/Jordnaer.Shared.Infrastructure/AzureAppConfigurationExtensions.cs b/src/shared/Jordnaer.Shared.Infrastructure/AzureAppConfigurationExtensions.cs
diff --git a/src/shared/Jordnaer.Shared.Infrastructure/Jordnaer.Shared.Infrastructure.csproj b/src/shared/Jordnaer.Shared.Infrastructure/Jordnaer.Shared.Infrastructure.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
         <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
-        <PackageReference Include="Serilog.Sinks.ElmahIo" Version="5.1.43" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+        <PackageReference Include="Serilog.Sinks.ElmahIo" Version="5.2.50" />
         <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
-        <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
-        <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
+        <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
     </ItemGroup>
 </Project>
diff --git a/src/shared/Jordnaer.Shared/Jordnaer.Shared.csproj b/src/shared/Jordnaer.Shared/Jordnaer.Shared.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>Jordnaer.Shared</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.7" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
         <PackageReference Include="NetEscapades.EnumGenerators" Version="1.0.0-beta09" />
-        <PackageReference Include="Refit.HttpClientFactory" Version="7.1.2" />
-        <PackageReference Include="MassTransit.Abstractions" Version="8.2.4" />
+        <PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
+        <PackageReference Include="MassTransit.Abstractions" Version="8.3.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/web/Jordnaer/Components/Account/Pages/RegisterConfirmation.razor b/src/web/Jordnaer/Components/Account/Pages/RegisterConfirmation.razor
@@ -15,7 +15,7 @@
 	<h2 class="font-open-sans-light">Registreringsbekræftelse</h2>
 
 	<MudText Class="my-4">Check venligst din email for at bekræfte din konto. </MudText>
-	<MudAlert Severity="Severity.Info" Class="mt-4">Husk at tjekke uønsket mail mappen.</MudAlert>
+	<MudAlert Severity="Severity.Info" Class="mt-4">Husk at tjekke spam/uønsket mail.</MudAlert>
 </MudContainer>
 
 @code {

diff --git a/src/web/Jordnaer/Components/ScrollToTopComponentBase.cs b/src/web/Jordnaer/Components/ScrollToTopComponentBase.cs
@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+
+namespace Jordnaer.Components;
+
+public class ScrollToTopComponentBase : ComponentBase, IDisposable, IAsyncDisposable
+{
+	[Inject]
+	private IScrollManager ScrollManager { get; set; } = null!;
+
+	private CancellationTokenSource? _cancellationTokenSource;
+
+	protected CancellationToken CancellationToken => (_cancellationTokenSource ??= new CancellationTokenSource()).Token;
+
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		await ScrollManager.ScrollToTopAsync("html");
+	}
+
+	public void Dispose()
+	{
+		GC.SuppressFinalize(this);
+
+		if (_cancellationTokenSource is null)
+		{
+			return;
+		}
+
+		_cancellationTokenSource.Cancel();
+		_cancellationTokenSource.Dispose();
+		_cancellationTokenSource = null;
+	}
+
+	public async ValueTask DisposeAsync()
+	{
+		GC.SuppressFinalize(this);
+
+		if (_cancellationTokenSource is null)
+		{
+			return;
+		}
+
+		await _cancellationTokenSource.CancelAsync();
+		_cancellationTokenSource.Dispose();
+		_cancellationTokenSource = null;
+	}
+}
diff --git a/src/web/Jordnaer/Extensions/JsRuntimeExtensions.cs b/src/web/Jordnaer/Extensions/JsRuntimeExtensions.cs
@@ -17,6 +17,11 @@ public static async Task<bool> HideElement(this IJSRuntime jsRuntime, string sel
 		=> await jsRuntime.InvokeVoidAsyncWithErrorHandling(
 													"utilities.hideElement",
 													selector);
+
+	public static async Task<bool> ShowElement(this IJSRuntime jsRuntime, string selector)
+		=> await jsRuntime.InvokeVoidAsyncWithErrorHandling(
+			   "utilities.showElement",
+			   selector);
 	public static async ValueTask<GeoLocation?> GetGeolocation(this IJSRuntime jsRuntime)
 	{
 		var (success, geoLocation) = await jsRuntime.InvokeAsyncWithErrorHandling<GeoLocation>("utilities.getGeolocation");

diff --git a/src/web/Jordnaer/Extensions/MudColorExtensions.cs b/src/web/Jordnaer/Extensions/MudColorExtensions.cs
@@ -0,0 +1,10 @@
+using MudBlazor.Utilities;
+
+namespace Jordnaer.Extensions;
+
+public static class MudColorExtensions
+{
+	public static string ToBackgroundColor(this MudColor color) => $"background-color: {color}";
+
+	public static string ToTextColor(this MudColor color) => $"color: {color}";
+}
diff --git a/src/web/Jordnaer/Features/Chat/ChatNotificationService.cs b/src/web/Jordnaer/Features/Chat/ChatNotificationService.cs
@@ -11,13 +11,14 @@
 namespace Jordnaer.Features.Chat;
 
 public class ChatNotificationService(
-	JordnaerDbContext context,
+	IDbContextFactory<JordnaerDbContext> contextFactory,
 	ILogger<StartChatConsumer> logger,
 	IPublishEndpoint publishEndpoint,
 	IServer server)
 {
 	public async Task NotifyRecipients(StartChat startChat, CancellationToken cancellationToken = default)
 	{
+		await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 		var recipientIds = startChat.Recipients.Select(recipient => recipient.Id);
 		var recipients = await context.Users
 									  .AsNoTracking()

diff --git a/src/web/Jordnaer/Features/GroupSearch/GroupSearchService.cs b/src/web/Jordnaer/Features/GroupSearch/GroupSearchService.cs
@@ -12,7 +12,7 @@ public interface IGroupSearchService
 }
 
 public class GroupSearchService(
-	JordnaerDbContext context,
+	IDbContextFactory<JordnaerDbContext> contextFactory,
 	IZipCodeService zipCodeService)
 	: IGroupSearchService
 {
@@ -21,6 +21,7 @@ public async Task<GroupSearchResult> GetGroupsAsync(GroupSearchFilter filter,
 	{
 		JordnaerMetrics.GroupSearchesCounter.Add(1, MakeTagList(filter));
 
+		await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 		var groups = context.Groups
 			.AsNoTracking()
 			.AsQueryable()

diff --git a/...oupSearch/GroupSearchServiceExtensions.cs → ...s/GroupSearch/QueryableGroupExtensions.cs b/...oupSearch/GroupSearchServiceExtensions.cs → ...s/GroupSearch/QueryableGroupExtensions.cs
@@ -2,7 +2,7 @@
 
 namespace Jordnaer.Features.GroupSearch;
 
-internal static class GroupSearchServiceExtensions
+internal static class QueryableGroupExtensions
 {
 	internal static IQueryable<Group> ApplyNameFilter(this IQueryable<Group> groups, string? name)
 	{

diff --git a/src/web/Jordnaer/Features/Images/ExternalProfilePictureDownloader.cs b/src/web/Jordnaer/Features/Images/ExternalProfilePictureDownloader.cs
@@ -1,10 +1,11 @@
 using Jordnaer.Database;
 using Mediator;
+using Microsoft.EntityFrameworkCore;
 
 namespace Jordnaer.Features.Images;
 
 public class ExternalProfilePictureDownloader(
-	JordnaerDbContext context,
+	IDbContextFactory<JordnaerDbContext> contextFactory,
 	ILogger<ExternalProfilePictureDownloader> logger,
 	IEnumerable<IExternalProviderPictureDownloader> providerPictureDownloader)
 	: INotificationHandler<AccessTokenAcquired>
@@ -19,6 +20,7 @@ public async ValueTask Handle(AccessTokenAcquired notification, CancellationToke
 			return;
 		}
 
+		await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 		var user = await context.UserProfiles.FindAsync([notification.UserId], cancellationToken);
 		if (user is null)
 		{