From 59627494c55a004735aad307d123951ae001e6b5 Mon Sep 17 00:00:00 2001 From: Andrew Kam Date: Sat, 7 Feb 2026 15:52:42 -0500 Subject: [PATCH 1/2] Add test for hourly points in range with flow units --- .../test/web/readingsLineMeterRangeFlow.js | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/server/test/web/readingsLineMeterRangeFlow.js b/src/server/test/web/readingsLineMeterRangeFlow.js index bdc5cfa8d..49b68ea72 100644 --- a/src/server/test/web/readingsLineMeterRangeFlow.js +++ b/src/server/test/web/readingsLineMeterRangeFlow.js @@ -150,6 +150,70 @@ mocha.describe('readings API', () => { }); // Add LR26 here + mocha.it('LR26: range should have hourly points for middle readings for 15 minute for a 60 day period and flow units & kW as kW', async () => { + const unitData = [ + { + // u4 + name: 'Electric', + identifier: '', + unitRepresent: Unit.unitRepresentType.FLOW, + secInRate: 3600, + typeOfUnit: Unit.unitType.METER, + suffix: '', + displayable: Unit.displayableType.NONE, + preferredDisplay: false, + note: 'kilowatts' + }, + { + // u5 + name: 'kW', + identifier: '', + unitRepresent: Unit.unitRepresentType.FLOW, + secInRate: 3600, + typeOfUnit: Unit.unitType.UNIT, + suffix: '', + displayable: Unit.displayableType.ALL, + preferredDisplay: false, + note: 'special unit' // Not sure if this is correct! + } + ]; + + const conversionData = [ + { + // c4 + sourceName: 'Electric', + destinationName: 'kW', + bidirectional: false, + slope: 1, + intercept: 0, + note: 'Electric → kW' + } + ]; + + const meterData = [ + { + name: 'Electric kW', + unit: 'Electric', + defaultGraphicUnit: 'kW', + displayable: true, + gps: undefined, + note: 'special meter', + file: 'test/web/readingsData/readings_ri_15_days_75.csv', + deleteFile: false, + readingFrequency: '15 minutes', + id: METER_ID + } + ]; + await prepareTest(unitData, conversionData, meterData); + + const unitId = await getUnitId('kW'); + + const expected = await parseExpectedCsv('src/server/test/web/readingsData/expected_line_range_ri_15_mu_kW_gu_kW_st_2022-08-25%00#00#00_et_2022-10-24%00#00#00.csv'); + + const res = await chai.request(app).get(`/api/unitReadings/line/meters/${METER_ID}`) + .query({ timeInterval: ETERNITY.toString(), graphicUnitId: unitId }); + expectRangeToEqualExpected(res, expected) + }); }); }); }); From 52303dfce11fcc30cf6b96fbf07f43dff1fa0ba2 Mon Sep 17 00:00:00 2001 From: Andrew Kam Date: Wed, 11 Feb 2026 09:49:34 -0500 Subject: [PATCH 2/2] Add LR26 test case for hourly readings Add test case LR26 for hourly points in readings. --- src/server/test/web/readingsLineMeterRangeFlow.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/test/web/readingsLineMeterRangeFlow.js b/src/server/test/web/readingsLineMeterRangeFlow.js index 49b68ea72..465dc6f1e 100644 --- a/src/server/test/web/readingsLineMeterRangeFlow.js +++ b/src/server/test/web/readingsLineMeterRangeFlow.js @@ -149,7 +149,6 @@ mocha.describe('readings API', () => { expectRangeToEqualExpected(res, expected) }); - // Add LR26 here mocha.it('LR26: range should have hourly points for middle readings for 15 minute for a 60 day period and flow units & kW as kW', async () => { const unitData = [ {