lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove assumeFertility from status, derive from phases instead

Browse Source
This commit is contained in:
Julia Friesel
2018-07-18 14:18:04 +02:00
parent ebf18dac22
commit 58aa0c4b8d
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sympto/index.js
-3
View File
@@ -8,7 +8,6 @@ export default function getSymptoThermalStatus({ cycle, previousCycle, earlierCy
throwIfArgsAreNotInRequiredFormat([cycle, ...earlierCycles]) throwIfArgsAreNotInRequiredFormat([cycle, ...earlierCycles])
const status = { const status = {
assumeFertility: true,
phases: {} phases: {}
} }
@@ -19,7 +18,6 @@ export default function getSymptoThermalStatus({ cycle, previousCycle, earlierCy
if (statusForLast.temperatureShift) { if (statusForLast.temperatureShift) {
status.phases.preOvulatory = getPreOvulatoryPhase(cycle, [previousCycle, ...earlierCycles]) status.phases.preOvulatory = getPreOvulatoryPhase(cycle, [previousCycle, ...earlierCycles])
if (status.phases.preOvulatory.cycleDays.length === cycle.length) { if (status.phases.preOvulatory.cycleDays.length === cycle.length) {
status.assumeFertility = false
return status return status
} }
} }
@@ -75,7 +73,6 @@ export default function getSymptoThermalStatus({ cycle, previousCycle, earlierCy
status.mucusShift = mucusShift status.mucusShift = mucusShift
status.temperatureShift = temperatureShift status.temperatureShift = temperatureShift
status.assumeFertility = false
return status return status
} }
test/sympto/index.spec.js
+18 -18
View File
@@ -30,7 +30,7 @@ describe('sympto', () => {
}) })
expect(status).to.eql({ expect(status).to.eql({
assumeFertility: true,
phases: { phases: {
periOvulatory: { periOvulatory: {
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -48,7 +48,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(2) expect(Object.keys(status.phases).length).to.eql(2)
expect(status.phases.periOvulatory).to.eql({ expect(status.phases.periOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -75,7 +75,7 @@ describe('sympto', () => {
}) })
expect(Object.keys(status.phases).length).to.eql(1) expect(Object.keys(status.phases).length).to.eql(1)
expect(status.assumeFertility).to.be.false()
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
cycleDays: fiveDayCycle, cycleDays: fiveDayCycle,
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -92,7 +92,7 @@ describe('sympto', () => {
}) })
expect(Object.keys(status.phases).length).to.eql(2) expect(Object.keys(status.phases).length).to.eql(2)
expect(status.assumeFertility).to.be.true()
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
cycleDays: cycleWithTempAndNoMucusShift cycleDays: cycleWithTempAndNoMucusShift
.filter(({date}) => date <= '2018-06-05'), .filter(({date}) => date <= '2018-06-05'),
@@ -112,7 +112,7 @@ describe('sympto', () => {
}) })
expect(Object.keys(status.phases).length).to.eql(2) expect(Object.keys(status.phases).length).to.eql(2)
expect(status.assumeFertility).to.be.true()
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
cycleDays: [cycleWithEarlyMucus[0]], cycleDays: [cycleWithEarlyMucus[0]],
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -132,7 +132,7 @@ describe('sympto', () => {
}) })
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.assumeFertility).to.be.false()
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
cycleDays: longAndComplicatedCycle cycleDays: longAndComplicatedCycle
.filter(({date}) => date <= '2018-06-05'), .filter(({date}) => date <= '2018-06-05'),
@@ -164,7 +164,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -198,7 +198,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -232,7 +232,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -266,7 +266,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -300,7 +300,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -334,7 +334,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -371,7 +371,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -405,7 +405,7 @@ describe('sympto', () => {
expect(status.temperatureShift).to.be.an('object') expect(status.temperatureShift).to.be.an('object')
expect(status.mucusShift).to.be.an('object') expect(status.mucusShift).to.be.an('object')
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -437,7 +437,7 @@ describe('sympto', () => {
earlierCycles: Array(10).fill(fhmOnDay12) earlierCycles: Array(10).fill(fhmOnDay12)
}) })
expect(status.assumeFertility).to.be.true()
expect(Object.keys(status.phases).length).to.eql(2) expect(Object.keys(status.phases).length).to.eql(2)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -460,7 +460,7 @@ describe('sympto', () => {
earlierCycles: Array(11).fill(fhmOnDay15) earlierCycles: Array(11).fill(fhmOnDay15)
}) })
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -493,7 +493,7 @@ describe('sympto', () => {
earlierCycles: Array(10).fill(fhmOnDay15) earlierCycles: Array(10).fill(fhmOnDay15)
}) })
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(3) expect(Object.keys(status.phases).length).to.eql(3)
expect(status.phases.preOvulatory).to.eql({ expect(status.phases.preOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },
@@ -526,7 +526,7 @@ describe('sympto', () => {
earlierCycles: [...Array(12).fill(fhmOnDay15)] earlierCycles: [...Array(12).fill(fhmOnDay15)]
}) })
expect(status.assumeFertility).to.be.false()
expect(Object.keys(status.phases).length).to.eql(2) expect(Object.keys(status.phases).length).to.eql(2)
expect(status.phases.periOvulatory).to.eql({ expect(status.phases.periOvulatory).to.eql({
start: { date: '2018-06-01' }, start: { date: '2018-06-01' },