Add discount tariffs (#15737)

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>

diff --git a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/api/DatahubTariffFilterFactory.java b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/api/DatahubTariffFilterFactory.java
index 81b22d631007ba74bb8b9ed11f83809966eb9078..a79ca9ab5e9dc36a5b28ead229b8a85bd2218916 100644 (file)
--- a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/api/DatahubTariffFilterFactory.java
+++ b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/api/DatahubTariffFilterFactory.java
@@ -73,12 +73,13 @@ public class DatahubTariffFilterFactory {
     public static DatahubTariffFilter getNetTariffByGLN(String globalLocationNumber) {
         switch (globalLocationNumber) {
             case GLN_AAL_ELNET:
-                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("AAL-NT-05")), Set.of(NOTE_NET_TARIFF_C_HOUR),
-                        DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
+                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("AAL-NT-05"), ChargeTypeCode.of("AAL-NTR05")),
+                        Set.of(NOTE_NET_TARIFF_C_HOUR), DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
             case GLN_CERIUS:
                 return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("30TR_C_ET")), Set.of(NOTE_NET_TARIFF_C_HOUR));
             case GLN_DINEL:
-                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TCL>100_02")), Set.of(NOTE_NET_TARIFF_C_HOUR));
+                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TCL>100_02"), ChargeTypeCode.of("TCL<100_52")),
+                        Set.of(NOTE_NET_TARIFF_C_HOUR));
             case GLN_ELEKTRUS:
                 return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("6000091")), Set.of(NOTE_NET_TARIFF_C_HOUR),
                         DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
@@ -99,7 +100,7 @@ public class DatahubTariffFilterFactory {
             case GLN_HURUP_ELVAERK_NET:
                 return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("HEV-NT-01")), Set.of(NOTE_NET_TARIFF));
             case GLN_IKAST_E1_NET:
-                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("IEV-NT-01"), ChargeTypeCode.of("IEV-NT-11")),
+                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("IEV-NT-11")),
                         Set.of(NOTE_NET_TARIFF_C_HOUR, "Transport - Overordnet net"));
             case GLN_KONSTANT:
                 return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("151-NT01T"), ChargeTypeCode.of("151-NRA04T")),
@@ -133,11 +134,12 @@ public class DatahubTariffFilterFactory {
                 return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("NT-C")), Set.of(NOTE_NET_TARIFF_C_HOUR),
                         DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
             case GLN_SUNDS_NET:
-                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("SEF-NT-05")),
+                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("SEF-NT-05"), ChargeTypeCode.of("SEF-NT-05R")),
                         Set.of(NOTE_NET_TARIFF_C_FLEX_HOUR),
                         DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
             case GLN_TARM_ELVAERK_NET:
-                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TEV-NT-01")), Set.of(NOTE_NET_TARIFF_C));
+                return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TEV-NT-01"), ChargeTypeCode.of("TEV-NT-01R")),
+                        Set.of(NOTE_NET_TARIFF_C));
             case GLN_TREFOR_EL_NET:
                 return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("C")), Set.of(NOTE_NET_TARIFF_C_HOUR),
                         DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));