Merge test changes to main - v0.44.0-pre.35d18bc (#270)

Automatically created pull-request in order to merge changes that were
recently pushed to the test branch, back to main

.github/workflows/terraform-update-documentation.yml

@@ -26,7 +26,7 @@ jobs:
           git config user.email "${{ github.actor }}@users.noreply.github.com"
 
       - name: Generate TF Docs
-        uses: terraform-docs/gh-actions@v1.2.0
+        uses: terraform-docs/gh-actions@v1.3.0
         with:
           find-dir: ${{ env.TERRAFORM_PATH }}
           output-file: USAGE.md

src/backend/.config/dotnet-tools.json

@@ -3,28 +3,28 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.4",
+      "version": "8.0.7",
       "commands": [
         "dotnet-ef"
       ],
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.7",
+      "version": "5.3.9",
       "commands": [
         "reportgenerator"
       ],
       "rollForward": false
     },
     "swashbuckle.aspnetcore.cli": {
-      "version": "6.6.2",
+      "version": "6.7.3",
       "commands": [
         "swagger"
       ],
       "rollForward": false
     },
     "dotnet-stryker": {
-      "version": "4.0.6",
+      "version": "4.2.0",
       "commands": [
         "dotnet-stryker"
       ],

src/backend/.runsettings

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat code coverage">
+        <Configuration>
+          <Format>cobertura</Format>
+          <ExcludeByFile>"**/*Migrations/*.cs"</ExcludeByFile>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>

src/backend/Backend.sln

@@ -10,6 +10,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9EBA80A2-4F3D-4EBC-AC53-3D4DE1719443}"
 	ProjectSection(SolutionItems) = preProject
 		..\..\.gitignore = ..\..\.gitignore
+		.runsettings = .runsettings
 		..\..\README.md = ..\..\README.md
 	EndProjectSection
 EndProject

src/backend/Backend.sln.DotSettings

@@ -2189,6 +2189,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/InstalledDictionaries/InstalledDictionaries/=nb_002Edic/@EntryIndexedValue">True</s:Boolean>
@@ -2240,6 +2241,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lanegiver/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lanesaldo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leverandorgjeld/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Loblaw_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lonn/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lonnskostnader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lonnstilskudd/@EntryIndexedValue">True</s:Boolean>

src/backend/WebApi/Controllers/BloggingController.cs

@@ -50,7 +50,7 @@ public async Task<ActionResult<BlogDto>> GetBlog(int id, CancellationToken cance
     public async Task<ActionResult<BlogDto>> PostBlog(BlogDto blog, CancellationToken cancellationToken)
     {
         logger.LogInformation("PostBlog was called");
-        var blogEntry = await bloggingRepository.AddBlogAsync(blog, cancellationToken);
+        var blogEntry = await bloggingRepository.AddOrUpdateBlogAsync(blog, cancellationToken);
         if (blogEntry == null)
             return NotFound();
 
@@ -97,7 +97,7 @@ public async Task<ActionResult<PostDto>> GetPost(int id, CancellationToken cance
     public async Task<ActionResult<PostDto>> PostPost(PostDto post, CancellationToken cancellationToken)
     {
         logger.LogInformation("PostPost was called");
-        var postEntry = await bloggingRepository.AddPostAsync(post, cancellationToken);
+        var postEntry = await bloggingRepository.AddOrUpdatePostAsync(post, cancellationToken);
         if (postEntry == null)
             return NotFound();
 

src/backend/WebApi/Controllers/SendMessageController.cs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Microsoft.AspNetCore.Mvc;
+using WebApi.Entities;
 using WebApi.Messaging;
 
 namespace WebApi.Controllers;
@@ -15,12 +16,16 @@ namespace WebApi.Controllers;
 /// <param name="messageSender">The service used for sending messages.</param>
 [ApiController]
 [Route("[controller]")]
-public class SendMessageController(MessageSender messageSender) : ControllerBase
+public class SendMessageController(IMessageSender messageSender) : ControllerBase
 {
     /// <summary>
     ///     Sends a message using the MessageSender service.
     /// </summary>
     /// <returns>A string indicating the result of the message sending operation.</returns>
     [HttpGet]
-    public string Get() => messageSender.SendMessage();
+    public Task<ActionResult<GenericValue<string>>> Get() =>
+        Task.FromResult<ActionResult<GenericValue<string>>>(Ok(new GenericValue<string>
+        {
+            Value = messageSender.SendMessage()
+        }));
 }

src/backend/WebApi/Entities/BlogDto.cs

@@ -23,7 +23,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
         if (string.IsNullOrEmpty(Title))
             yield return new ValidationResult($"{nameof(Title)} must be set");
 
-        if (Title.Length > 1000)
+        if (Title.Length > 500)
             yield return new ValidationResult($"{nameof(Title)} is longer than the maximum amount of characters (500)");
 
         if (string.IsNullOrEmpty(Url))

src/backend/WebApi/Entities/PostDto.cs

@@ -34,6 +34,9 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 
         if (Content.Length > 8000)
             yield return new ValidationResult($"{nameof(Content)} is longer than the maximum amount of characters (8000)");
+
+        if (BlogId == default)
+            yield return new ValidationResult($"{nameof(BlogId)} must be set");
     }
 
     /// <summary>

src/backend/WebApi/Filters/ValidateModelAttribute.cs

@@ -4,7 +4,8 @@
 namespace WebApi.Filters;
 
 /// <summary>
-///     TODO: document
+///     An action filter attribute that validates the model state before the action method is executed.
+///     If the model state is invalid, it returns a BadRequestObjectResult with the model state errors.
 /// </summary>
 public class ValidateModelAttribute : ActionFilterAttribute
 {

src/backend/WebApi/Messaging/MessageSender.cs

@@ -14,7 +14,7 @@ namespace WebApi.Messaging;
 ///     context.
 ///     Implements IDisposable to ensure that resources are released properly when the object is no longer needed.
 /// </summary>
-public sealed class MessageSender : IDisposable
+public sealed class MessageSender : IMessageSender, IDisposable
 {
     private static readonly ActivitySource ActivitySource = new(nameof(MessageSender));
     private static readonly TextMapPropagator Propagator = Propagators.DefaultTextMapPropagator;
@@ -44,10 +44,8 @@ public void Dispose()
         _connection.Dispose();
     }
 
-    /// <summary>
-    ///     Sends a message to a RabbitMQ queue, including propagating the OpenTelemetry trace context.
-    /// </summary>
-    /// <returns>A string representing the message that was sent.</returns>
+    /// <inheritdoc />
+    /// <remarks>Including propagating the OpenTelemetry trace context.</remarks>
     public string SendMessage()
     {
         try
@@ -89,9 +87,9 @@ public string SendMessage()
 
             return body;
         }
-        catch (Exception ex)
+        catch (Exception exception)
         {
-            _logger.LogError(ex, "Message publishing failed.");
+            _logger.LogError(exception, "Message publishing failed.");
             throw;
         }
     }
@@ -116,4 +114,17 @@ private void InjectTraceContextIntoBasicProperties(IBasicProperties props, strin
             _logger.LogError(ex, "Failed to inject trace context.");
         }
     }
+}
+
+/// <summary>
+///     Defines functionality to send messages to a RabbitMQ queue
+///     See also: <seealso cref="MessageSender">MessageSender</seealso>
+/// </summary>
+public interface IMessageSender
+{
+    /// <summary>
+    ///     Sends a message to a RabbitMQ queue
+    /// </summary>
+    /// <returns>A string representing the message that was sent.</returns>
+    public string SendMessage();
 }

src/backend/WebApi/Messaging/RabbitMqHelper.cs

@@ -32,9 +32,9 @@ public static class RabbitMqHelper
     private static readonly ConnectionFactory ConnectionFactory = new()
     {
         HostName = Environment.GetEnvironmentVariable("RABBITMQ_HOSTNAME") ?? "localhost",
+        Port = int.TryParse(Environment.GetEnvironmentVariable("RABBITMQ_PORT"), out var port) ? port : 5672,
         UserName = Environment.GetEnvironmentVariable("RABBITMQ_DEFAULT_USER") ?? "guest",
         Password = Environment.GetEnvironmentVariable("RABBITMQ_DEFAULT_PASS") ?? "guest",
-        Port = 5672,
         RequestedConnectionTimeout = TimeSpan.FromMilliseconds(3000)
     };
 

src/backend/WebApi/Program.cs

@@ -32,7 +32,7 @@
 
 const string serviceName = "Test.WebApi";
 
-builder.Services.AddSingleton<MessageSender>();
+builder.Services.AddSingleton<IMessageSender, MessageSender>();
 
 builder.Logging.AddOpenTelemetry(static options =>
 {
@@ -104,16 +104,17 @@
 
 var app = builder.Build();
 
-try
-{
-    using var serviceScope = app.Services.CreateScope();
-    var bloggingContext = serviceScope.ServiceProvider.GetRequiredService<BloggingContext>();
-    bloggingContext.Database.Migrate();
-}
-catch (Exception exception)
-{
-    Console.WriteLine($"Migration exception: {exception.Message}");
-}
+if (!app.Environment.IsEnvironment("Swagger") && !EF.IsDesignTime)
+    try
+    {
+        using var serviceScope = app.Services.CreateScope();
+        var bloggingContext = serviceScope.ServiceProvider.GetRequiredService<BloggingContext>();
+        bloggingContext.Database.Migrate();
+    }
+    catch (Exception exception)
+    {
+        Console.WriteLine($"Migration exception: {exception.Message}");
+    }
 
 if (app.Environment.IsDevelopment())
 {

src/backend/WebApi/Repository/BloggingRepository.cs

@@ -37,7 +37,7 @@ public interface IBloggingRepository
     /// <param name="blog">The blog to add.</param>
     /// <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the added <see cref="BlogDto" />.</returns>
-    Task<BlogDto?> AddBlogAsync(BlogDto blog, CancellationToken cancellationToken);
+    Task<BlogDto?> AddOrUpdateBlogAsync(BlogDto blog, CancellationToken cancellationToken);
 
     /// <summary>
     ///     Lists all posts asynchronously.
@@ -67,7 +67,7 @@ public interface IBloggingRepository
     /// <param name="post">The post to add.</param>
     /// <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the added <see cref="PostDto" />.</returns>
-    Task<PostDto?> AddPostAsync(PostDto post, CancellationToken cancellationToken);
+    Task<PostDto?> AddOrUpdatePostAsync(PostDto post, CancellationToken cancellationToken);
 }
 
 /// <summary>
@@ -91,7 +91,7 @@ public class BloggingRepository(BloggingContext bloggingContext) : IBloggingRepo
     }
 
     /// <inheritdoc />
-    public async Task<BlogDto?> AddBlogAsync(BlogDto blog, CancellationToken cancellationToken)
+    public async Task<BlogDto?> AddOrUpdateBlogAsync(BlogDto blog, CancellationToken cancellationToken)
     {
         if (blog.BlogId != 0)
         {
@@ -104,6 +104,7 @@ public class BloggingRepository(BloggingContext bloggingContext) : IBloggingRepo
                 return null;
 
             // Update
+            blogEntity.Title = blog.Title;
             blogEntity.Url = blog.Url;
 
             await bloggingContext.SaveChangesAsync(cancellationToken);
@@ -122,14 +123,10 @@ public class BloggingRepository(BloggingContext bloggingContext) : IBloggingRepo
     }
 
     /// <inheritdoc />
-    public async Task<IEnumerable<PostDto>> ListPostsAsync(int blogId, CancellationToken cancellationToken)
-    {
-        var posts = await bloggingContext.Posts
-                                         .Where(p => p.BlogId == blogId)
-                                         .ToListAsync(cancellationToken);
-
-        return posts.Select(PostDto.FromEntity);
-    }
+    public async Task<IEnumerable<PostDto>> ListPostsAsync(int blogId, CancellationToken cancellationToken) =>
+        PostDto.FromEntity(await bloggingContext.Posts
+                                                .Where(p => p.BlogId == blogId)
+                                                .ToListAsync(cancellationToken));
 
     /// <inheritdoc />
     public async Task<PostDto?> GetPostAsync(int id, CancellationToken cancellationToken)
@@ -143,7 +140,7 @@ public async Task<IEnumerable<PostDto>> ListPostsAsync(int blogId, CancellationT
     }
 
     /// <inheritdoc />
-    public async Task<PostDto?> AddPostAsync(PostDto post, CancellationToken cancellationToken)
+    public async Task<PostDto?> AddOrUpdatePostAsync(PostDto post, CancellationToken cancellationToken)
     {
         if (post.PostId != 0)
         {

src/backend/WebApi/WebApi.csproj

@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
@@ -29,22 +29,22 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.6.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.7.3" />
   </ItemGroup>
 
   <ItemGroup>
     <InternalsVisibleTo Include="WebApi.Tests" />
   </ItemGroup>
 
-  <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
+  <Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
     <Message Text="Restoring dotnet tools" Importance="High" />
     <Exec Command="dotnet tool restore --tool-manifest $(ProjectDir)/../.config/dotnet-tools.json" />
   </Target>
 
   <Target Name="CreateSwaggerJson" AfterTargets="Build" Condition="$(Configuration)=='Debug'">
     <Message Text="Updating swagger schema file" Importance="High" />
-    <Exec Command="dotnet swagger tofile --output swagger.json $(OutputPath)$(AssemblyName).dll v1" WorkingDirectory="$(ProjectDir)" />
+    <Exec EnvironmentVariables="DOTNET_ENVIRONMENT=Swagger;ASPNETCORE_ENVIRONMENT=Swagger" Command="dotnet swagger tofile --output swagger.json $(OutputPath)$(AssemblyName).dll v1" WorkingDirectory="$(ProjectDir)" />
   </Target>
 
 </Project>