From d1f2922357c1655c7709305214a98d6851664346 Mon Sep 17 00:00:00 2001 From: Julia Friesel Date: Sat, 30 Jun 2018 16:13:05 +0200 Subject: [PATCH] Change function signature and remove fixtures --- lib/sensiplan.js | 9 ++- .../first-exception-rule-no-shift.json | 67 ------------------- test/fixtures/first-exception-rule.json | 67 ------------------- test/fixtures/lower-temps.json | 31 --------- test/fixtures/regular-rule-no-shift.json | 61 ----------------- test/fixtures/regular-rule-shift.json | 61 ----------------- test/sensiplan.spec.js | 22 +++--- 7 files changed, 15 insertions(+), 303 deletions(-) delete mode 100644 test/fixtures/first-exception-rule-no-shift.json delete mode 100644 test/fixtures/first-exception-rule.json delete mode 100644 test/fixtures/lower-temps.json delete mode 100644 test/fixtures/regular-rule-no-shift.json delete mode 100644 test/fixtures/regular-rule-shift.json diff --git a/lib/sensiplan.js b/lib/sensiplan.js index 1364665..45e2469 100644 --- a/lib/sensiplan.js +++ b/lib/sensiplan.js @@ -1,7 +1,6 @@ -function getTemperatureStatus(targetDateString, previousDaysInCycle) { - const tempValues = previousDaysInCycle - .filter(day => day.temperature) - .map(day => !day.temperature.exclude && rounded(day.temperature.value, 0.05)) +function detectTemperatureShift(temperaturesOfCycle) { + // sensiplan rounds temps to the nearest 0.05 + const tempValues = temperaturesOfCycle.map(val => rounded(val, 0.05)) let detectingPotentialHighLevel = false @@ -49,5 +48,5 @@ function rounded(val, step) { } export { - getTemperatureStatus + detectTemperatureShift } \ No newline at end of file diff --git a/test/fixtures/first-exception-rule-no-shift.json b/test/fixtures/first-exception-rule-no-shift.json deleted file mode 100644 index 559aefb..0000000 --- a/test/fixtures/first-exception-rule-no-shift.json +++ /dev/null @@ -1,67 +0,0 @@ -[{ - "date": "2018-06-04", - "temperature": { - "value": 36.7, - "exclude": null - } -}, { - "date": "2018-06-05", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-06", - "temperature": { - "value": 36.47, - "exclude": null - } -}, { - "date": "2018-06-07", - "temperature": { - "value": 36.49, - "exclude": null - } -}, { - "date": "2018-06-09", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-10", - "temperature": { - "value": 36.62, - "exclude": null - } -}, { - "date": "2018-06-11", - "temperature": { - "value": 36.55, - "exclude": null - } -}, { - "date": "2018-06-12", - "temperature": { - "value": 36.8, - "exclude": null - } -}, { - "date": "2018-06-13", - "temperature": { - "value": 36.86, - "exclude": null - } -}, { - "date": "2018-06-14", - "temperature": { - "value": 36.77, - "exclude": null - } -}, { - "date": "2018-06-15", - "temperature": { - "value": 36.57, - "exclude": null - } -}] \ No newline at end of file diff --git a/test/fixtures/first-exception-rule.json b/test/fixtures/first-exception-rule.json deleted file mode 100644 index 2b963ef..0000000 --- a/test/fixtures/first-exception-rule.json +++ /dev/null @@ -1,67 +0,0 @@ -[{ - "date": "2018-06-04", - "temperature": { - "value": 36.7, - "exclude": null - } -}, { - "date": "2018-06-05", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-06", - "temperature": { - "value": 36.47, - "exclude": null - } -}, { - "date": "2018-06-07", - "temperature": { - "value": 36.49, - "exclude": null - } -}, { - "date": "2018-06-09", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-10", - "temperature": { - "value": 36.62, - "exclude": null - } -}, { - "date": "2018-06-11", - "temperature": { - "value": 36.55, - "exclude": null - } -}, { - "date": "2018-06-12", - "temperature": { - "value": 36.8, - "exclude": null - } -}, { - "date": "2018-06-13", - "temperature": { - "value": 36.86, - "exclude": null - } -}, { - "date": "2018-06-14", - "temperature": { - "value": 36.77, - "exclude": null - } -}, { - "date": "2018-06-15", - "temperature": { - "value": 36.63, - "exclude": null - } -}] \ No newline at end of file diff --git a/test/fixtures/lower-temps.json b/test/fixtures/lower-temps.json deleted file mode 100644 index 20ae088..0000000 --- a/test/fixtures/lower-temps.json +++ /dev/null @@ -1,31 +0,0 @@ -[{ - "date": "2018-06-04", - "temperature": { - "value": 36.7, - "exclude": null - } -}, { - "date": "2018-06-05", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-06", - "temperature": { - "value": 36.47, - "exclude": null - } -}, { - "date": "2018-06-07", - "temperature": { - "value": 36.49, - "exclude": null - } -}, { - "date": "2018-06-09", - "temperature": { - "value": 36.57, - "exclude": null - } -}] \ No newline at end of file diff --git a/test/fixtures/regular-rule-no-shift.json b/test/fixtures/regular-rule-no-shift.json deleted file mode 100644 index ca99c5a..0000000 --- a/test/fixtures/regular-rule-no-shift.json +++ /dev/null @@ -1,61 +0,0 @@ -[{ - "date": "2018-06-04", - "temperature": { - "value": 36.7, - "exclude": null - } -}, { - "date": "2018-06-05", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-06", - "temperature": { - "value": 36.47, - "exclude": null - } -}, { - "date": "2018-06-07", - "temperature": { - "value": 36.49, - "exclude": null - } -}, { - "date": "2018-06-09", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-10", - "temperature": { - "value": 36.62, - "exclude": null - } -}, { - "date": "2018-06-11", - "temperature": { - "value": 36.55, - "exclude": null - } -}, { - "date": "2018-06-12", - "temperature": { - "value": 36.8, - "exclude": null - } -}, { - "date": "2018-06-13", - "temperature": { - "value": 36.86, - "exclude": null - } -}, { - "date": "2018-06-14", - "temperature": { - "value": 36.77, - "exclude": null - } -}] \ No newline at end of file diff --git a/test/fixtures/regular-rule-shift.json b/test/fixtures/regular-rule-shift.json deleted file mode 100644 index 74bd559..0000000 --- a/test/fixtures/regular-rule-shift.json +++ /dev/null @@ -1,61 +0,0 @@ -[{ - "date": "2018-06-04", - "temperature": { - "value": 36.7, - "exclude": null - } -}, { - "date": "2018-06-05", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-06", - "temperature": { - "value": 36.47, - "exclude": null - } -}, { - "date": "2018-06-07", - "temperature": { - "value": 36.49, - "exclude": null - } -}, { - "date": "2018-06-09", - "temperature": { - "value": 36.57, - "exclude": null - } -}, { - "date": "2018-06-10", - "temperature": { - "value": 36.62, - "exclude": null - } -}, { - "date": "2018-06-11", - "temperature": { - "value": 36.55, - "exclude": null - } -}, { - "date": "2018-06-12", - "temperature": { - "value": 36.8, - "exclude": null - } -}, { - "date": "2018-06-13", - "temperature": { - "value": 36.86, - "exclude": null - } -}, { - "date": "2018-06-14", - "temperature": { - "value": 36.8, - "exclude": null - } -}] \ No newline at end of file diff --git a/test/sensiplan.spec.js b/test/sensiplan.spec.js index 055f6db..3f69d2a 100644 --- a/test/sensiplan.spec.js +++ b/test/sensiplan.spec.js @@ -1,10 +1,5 @@ import chai from 'chai' -import { getTemperatureStatus } from '../lib/sensiplan' -import tempShift from './fixtures/regular-rule-shift.json' -import noTempShift from './fixtures/regular-rule-no-shift.json' -import lowerTempDays from './fixtures/lower-temps.json' -import firstException from './fixtures/first-exception-rule.json' -import firstExceptionNoShift from './fixtures/first-exception-rule-no-shift.json' +import { detectTemperatureShift } from '../lib/sensiplan' const expect = chai.expect @@ -12,7 +7,8 @@ describe.only('sensiplan', () => { describe('getTemperatureStatus', () => { describe('regular rule', () => { it('reports lower temperature status before shift', function () { - const status = getTemperatureStatus('2018-06-09', lowerTempDays) + const lowerTemps = [36.7, 36.57, 36.47, 36.49, 36.57] + const status = detectTemperatureShift(lowerTemps) expect(status).to.eql({ low: [36.7, 36.55, 36.45, 36.5, 36.55], ltl: 36.7, @@ -22,7 +18,8 @@ describe.only('sensiplan', () => { }) it('detects temperature shift correctly', function () { - const status = getTemperatureStatus('2018-06-14', tempShift) + const tempShift = [36.7, 36.57, 36.47, 36.49, 36.57, 36.62, 36.55, 36.8, 36.86, 36.8] + const status = detectTemperatureShift(tempShift) expect(status).to.eql({ low: [36.7, 36.55, 36.45, 36.5, 36.55, 36.6, 36.55], ltl: 36.6, @@ -32,7 +29,8 @@ describe.only('sensiplan', () => { }) it('detects missing temperature shift correctly', function () { - const status = getTemperatureStatus('2018-06-14', noTempShift) + const noTempShift = [36.7, 36.57, 36.47, 36.49, 36.57, 36.62, 36.55, 36.8, 36.86, 36.77] + const status = detectTemperatureShift(noTempShift) expect(status).to.eql({ low: [36.7, 36.55, 36.45, 36.5, 36.55, 36.6, 36.55], ltl: 36.6, @@ -44,7 +42,8 @@ describe.only('sensiplan', () => { describe('1st exception rule', () => { it('detects temperature shift', function () { - const status = getTemperatureStatus('2018-06-14', firstException) + const firstException = [36.7, 36.57, 36.47, 36.49, 36.57, 36.62, 36.55, 36.8, 36.86, 36.77, 36.63] + const status = detectTemperatureShift(firstException) expect(status).to.eql({ low: [36.7, 36.55, 36.45, 36.5, 36.55, 36.6, 36.55], ltl: 36.6, @@ -54,7 +53,8 @@ describe.only('sensiplan', () => { }) it('detects missing temperature shift correctly', function () { - const status = getTemperatureStatus('2018-06-14', firstExceptionNoShift) + const firstExceptionNoShift = [36.7, 36.57, 36.47, 36.49, 36.57, 36.62, 36.55, 36.8, 36.86, 36.77, 36.57] + const status = detectTemperatureShift(firstExceptionNoShift) expect(status).to.eql({ low: [36.7, 36.55, 36.45, 36.5, 36.55, 36.6, 36.55], ltl: 36.6,