PC-770: Refactor validity & forward destination logic for readability

UKGovernmentBEIS · Jan 10, 2025 · 33038fc · 33038fc
1 parent c30694c
commit 33038fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/SeaPublicWebsite.BusinessLogic/Services/QuestionFlowService.cs b/SeaPublicWebsite.BusinessLogic/Services/QuestionFlowService.cs
@@ -789,12 +789,12 @@ private QuestionFlowStep OtherHeatingTypeForwardDestination(QuestionFlowStep? en
 
         private QuestionFlowStep HeatingControlsForwardDestination(QuestionFlowStep? entryPoint)
         {
-            // If entrypoint is HeatingType, we must ask the other followup question on this route
-            if (entryPoint is QuestionFlowStep.HeatingType) return QuestionFlowStep.HotWaterCylinder;
-
-            return entryPoint is not null
-                ? QuestionFlowStep.AnswerSummary
-                : QuestionFlowStep.HotWaterCylinder;
+            return entryPoint switch
+            {
+                QuestionFlowStep.HeatingType => QuestionFlowStep.HotWaterCylinder,
+                null => QuestionFlowStep.HotWaterCylinder,
+                _ => QuestionFlowStep.AnswerSummary
+            };
         }
 
         private QuestionFlowStep HotWaterCylinderForwardDestination(QuestionFlowStep? entryPoint)

diff --git a/SeaPublicWebsite/Models/EnergyEfficiency/HeatingControlsViewModel.cs b/SeaPublicWebsite/Models/EnergyEfficiency/HeatingControlsViewModel.cs
@@ -17,9 +17,15 @@ public class HeatingControlsViewModel : QuestionFlowViewModel
         ErrorMessageResourceName = nameof(ErrorMessages.HeatingControlsRequired))]
     public List<HeatingControls> HeatingControls { get; set; } = [];
 
-    public bool HeatingControlsIsValid => !(HeatingControls.Count == 0 ||
-                                            ((HeatingControls.Contains(BusinessLogic.Models.Enums.HeatingControls
-                                                  .DoNotKnow) ||
-                                              HeatingControls.Contains(BusinessLogic.Models.Enums.HeatingControls
-                                                  .None)) && HeatingControls.Count > 1));
+    public bool HeatingControlsIsValid
+    {
+        get
+        {
+            bool containsExclusiveOption = HeatingControls.Contains(BusinessLogic.Models.Enums.HeatingControls.None) ||
+                                           HeatingControls.Contains(
+                                               BusinessLogic.Models.Enums.HeatingControls.DoNotKnow);
+            if (containsExclusiveOption) return HeatingControls.Count == 1;
+            return HeatingControls.Count > 0;
+        }
+    }
 }