Merge pull request #13 from bigdnf/develop

Turn off condition for TurnOnAndOffAutomation

Author: chkr1011

Core/HA4IoT/Automations/TurnOnAndOffAutomation.cs

@@ -8,6 +8,7 @@
 using HA4IoT.Contracts.Components;
 using HA4IoT.Contracts.Components.States;
 using HA4IoT.Contracts.Conditions;
+using HA4IoT.Contracts.Hardware;
 using HA4IoT.Contracts.Sensors;
 using HA4IoT.Contracts.Services.Daylight;
 using HA4IoT.Contracts.Services.Settings;
@@ -24,6 +25,7 @@ public class TurnOnAndOffAutomation : AutomationBase
 
         private readonly ConditionsValidator _enablingConditionsValidator = new ConditionsValidator().WithDefaultState(ConditionState.NotFulfilled);
         private readonly ConditionsValidator _disablingConditionsValidator = new ConditionsValidator().WithDefaultState(ConditionState.NotFulfilled);
+        private readonly ConditionsValidator _turnOffConditionsValidator = new ConditionsValidator().WithDefaultState(ConditionState.NotFulfilled);
 
         private readonly IDateTimeService _dateTimeService;
         private readonly ISchedulerService _schedulerService;
@@ -35,7 +37,7 @@ public class TurnOnAndOffAutomation : AutomationBase
         private IDelayedAction _turnOffTimeout;
         private bool _turnOffIfButtonPressedWhileAlreadyOn;
         private bool _isOn;
-        
+
         public TurnOnAndOffAutomation(string id, IDateTimeService dateTimeService, ISchedulerService schedulerService, ISettingsService settingsService, IDaylightService daylightService)
             : base(id)
         {
@@ -224,21 +226,25 @@ private void TurnOn()
             _turnOffTimeout?.Cancel();
 
             _components.ForEach(c => c.TryTurnOn());
-            
+
             _isOn = true;
             _lastTurnedOn.Restart();
         }
 
         private void TurnOff()
         {
             _turnOffTimeout?.Cancel();
+            if (GetTurnOffConditionsAreFulfilled())
+            {
 
-            _components.ForEach(c => c.TryTurnOff());
+                _components.ForEach(c => c.TryTurnOff());
 
-            _isOn = false;
-            _lastTurnedOn.Stop();
+                _isOn = false;
+                _lastTurnedOn.Stop();
+            }
         }
 
+
         private bool GetConditionsAreFulfilled()
         {
             if (_disablingConditionsValidator.Conditions.Any() && _disablingConditionsValidator.Validate() == ConditionState.Fulfilled)
@@ -253,5 +259,28 @@ private bool GetConditionsAreFulfilled()
 
             return true;
         }
+
+        public TurnOnAndOffAutomation WithTurnOffCondition(ConditionRelation relation, ICondition condition)
+        {
+            if (condition == null) throw new ArgumentNullException(nameof(condition));
+
+            _turnOffConditionsValidator.WithCondition(relation, condition);
+            return this;
+        }
+
+        public TurnOnAndOffAutomation WithDisableTurnOffWhenBinaryStateEnabled(IBinaryInput input)
+        {
+            return WithTurnOffCondition(ConditionRelation.Or, new BinaryInputStateCondition(input, BinaryState.High));
+        }
+
+        private bool GetTurnOffConditionsAreFulfilled()
+        {
+            if (_turnOffConditionsValidator.Conditions.Any() && _turnOffConditionsValidator.Validate() == ConditionState.Fulfilled)
+            {
+                return false;
+            }
+
+            return true;
+        }
     }
 }

Core/HA4IoT/Conditions/Specialized/BinaryInputStateCondition.cs

@@ -0,0 +1,16 @@
+using System;
+using HA4IoT.Conditions;
+using HA4IoT.Contracts.Hardware;
+
+namespace HA4IoT.Conditions.Specialized
+{
+    public class BinaryInputStateCondition : Condition
+    {
+        public BinaryInputStateCondition(IBinaryInput input, BinaryState state)
+        {
+            if (input == null) throw new ArgumentNullException(nameof(input));
+
+            WithExpression(() => input.Read() == state);
+        }
+    }
+}

Core/HA4IoT/HA4IoT.csproj

@@ -136,6 +136,7 @@
     <Compile Include="Adapters\PortBasedWindowAdapter.cs" />
     <Compile Include="Adapters\VirtualButtonAdapter.cs" />
     <Compile Include="Api\ExceptionSerializer.cs" />
+    <Compile Include="Conditions\Specialized\BinaryInputStateCondition.cs" />
     <Compile Include="Commands\CommandInvoker.cs" />
     <Compile Include="Commands\CommandResolver.cs" />
     <Compile Include="Components\CommandInvokerAction.cs" />