Added logging

.github/workflows/dependabot_automerge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.2.0
+        uses: dependabot/fetch-metadata@v2.3.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

PathfinderHonorManager.Tests/PathfinderHonorManager.Tests.csproj

@@ -8,20 +8,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.3">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="FluentValidation" Version="11.11.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.3" />
     <PackageReference Include="FluentValidation.Validators.UnitTestExtension" Version="1.11.0.2" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

PathfinderHonorManager/Controllers/ClubController.cs

@@ -7,6 +7,8 @@
 using Microsoft.AspNetCore.Mvc;
 using PathfinderHonorManager.Model;
 using PathfinderHonorManager.Service.Interfaces;
+using Microsoft.Extensions.Logging;
+using System.Linq;
 
 namespace PathfinderHonorManager.Controllers
 {
@@ -20,10 +22,12 @@ namespace PathfinderHonorManager.Controllers
     public class ClubsController : ControllerBase
     {
         private readonly IClubService _clubService;
+        private readonly ILogger<ClubsController> _logger;
 
-        public ClubsController(IClubService clubService)
+        public ClubsController(IClubService clubService, ILogger<ClubsController> logger)
         {
             _clubService = clubService;
+            _logger = logger;
         }
 
         // GET Clubs
@@ -39,24 +43,30 @@ public async Task<ActionResult<IEnumerable<Club>>> GetClubs(CancellationToken to
         {
             if (clubcode == null)
             {
+                _logger.LogInformation("Getting all clubs");
                 var clubs = await _clubService.GetAllAsync(token);
 
                 if (clubs == default)
                 {
+                    _logger.LogWarning("No clubs found");
                     return NotFound();
                 }
 
+                _logger.LogInformation("Retrieved {Count} clubs", clubs.Count());
                 return Ok(clubs);
             }
             else
             {
+                _logger.LogInformation("Getting club with code {ClubCode}", clubcode);
                 var club = await _clubService.GetByCodeAsync(clubcode.ToUpper(), token);
 
                 if (club == default)
                 {
+                    _logger.LogWarning("Club with code {ClubCode} not found", clubcode);
                     return NotFound();
                 }
 
+                _logger.LogInformation("Retrieved club with code {ClubCode}", clubcode);
                 return Ok(club);
             }
         }
@@ -73,13 +83,16 @@ public async Task<ActionResult<IEnumerable<Club>>> GetClubs(CancellationToken to
         [HttpGet("{id:guid}")]
         public async Task<IActionResult> GetByIdAsync(Guid id, CancellationToken token)
         {
+            _logger.LogInformation("Getting club with ID {ClubId}", id);
             var club = await _clubService.GetByIdAsync(id, token);
 
             if (club == default)
             {
+                _logger.LogWarning("Club with ID {ClubId} not found", id);
                 return NotFound();
             }
 
+            _logger.LogInformation("Retrieved club with ID {ClubId}", id);
             return Ok(club);
         }
     }

PathfinderHonorManager/Controllers/HonorsController.cs

@@ -9,6 +9,8 @@
 using PathfinderHonorManager.Service.Interfaces;
 using Incoming = PathfinderHonorManager.Dto.Incoming;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using System.Linq;
 
 namespace PathfinderHonorManager.Controllers
 {
@@ -22,10 +24,12 @@ namespace PathfinderHonorManager.Controllers
     public class HonorsController : CustomApiController
     {
         private readonly IHonorService _honorService;
+        private readonly ILogger<HonorsController> _logger;
 
-        public HonorsController(IHonorService honorService)
+        public HonorsController(IHonorService honorService, ILogger<HonorsController> logger)
         {
             _honorService = honorService;
+            _logger = logger;
         }
 
         // GET Honors
@@ -38,13 +42,16 @@ public HonorsController(IHonorService honorService)
         [HttpGet]
         public async Task<ActionResult<IEnumerable<Honor>>> GetHonors(CancellationToken token)
         {
+            _logger.LogInformation("Getting all honors");
             var honors = await this._honorService.GetAllAsync(token);
 
             if (honors == default)
             {
+                _logger.LogWarning("No honors found");
                 return NotFound();
             }
 
+            _logger.LogInformation("Retrieved {Count} honors", honors.Count());
             return Ok(honors);
         }
 
@@ -60,13 +67,16 @@ public async Task<ActionResult<IEnumerable<Honor>>> GetHonors(CancellationToken
         [HttpGet("{id:guid}")]
         public async Task<IActionResult> GetByIdAsync(Guid id, CancellationToken token)
         {
+            _logger.LogInformation("Getting honor with ID {HonorId}", id);
             var honor = await this._honorService.GetByIdAsync(id, token);
 
             if (honor == default)
             {
+                _logger.LogWarning("Honor with ID {HonorId} not found", id);
                 return NotFound();
             }
 
+            _logger.LogInformation("Retrieved honor with ID {HonorId}", id);
             return Ok(new { id = honor.HonorID, honor });
         }
 
@@ -83,21 +93,25 @@ public async Task<IActionResult> GetByIdAsync(Guid id, CancellationToken token)
         [HttpPost]
         public async Task<ActionResult<Honor>> Post([FromBody] Incoming.HonorDto newHonor, CancellationToken token)
         {
+            _logger.LogInformation("Creating new honor");
             try
             {
                 var honor = await _honorService.AddAsync(newHonor, token);
 
+                _logger.LogInformation("Created honor with ID {HonorId}", honor.HonorID);
                 return CreatedAtRoute(
                     routeValues: GetByIdAsync(honor.HonorID, token),
                     honor);
             }
             catch (FluentValidation.ValidationException ex)
             {
+                _logger.LogWarning(ex, "Validation failed while creating honor");
                 UpdateModelState(ex);
                 return ValidationProblem(ModelState);
             }
             catch (DbUpdateException ex)
             {
+                _logger.LogError(ex, "Database error while creating honor");
                 return ValidationProblem(ex.Message);
             }
         }
@@ -116,20 +130,37 @@ public async Task<ActionResult<Honor>> Post([FromBody] Incoming.HonorDto newHono
         [HttpPut("{id:guid}")]
         public async Task<IActionResult> Put(Guid id, [FromBody] Incoming.HonorDto updatedHonor, CancellationToken token)
         {
+            _logger.LogInformation("Updating honor with ID {HonorId}", id);
             var honor = await _honorService.GetByIdAsync(id, token);
 
             if (honor == default)
             {
+                _logger.LogWarning("Honor with ID {HonorId} not found", id);
                 return NotFound();
             }
 
-            await _honorService.UpdateAsync(id, updatedHonor, token);
+            try
+            {
+                await _honorService.UpdateAsync(id, updatedHonor, token);
 
-            honor = await _honorService.GetByIdAsync(id, token);
+                honor = await _honorService.GetByIdAsync(id, token);
+                _logger.LogInformation("Updated honor with ID {HonorId}", id);
 
-            return honor != default
-                ? Ok(honor)
-                : NotFound();
+                return honor != default
+                    ? Ok(honor)
+                    : NotFound();
+            }
+            catch (FluentValidation.ValidationException ex)
+            {
+                _logger.LogWarning(ex, "Validation failed while updating honor with ID {HonorId}", id);
+                UpdateModelState(ex);
+                return ValidationProblem(ModelState);
+            }
+            catch (DbUpdateException ex)
+            {
+                _logger.LogError(ex, "Database error while updating honor with ID {HonorId}", id);
+                return ValidationProblem(ex.Message);
+            }
         }
     }
 }