fix: tighten opening hours validation and reorder days

Agent-Logs-Url: https://github.com/TransactionProcessing/EstateManagementUI/sessions/2054837e-a332-4c53-9600-4cd22cfdab22

Co-authored-by: StuartFerguson <16325469+StuartFerguson@users.noreply.github.com>

Author: Copilot

EstateManagementUI.BlazorServer.Tests/Pages/Merchants/MerchantsEditPageTests.cs

@@ -135,6 +135,8 @@ public void MerchantsEdit_TabSwitch_ToOpeningHours_UpdatesActiveTab()
         openingHoursButton?.Click();
 
         cut.WaitForAssertion(() => cut.Markup.ShouldContain("Save Opening Hours"), timeout: TimeSpan.FromSeconds(5));
+        cut.Markup.IndexOf("Monday", StringComparison.Ordinal).ShouldBeLessThan(cut.Markup.IndexOf("Sunday", StringComparison.Ordinal));
+        cut.Markup.IndexOf("Saturday", StringComparison.Ordinal).ShouldBeLessThan(cut.Markup.IndexOf("Sunday", StringComparison.Ordinal));
         cut.Markup.ShouldContain("Sunday");
         cut.Markup.ShouldContain("Saturday");
     }
@@ -904,8 +906,6 @@ public void MerchantsEdit_SaveOpeningHours_Success_ShowsSuccessMessageAndCallsSe
         IElement? openingHoursButton = cut.FindAll("button").FirstOrDefault(b => b.TextContent.Contains("Opening Hours"));
         openingHoursButton?.Click();
 
-        cut.Find("#sundayOpening").Change("8:00");
-        cut.Find("#sundayClosing").Change("1800");
         cut.Find("#mondayOpening").Change("0800");
         cut.Find("#mondayClosing").Change("1700");
         cut.Find("#tuesdayOpening").Change("0800");
@@ -918,6 +918,8 @@ public void MerchantsEdit_SaveOpeningHours_Success_ShowsSuccessMessageAndCallsSe
         cut.Find("#fridayClosing").Change("1700");
         cut.Find("#saturdayOpening").Change("0900");
         cut.Find("#saturdayClosing").Change("1600");
+        cut.Find("#sundayOpening").Change("8:00");
+        cut.Find("#sundayClosing").Change("1800");
 
         cut.Find("#saveOpeningHoursButton").Click();
 
@@ -934,6 +936,50 @@ public void MerchantsEdit_SaveOpeningHours_Success_ShowsSuccessMessageAndCallsSe
             Times.Once);
     }
 
+    [Fact]
+    public void MerchantsEdit_SaveOpeningHours_InvalidClosingTimeAbove2359_ShowsErrorAndDoesNotCallService()
+    {
+        var merchantId = Guid.NewGuid();
+        SetupSuccessfulDataLoad(merchantId);
+
+        IRenderedComponent<MerchantsEdit> cut = RenderComponent<MerchantsEdit>(parameters => parameters
+            .Add(p => p.MerchantId, merchantId));
+        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
+
+        IElement? openingHoursButton = cut.FindAll("button").FirstOrDefault(b => b.TextContent.Contains("Opening Hours"));
+        openingHoursButton?.Click();
+
+        PopulateValidOpeningHours(cut);
+        cut.Find("#sundayClosing").Change("2400");
+
+        cut.Find("#saveOpeningHoursButton").Click();
+
+        cut.WaitForAssertion(() => cut.Markup.ShouldContain("Sunday closing time must be entered in HHmm format."), timeout: TimeSpan.FromSeconds(10));
+        this.MerchantUIService.Verify(m => m.UpdateMerchantOpeningHours(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), merchantId, It.IsAny<MerchantModels.MerchantOpeningHoursModel>()), Times.Never);
+    }
+
+    [Fact]
+    public void MerchantsEdit_SaveOpeningHours_InvalidOpeningTimeBelow0000_ShowsErrorAndDoesNotCallService()
+    {
+        var merchantId = Guid.NewGuid();
+        SetupSuccessfulDataLoad(merchantId);
+
+        IRenderedComponent<MerchantsEdit> cut = RenderComponent<MerchantsEdit>(parameters => parameters
+            .Add(p => p.MerchantId, merchantId));
+        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
+
+        IElement? openingHoursButton = cut.FindAll("button").FirstOrDefault(b => b.TextContent.Contains("Opening Hours"));
+        openingHoursButton?.Click();
+
+        PopulateValidOpeningHours(cut);
+        cut.Find("#mondayOpening").Change("-100");
+
+        cut.Find("#saveOpeningHoursButton").Click();
+
+        cut.WaitForAssertion(() => cut.Markup.ShouldContain("Monday opening time must be entered in HHmm format."), timeout: TimeSpan.FromSeconds(10));
+        this.MerchantUIService.Verify(m => m.UpdateMerchantOpeningHours(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), merchantId, It.IsAny<MerchantModels.MerchantOpeningHoursModel>()), Times.Never);
+    }
+
     [Fact]
     public void MerchantsEdit_SwapDeviceConfirm_Success_ShowsSuccessMessage()
     {
@@ -1186,4 +1232,22 @@ private void SetupSuccessfulDataLoadWithContracts(Guid merchantId, List<Contract
 
     private void SetupSuccessfulDataLoadWithAssignedContracts(Guid merchantId, List<MerchantModels.MerchantContractModel> assignedContracts)
         => SetupSuccessfulDataLoad(merchantId, assignedContracts: assignedContracts);
+
+    private static void PopulateValidOpeningHours(IRenderedComponent<MerchantsEdit> cut)
+    {
+        cut.Find("#mondayOpening").Change("0800");
+        cut.Find("#mondayClosing").Change("1700");
+        cut.Find("#tuesdayOpening").Change("0800");
+        cut.Find("#tuesdayClosing").Change("1700");
+        cut.Find("#wednesdayOpening").Change("0800");
+        cut.Find("#wednesdayClosing").Change("1700");
+        cut.Find("#thursdayOpening").Change("0800");
+        cut.Find("#thursdayClosing").Change("1700");
+        cut.Find("#fridayOpening").Change("0800");
+        cut.Find("#fridayClosing").Change("1700");
+        cut.Find("#saturdayOpening").Change("0900");
+        cut.Find("#saturdayClosing").Change("1600");
+        cut.Find("#sundayOpening").Change("0800");
+        cut.Find("#sundayClosing").Change("1800");
+    }
 }

EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor.cs

@@ -415,13 +415,13 @@ private async Task AddDeviceToMerchant() {
 
         private IReadOnlyList<OpeningHoursRow> GetOpeningHoursRows() =>
         [
-            new("Sunday", merchantOpeningHoursModel.Sunday),
             new("Monday", merchantOpeningHoursModel.Monday),
             new("Tuesday", merchantOpeningHoursModel.Tuesday),
             new("Wednesday", merchantOpeningHoursModel.Wednesday),
             new("Thursday", merchantOpeningHoursModel.Thursday),
             new("Friday", merchantOpeningHoursModel.Friday),
-            new("Saturday", merchantOpeningHoursModel.Saturday)
+            new("Saturday", merchantOpeningHoursModel.Saturday),
+            new("Sunday", merchantOpeningHoursModel.Sunday)
         ];
 
         private Boolean TryNormaliseAndValidateOpeningHours(out String validationError) {
@@ -454,13 +454,17 @@ private Boolean TryNormaliseAndValidateOpeningHours(out String validationError)
                 return value;
             }
 
-            String digitsOnly = new(value.Where(Char.IsDigit).ToArray());
+            String trimmedValue = value.Trim();
 
-            if (digitsOnly.Length == 3) {
-                digitsOnly = digitsOnly.PadLeft(4, '0');
+            if (DateTime.TryParseExact(trimmedValue,
+                                       ["HHmm", "Hmm", "HH:mm", "H:mm"],
+                                       CultureInfo.InvariantCulture,
+                                       DateTimeStyles.None,
+                                       out DateTime parsed) == false) {
+                return trimmedValue;
             }
 
-            return digitsOnly;
+            return parsed.ToString("HHmm", CultureInfo.InvariantCulture);
         }
 
         private static Boolean TryParseOpeningHoursValue(String? value, out TimeSpan time) {