node-red-contrib-power-saver 3.5.6 → 3.6.1

package/test/strategy-lowest-price.test.js

@@ -91,6 +91,55 @@ describe("ps-strategy-lowest-price node", function () {
       n1.receive({ payload: makePayload(prices, time) });
     });
   });
+  it("should plan correct continuous schedule with max price ok", function (done) {
+    const resultContinuousMax = require("./data/lowest-price-result-cont-max.json");
+    const flow = makeFlow(4, 1.0);
+    helper.load(lowestPrice, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg.payload).toHaveProperty("schedule", resultContinuousMax.schedule);
+        expect(msg.payload).toHaveProperty("config", resultContinuousMax.config);
+        n1.warn.should.not.be.called;
+        done();
+      });
+      const time = DateTime.fromISO(prices.priceData[10].start);
+      n1.receive({ payload: makePayload(prices, time) });
+    });
+  });
+  it("should plan correct continuous schedule with max price too high", function (done) {
+    const resultContinuousMax = require("./data/lowest-price-result-cont-max-fail.json");
+    const flow = makeFlow(4, 0.23);
+    helper.load(lowestPrice, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg.payload).toHaveProperty("schedule", resultContinuousMax.schedule);
+        expect(msg.payload).toHaveProperty("config", resultContinuousMax.config);
+        n1.warn.should.not.be.called;
+        done();
+      });
+      const time = DateTime.fromISO(prices.priceData[10].start);
+      n1.receive({ payload: makePayload(prices, time) });
+    });
+  });
+  it("should plan correct splitted schedule with max price", function (done) {
+    const resultSplittedMax = require("./data/lowest-price-result-split-max.json");
+    const flow = makeFlow(6, 0.51);
+    flow[0].doNotSplit = false;
+    helper.load(lowestPrice, flow, function () {
+      const n1 = helper.getNode("n1");
+      const n2 = helper.getNode("n2");
+      n2.on("input", function (msg) {
+        expect(msg.payload).toHaveProperty("schedule", resultSplittedMax.schedule);
+        expect(msg.payload).toHaveProperty("config", resultSplittedMax.config);
+        n1.warn.should.not.be.called;
+        done();
+      });
+      const time = DateTime.fromISO(prices.priceData[10].start);
+      n1.receive({ payload: makePayload(prices, time) });
+    });
+  });
   it("should plan correct for all day period - 00-00", function (done) {
     const resultAllDay = require("./data/lowest-price-result-split-allday.json");
     const flow = makeFlow(8);
@@ -186,12 +235,14 @@ describe("ps-strategy-lowest-price node", function () {
         const schedule = cloneDeep(resultSplitted.schedule);
         const config = cloneDeep(resultSplitted.config);
         schedule[0].value = true;
-        schedule.splice(1, 0, { time: "2021-10-11T10:00:00.000+02:00", value: false });
-        schedule.splice(4, 0, { time: "2021-10-11T20:00:00.000+02:00", value: true });
-        schedule.splice(5, 0, { time: "2021-10-12T10:00:00.000+02:00", value: false });
+        schedule.splice(1, 0, { time: "2021-10-11T10:00:00.000+02:00", value: false, countHours: 10 });
+        schedule.splice(4, 0, { time: "2021-10-11T20:00:00.000+02:00", value: true, countHours: 14 });
+        schedule.splice(5, 0, { time: "2021-10-12T10:00:00.000+02:00", value: false, countHours: 14 });
         schedule.splice(schedule.length - 1, 1);
         config.outputOutsidePeriod = true;
-        expect(msg.payload).toHaveProperty("schedule", schedule);
+        const res = msg.payload.schedule.map((s) => ({ time: s.time, value: s.value }));
+        const exp = schedule.map((s) => ({ time: s.time, value: s.value }));
+        expect(res).toEqual(exp);
         expect(msg.payload).toHaveProperty("config", config);
         n1.warn.should.not.be.called;
         done();
@@ -218,7 +269,9 @@ describe("ps-strategy-lowest-price node", function () {
         schedule.splice(schedule.length, 0, { time: "2021-10-12T20:00:00.000+02:00", value: true });
         // schedule.splice(schedule.length - 1, 1);
         config.outputOutsidePeriod = true;
-        expect(msg.payload).toHaveProperty("schedule", schedule);
+        const res = msg.payload.schedule.map((s) => ({ time: s.time, value: s.value }));
+        const exp = schedule.map((s) => ({ time: s.time, value: s.value }));
+        expect(res).toEqual(exp);
         expect(msg.payload).toHaveProperty("config", config);
         n1.warn.should.not.be.called;
         done();
@@ -228,7 +281,7 @@ describe("ps-strategy-lowest-price node", function () {
     });
   });
   it("should work with 0 hours on", function (done) {
-    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: false }];
+    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 48 }];
     const flow = makeFlow(0);
     helper.load(lowestPrice, flow, function () {
       const n1 = helper.getNode("n1");
@@ -244,11 +297,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should work with 0 hours on outside on", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: true },
-      { time: "2021-10-11T10:00:00.000+02:00", value: false },
-      { time: "2021-10-11T20:00:00.000+02:00", value: true },
-      { time: "2021-10-12T10:00:00.000+02:00", value: false },
-      { time: "2021-10-12T20:00:00.000+02:00", value: true },
+      { time: "2021-10-11T00:00:00.000+02:00", value: true, countHours: 10 },
+      { time: "2021-10-11T10:00:00.000+02:00", value: false, countHours: 10 },
+      { time: "2021-10-11T20:00:00.000+02:00", value: true, countHours: 14 },
+      { time: "2021-10-12T10:00:00.000+02:00", value: false, countHours: 10 },
+      { time: "2021-10-12T20:00:00.000+02:00", value: true, countHours: 4 },
     ];
     const flow = makeFlow(0);
     flow[0].outputOutsidePeriod = true;
@@ -266,11 +319,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should work with 1 hours on", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T12:00:00.000+02:00", value: true },
-      { time: "2021-10-11T13:00:00.000+02:00", value: false },
-      { time: "2021-10-12T14:00:00.000+02:00", value: true },
-      { time: "2021-10-12T15:00:00.000+02:00", value: false },
+      { time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 12 },
+      { time: "2021-10-11T12:00:00.000+02:00", value: true, countHours: 1 },
+      { time: "2021-10-11T13:00:00.000+02:00", value: false, countHours: 25 },
+      { time: "2021-10-12T14:00:00.000+02:00", value: true, countHours: 1 },
+      { time: "2021-10-12T15:00:00.000+02:00", value: false, countHours: 9 },
     ];
     const flow = makeFlow(1);
     helper.load(lowestPrice, flow, function () {
@@ -287,11 +340,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should work with 24 hours on", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T10:00:00.000+02:00", value: true },
-      { time: "2021-10-11T20:00:00.000+02:00", value: false },
-      { time: "2021-10-12T10:00:00.000+02:00", value: true },
-      { time: "2021-10-12T20:00:00.000+02:00", value: false },
+      { time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 10 },
+      { time: "2021-10-11T10:00:00.000+02:00", value: true, countHours: 10 },
+      { time: "2021-10-11T20:00:00.000+02:00", value: false, countHours: 14 },
+      { time: "2021-10-12T10:00:00.000+02:00", value: true, countHours: 10 },
+      { time: "2021-10-12T20:00:00.000+02:00", value: false, countHours: 4 },
     ];
     const flow = makeFlow(24);
     helper.load(lowestPrice, flow, function () {
@@ -311,9 +364,9 @@ describe("ps-strategy-lowest-price node", function () {
     const oneDayPrices = {};
     oneDayPrices.priceData = prices.priceData.filter((d) => d.start.startsWith("2021-10-11"));
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T12:00:00.000+02:00", value: true },
-      { time: "2021-10-11T13:00:00.000+02:00", value: false },
+      { time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 12 },
+      { time: "2021-10-11T12:00:00.000+02:00", value: true, countHours: 1 },
+      { time: "2021-10-11T13:00:00.000+02:00", value: false, countHours: 11 },
     ];
     const flow = makeFlow(1);
     helper.load(lowestPrice, flow, function () {
@@ -340,7 +393,7 @@ describe("ps-strategy-lowest-price node", function () {
   });
 
   it("should handle hours on > period", function (done) {
-    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: true }];
+    const result = [{ time: "2021-10-11T00:00:00.000+02:00", value: true, countHours: 48 }];
     const flow = [
       {
         id: "n1",
@@ -388,11 +441,11 @@ describe("ps-strategy-lowest-price node", function () {
   });
   it("should handle hours on > period, false outside", function (done) {
     const result = [
-      { time: "2021-10-11T00:00:00.000+02:00", value: false },
-      { time: "2021-10-11T17:00:00.000+02:00", value: true },
-      { time: "2021-10-11T22:00:00.000+02:00", value: false },
-      { time: "2021-10-12T17:00:00.000+02:00", value: true },
-      { time: "2021-10-12T22:00:00.000+02:00", value: false },
+      { time: "2021-10-11T00:00:00.000+02:00", value: false, countHours: 17 },
+      { time: "2021-10-11T17:00:00.000+02:00", value: true, countHours: 5 },
+      { time: "2021-10-11T22:00:00.000+02:00", value: false, countHours: 19 },
+      { time: "2021-10-12T17:00:00.000+02:00", value: true, countHours: 5 },
+      { time: "2021-10-12T22:00:00.000+02:00", value: false, countHours: 2 },
     ];
     const flow = [
       {
@@ -451,6 +504,7 @@ describe("ps-strategy-lowest-price node", function () {
         fromTime: "16",
         toTime: "00",
         hoursOn: 3,
+        maxPrice: null,
         doNotSplit: false,
         sendCurrentValueWhenRescheduling: true,
         outputIfNoSchedule: false,
@@ -485,6 +539,7 @@ describe("ps-strategy-lowest-price node", function () {
         fromTime: "16",
         toTime: "00",
         hoursOn: 3,
+        maxPrice: null,
         doNotSplit: false,
         sendCurrentValueWhenRescheduling: true,
         outputIfNoSchedule: false,
@@ -519,6 +574,7 @@ describe("ps-strategy-lowest-price node", function () {
         fromTime: "22",
         toTime: "08",
         hoursOn: 3,
+        maxPrice: null,
         doNotSplit: true,
         sendCurrentValueWhenRescheduling: true,
         outputIfNoSchedule: false,
@@ -544,7 +600,7 @@ describe("ps-strategy-lowest-price node", function () {
   });
 });
 
-function makeFlow(hoursOn) {
+function makeFlow(hoursOn, maxPrice = null) {
   return [
     {
       id: "n1",
@@ -553,6 +609,7 @@ function makeFlow(hoursOn) {
       fromTime: "10",
       toTime: "20",
       hoursOn: hoursOn,
+      maxPrice: maxPrice,
       doNotSplit: true,
       sendCurrentValueWhenRescheduling: true,
       outputIfNoSchedule: true,

package/test/utils.test.js

@@ -70,18 +70,19 @@ describe("utils", () => {
       "2021-06-20T09:00:00+02:00",
     ];
     expect(makeSchedule(onOff, startTimes)).toEqual([
-      { time: "2021-06-20T05:00:00+02:00", value: false },
-      { time: "2021-06-20T07:00:00+02:00", value: true },
-      { time: "2021-06-20T09:00:00+02:00", value: false },
+      { time: "2021-06-20T05:00:00+02:00", value: false, countHours: 2 },
+      { time: "2021-06-20T07:00:00+02:00", value: true, countHours: 2 },
+      { time: "2021-06-20T09:00:00+02:00", value: false, countHours: 1 },
     ]);
     expect(makeSchedule(onOff, startTimes, true)).toEqual([
-      { time: "2021-06-20T05:00:00+02:00", value: false },
-      { time: "2021-06-20T07:00:00+02:00", value: true },
-      { time: "2021-06-20T09:00:00+02:00", value: false },
+      { time: "2021-06-20T05:00:00+02:00", value: false, countHours: 2 },
+      { time: "2021-06-20T07:00:00+02:00", value: true, countHours: 2 },
+      { time: "2021-06-20T09:00:00+02:00", value: false, countHours: 1 },
     ]);
     expect(makeSchedule(onOff, startTimes, false)).toEqual([
-      { time: "2021-06-20T07:00:00+02:00", value: true },
-      { time: "2021-06-20T09:00:00+02:00", value: false },
+      { time: "2021-06-20T05:00:00+02:00", value: false, countHours: 2 }, // Right???
+      { time: "2021-06-20T07:00:00+02:00", value: true, countHours: 2 },
+      { time: "2021-06-20T09:00:00+02:00", value: false, countHours: 1 },
     ]);
   });