Merge pull request #292 from sebader/dev

Admin edit features

Author: sebader

.github/workflows/azure-static-web-apps-white-pond-0976e3603.yml

@@ -12,6 +12,9 @@ on:
       - 'WebsiteBackendFunctions/**'
       - '.github/workflows/azure-static-web-apps-white-pond-0976e3603.yml'
 
+env:
+  DOTNET_VERSION: '8.0.x' # set this to the dotnet version to use
+
 jobs:
   staticwebbapp_build_and_deploy:
     runs-on: ubuntu-latest
@@ -21,6 +24,11 @@ jobs:
         with:
           submodules: true
 
+      - name: Setup DotNet ${{ env.DOTNET_VERSION }} Environment
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+
       - name: Inject commit version
         shell: pwsh
         run: |

.github/workflows/main_alpinehutscrawler.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup DotNet ${{ env.DOTNET_VERSION }} Environment
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 

WebsiteBackendFunctions/Models/Huts.cs

@@ -17,5 +17,7 @@ public class Hut
         public DateTime? LastUpdated { get; set; }
         public DateTime? Added { get; set; }
         public DateTime? Activated { get; set; }
+        
+        public bool? ManuallyEdited { get; set; }
     }
 }

WebsiteBackendFunctions/Utils.cs

@@ -3,4 +3,5 @@ namespace WebsiteBackendFunctions;
 public class Utils
 {
     public const string CacheControlHeader = "public, max-age=600";
-}
+    public const string AdminCacheControlHeader = "no-store, no-cache, must-revalidate";
+}

WebsiteBackendFunctions/WebsiteFunctions/Admin/DeleteHutFunction.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Data;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker.Extensions.Sql;
+using Microsoft.Extensions.Logging;
+using WebsiteBackendFunctions.Models;
+
+namespace WebsiteBackendFunctions.WebsiteFunctions.Admin
+{
+    public class DeleteHutFunction
+    {
+        private readonly ILogger<DeleteHutFunction> _logger;
+
+        public DeleteHutFunction(ILogger<DeleteHutFunction> logger)
+        {
+            _logger = logger;
+        }
+
+        [Function(nameof(DeleteHut))]
+        public IActionResult DeleteHut(
+            [HttpTrigger(AuthorizationLevel.Function, "delete", Route = "huts/{id}")]
+            HttpRequest req,
+            [SqlInput(commandText: "DeleteHutById", commandType: CommandType.StoredProcedure,
+                parameters: "@HutId={id}", connectionStringSetting: "DatabaseConnectionString")]
+            IEnumerable<Hut> huts,
+            int id)
+        {
+            _logger.LogInformation("DeleteHut function processed a request for hut id {id}", id);
+            return new OkObjectResult(new { message = "Hut deleted successfully" });
+        }
+    }
+}

WebsiteBackendFunctions/WebsiteFunctions/Admin/UpdateHutFunction.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker.Extensions.Sql;
+using Microsoft.Extensions.Logging;
+using WebsiteBackendFunctions.Models;
+using System.Text.Json;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace WebsiteBackendFunctions.WebsiteFunctions.Admin
+{
+    public class UpdateHutFunction
+    {
+        private readonly ILogger<UpdateHutFunction> _logger;
+
+        public UpdateHutFunction(ILogger<UpdateHutFunction> logger)
+        {
+            _logger = logger;
+        }
+        private static readonly JsonSerializerOptions JsonSerializerOptions =
+            new() { PropertyNameCaseInsensitive = true };
+
+        [Function(nameof(UpdateHut))]
+        public async Task<HutOutput> UpdateHut(
+            [HttpTrigger(AuthorizationLevel.Function, "put", Route = "huts/{id}")]
+            HttpRequest req,
+            [SqlInput("SELECT * FROM Huts WHERE Id = @Id",
+                "DatabaseConnectionString",
+                CommandType.Text,
+                parameters: "@Id={id}")]
+            IEnumerable<Hut> existingHuts,
+            int id)
+        {
+            var hut = existingHuts.FirstOrDefault();
+            if (hut == null)
+            {
+                _logger.LogWarning("Hut with id {id} not found", id);
+                return new HutOutput(new NotFoundObjectResult(new { message = "Hut not found" }));
+            }
+
+            Hut? requestBody;
+            
+            try {
+                var requestBodyString = await new StreamReader(req.Body).ReadToEndAsync();
+                requestBody = JsonSerializer.Deserialize<Hut>(requestBodyString, JsonSerializerOptions);
+                
+                if (requestBody == null)
+                {
+                    _logger.LogWarning("Request body could not be deserialized");
+                    return new HutOutput(new BadRequestObjectResult(new { message = "Invalid request body format" }));
+                }
+            }
+            catch (JsonException ex)
+            {
+                _logger.LogError(ex, "Error deserializing request body");
+                return new HutOutput(new BadRequestObjectResult(new { message = "Error parsing request data: " + ex.Message }));
+            }
+
+            if (requestBody.Id != id)
+            {
+                return new HutOutput(new BadRequestObjectResult(new { message = "Invalid request body or ID mismatch" }));
+            }
+
+            try
+            {
+                requestBody.Added = hut.Added;
+                requestBody.Activated = hut.Activated;
+                requestBody.LastUpdated = DateTime.UtcNow;
+                requestBody.ManuallyEdited = true;
+                _logger.LogInformation("Updating hut with id {id}", id);
+                
+                return new HutOutput(new OkObjectResult(requestBody), requestBody); // Pass requestBody as UpdatedHut to trigger SQL output binding
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error updating hut with id {id}", id);
+                return new HutOutput(new StatusCodeResult(StatusCodes.Status500InternalServerError));
+            }
+        }
+    }
+    
+    public class HutOutput
+    {
+        [SqlOutput("dbo.Huts", connectionStringSetting: "DatabaseConnectionString")]
+        public Hut? UpdatedHut { get; set; }
+        
+        [HttpResult]
+        public IActionResult HttpResponse { get; set; }
+
+        public HutOutput(IActionResult response, Hut? updatedHut = null)
+        {
+            HttpResponse = response;
+            UpdatedHut = updatedHut;
+        }
+    }
+}

WebsiteBackendFunctions/WebsiteFunctions/GetAllBedCategoriesFunction.cs

@@ -30,7 +30,7 @@ public IActionResult GetAllBedCategories(
             IEnumerable<BedCategoryViewModel> result)
         {
             _logger.LogInformation("Retrieved {count} bed categories from database", result?.Count());
-
+            req.HttpContext.Response.Headers.Append("cache-control", Utils.CacheControlHeader);
             return new OkObjectResult(result);
         }
     }

WebsiteBackendFunctions/WebsiteFunctions/GetAllHutsFunction.cs

@@ -29,7 +29,6 @@ public IActionResult GetAllHuts(
             IEnumerable<Hut> result)
         {
             _logger.LogInformation("Retrieved {count} huts from database", result?.Count());
-            req.HttpContext.Response.Headers.Append("cache-control", Utils.CacheControlHeader);
             return new OkObjectResult(result);
         }
     }

WebsiteBackendFunctions/WebsiteFunctions/GetHutByIdFunction.cs

@@ -38,7 +38,6 @@ public IActionResult GetHut(
             }
 
             _logger.LogInformation("Retrieved hut {hutName} for hut id {hutId}", hut.Name, hutId);
-            req.HttpContext.Response.Headers.Append("cache-control", Utils.CacheControlHeader);
             return new OkObjectResult(hut);
         }
     }

global.json

@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "8.0.407"
+    }
+}