Added rule condition for not a holiday (openhab#2043)

Signed-off-by: Sönke Küper <soenkekueper@gmx.de> GitOrigin-RevId: 65218f8
ConnectorIO · Jul 11, 2023 · 0c06654 · 0c06654
1 parent c185adb
commit 0c06654
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/...va/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java b/...va/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
@@ -44,8 +44,8 @@ public class EphemerisModuleHandlerFactory extends BaseModuleHandlerFactory impl
     private final Logger logger = LoggerFactory.getLogger(EphemerisModuleHandlerFactory.class);
 
     private static final Collection<String> TYPES = List.of(EphemerisConditionHandler.HOLIDAY_MODULE_TYPE_ID,
-            EphemerisConditionHandler.WEEKEND_MODULE_TYPE_ID, EphemerisConditionHandler.WEEKDAY_MODULE_TYPE_ID,
-            EphemerisConditionHandler.DAYSET_MODULE_TYPE_ID);
+            EphemerisConditionHandler.NOT_HOLIDAY_MODULE_TYPE_ID, EphemerisConditionHandler.WEEKEND_MODULE_TYPE_ID,
+            EphemerisConditionHandler.WEEKDAY_MODULE_TYPE_ID, EphemerisConditionHandler.DAYSET_MODULE_TYPE_ID);
 
     private final EphemerisManager ephemerisManager;
 
@@ -73,6 +73,7 @@ public Collection<String> getTypes() {
         if (module instanceof Condition) {
             switch (moduleTypeUID) {
                 case EphemerisConditionHandler.HOLIDAY_MODULE_TYPE_ID:
+                case EphemerisConditionHandler.NOT_HOLIDAY_MODULE_TYPE_ID:
                 case EphemerisConditionHandler.WEEKEND_MODULE_TYPE_ID:
                 case EphemerisConditionHandler.WEEKDAY_MODULE_TYPE_ID:
                 case EphemerisConditionHandler.DAYSET_MODULE_TYPE_ID:

diff --git a/...n/java/org/openhab/core/automation/internal/module/handler/EphemerisConditionHandler.java b/...n/java/org/openhab/core/automation/internal/module/handler/EphemerisConditionHandler.java
@@ -32,6 +32,7 @@
 public class EphemerisConditionHandler extends BaseModuleHandler<Condition> implements ConditionHandler {
 
     public static final String HOLIDAY_MODULE_TYPE_ID = "ephemeris.HolidayCondition";
+    public static final String NOT_HOLIDAY_MODULE_TYPE_ID = "ephemeris.NotHolidayCondition";
     public static final String WEEKEND_MODULE_TYPE_ID = "ephemeris.WeekendCondition";
     public static final String WEEKDAY_MODULE_TYPE_ID = "ephemeris.WeekdayCondition";
     public static final String DAYSET_MODULE_TYPE_ID = "ephemeris.DaysetCondition";
@@ -65,6 +66,8 @@ public boolean isSatisfied(Map<String, Object> inputs) {
         switch (module.getTypeUID()) {
             case HOLIDAY_MODULE_TYPE_ID:
                 return ephemerisManager.isBankHoliday(target);
+            case NOT_HOLIDAY_MODULE_TYPE_ID:
+                return !ephemerisManager.isBankHoliday(target);
             case WEEKEND_MODULE_TYPE_ID:
                 return ephemerisManager.isWeekend(target);
             case WEEKDAY_MODULE_TYPE_ID:

diff --git a/...rg/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java b/...rg/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java
@@ -80,4 +80,34 @@ public void testFactoryCreatesModuleHandlerForWeekdayCondition() {
         assertThat(handler, is(notNullValue()));
         assertThat(handler, instanceOf(EphemerisConditionHandler.class));
     }
+
+    @Test
+    public void testFactoryCreatesModuleHandlerForHolidayCondition() {
+        when(moduleMock.getTypeUID()).thenReturn(EphemerisConditionHandler.HOLIDAY_MODULE_TYPE_ID);
+
+        when(moduleMock.getConfiguration()).thenReturn(new Configuration());
+        ModuleHandler handler = factory.internalCreate(moduleMock, "My first rule");
+        assertThat(handler, is(notNullValue()));
+        assertThat(handler, instanceOf(EphemerisConditionHandler.class));
+
+        when(moduleMock.getConfiguration()).thenReturn(new Configuration(Map.of("offset", 5)));
+        handler = factory.internalCreate(moduleMock, "My second rule");
+        assertThat(handler, is(notNullValue()));
+        assertThat(handler, instanceOf(EphemerisConditionHandler.class));
+    }
+
+    @Test
+    public void testFactoryCreatesModuleHandlerForNotHolidayCondition() {
+        when(moduleMock.getTypeUID()).thenReturn(EphemerisConditionHandler.NOT_HOLIDAY_MODULE_TYPE_ID);
+
+        when(moduleMock.getConfiguration()).thenReturn(new Configuration());
+        ModuleHandler handler = factory.internalCreate(moduleMock, "My first rule");
+        assertThat(handler, is(notNullValue()));
+        assertThat(handler, instanceOf(EphemerisConditionHandler.class));
+
+        when(moduleMock.getConfiguration()).thenReturn(new Configuration(Map.of("offset", 5)));
+        handler = factory.internalCreate(moduleMock, "My second rule");
+        assertThat(handler, is(notNullValue()));
+        assertThat(handler, instanceOf(EphemerisConditionHandler.class));
+    }
 }