senaduka/old-spike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor client models to use lokijs

Browse Source
This commit is contained in:
Eric Hulburd
2016-02-19 15:42:10 -06:00
parent c26b3b94c3
commit a84df34b55
6 changed files with 172 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
spec/shared/util/date.test.js → spec/shared/utils/date_range.test.js
View File

@@ -1,89 +1,63 @@
"use strict";
import DateUtil from './../../../shared/utils/date.js';
import DateRange from './../../../shared/utils/date_range.js';
function rangeEquivalent(range1, range2){
if (range1 && !range2 || !range1 && range2) return false
var equivalent = true
if (range1[0] && range2[0]) {
equivalent = range1[0].getTime() === range2[0].getTime();
} else {
equivalent = range1[0] === range2[0];
}
if (!equivalent) return false;
if (range1[1] && range2[1]) {
equivalent = range1[1].getTime() === range2[1].getTime();
} else {
equivalent = range1[1] === range2[1];
}
return equivalent
}
function rangesEquivalent(a1, a2){
var match = true;
if (a1.length !== a2.length) return false;
a1.forEach((range, i)=>{
if (!rangeEquivalent(range, a2[i])) match = false; return false;
});
return match;
}
describe('DateUtil.gte', ()=>{
describe('DateRange.gte', ()=>{
it('considers undefined as a large date', ()=>{
var date1 = new Date(),
date2 = new Date(date1.getTime() + 1000);
expect(DateUtil.gte(undefined, date1)).toEqual(true);
expect(DateUtil.gte(undefined, undefined)).toEqual(true);
expect(DateUtil.gte(date1, undefined)).toEqual(false);
expect(DateUtil.gte(date1, date2)).toEqual(false);
expect(DateUtil.gte(date2, date1)).toEqual(true);
expect(DateRange.gte(undefined, date1)).toEqual(true);
expect(DateRange.gte(undefined, undefined)).toEqual(true);
expect(DateRange.gte(date1, undefined)).toEqual(false);
expect(DateRange.gte(date1, date2)).toEqual(false);
expect(DateRange.gte(date2, date1)).toEqual(true);
});
});
describe('DateUtil.lte', ()=>{
describe('DateRange.lte', ()=>{
it('considers undefined as a small date', ()=>{
var date1 = new Date(),
date2 = new Date(date1.getTime() + 1000);
expect(DateUtil.lte(undefined, date1)).toEqual(true);
expect(DateUtil.lte(undefined, undefined)).toEqual(true);
expect(DateUtil.lte(date1, undefined)).toEqual(false);
expect(DateUtil.lte(date1, date2)).toEqual(true);
expect(DateUtil.lte(date2, date1)).toEqual(false);
expect(DateRange.lte(undefined, date1)).toEqual(true);
expect(DateRange.lte(undefined, undefined)).toEqual(true);
expect(DateRange.lte(date1, undefined)).toEqual(false);
expect(DateRange.lte(date1, date2)).toEqual(true);
expect(DateRange.lte(date2, date1)).toEqual(false);
});
});
describe('DateUtil.addRange', ()=>{
describe('DateRange.addRange', ()=>{
var date1 = new Date(),
date01 = DateUtil.add(date1, -1000),
date11 = DateUtil.add(date1, 1000),
date2 = DateUtil.add(date1, 2000),
date21 = DateUtil.add(date2, 1000),
date3 = DateUtil.add(date2, 2000),
date31 = DateUtil.add(date3, 1000),
date4 = DateUtil.add(date3, 2000),
date41 = DateUtil.add(date4, 1000),
date5 = DateUtil.add(date4, 2000),
date51 = DateUtil.add(date5, 1000),
date6 = DateUtil.add(date5, 2000),
date61 = DateUtil.add(date6, 1000),
date7 = DateUtil.add(date6, 2000),
date71 = DateUtil.add(date7, 1000);
date01 = DateRange.add(date1, -1000),
date11 = DateRange.add(date1, 1000),
date2 = DateRange.add(date1, 2000),
date21 = DateRange.add(date2, 1000),
date3 = DateRange.add(date2, 2000),
date31 = DateRange.add(date3, 1000),
date4 = DateRange.add(date3, 2000),
date41 = DateRange.add(date4, 1000),
date5 = DateRange.add(date4, 2000),
date51 = DateRange.add(date5, 1000),
date6 = DateRange.add(date5, 2000),
date61 = DateRange.add(date6, 1000),
date7 = DateRange.add(date6, 2000),
date71 = DateRange.add(date7, 1000);
describe('no ranges exist', ()=>{
it('returns the new ranges', ()=>{
var result = DateUtil.addRange([date1, date2], []);
expect(rangesEquivalent(result.gaps_filled, [[date1, date2]])).toBeTruthy();
expect(rangesEquivalent(result.new_ranges, [[date1, date2]])).toBeTruthy();
var result = DateRange.addRange([date1, date2], []);
expect(result.gaps_filled).toEqual([[date1, date2]]);
expect(result.new_ranges).toEqual([[date1, date2]]);
});
});
describe('infinite range exists', ()=>{
it('returns the infinite range, no gaps filled', ()=>{
var result = DateUtil.addRange([date1, date2], [[undefined, undefined]]);
expect(rangesEquivalent(result.gaps_filled, [])).toBeTruthy();
expect(rangesEquivalent(result.new_ranges, [[undefined, undefined]])).toBeTruthy();
var result = DateRange.addRange([date1, date2], [[undefined, undefined]]);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[undefined, undefined]]);
});
});
@@ -94,7 +68,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{
var new_range = [undefined, date01];
it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([])
expect(result.new_ranges).toEqual(ranges);
});
@@ -103,7 +77,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{
var new_range = [undefined, date31];
it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date2], [date3, date31]]);
expect(result.new_ranges).toEqual([[undefined, date31], [date4, date5]]);
});
@@ -112,7 +86,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{
var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date2], [date3, date4], [date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]);
});
@@ -122,7 +96,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{
var new_range = [date11, date41];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date11, date2], [date3, date4]])
expect(result.new_ranges).toEqual([[undefined, date1], [date11, date5]]);
});
@@ -131,7 +105,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{
var new_range = [date11, date61];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date11, date2], [date3, date4], [date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date1], [date11, date61]]);
});
@@ -140,7 +114,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{
var new_range = [date5, date61];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date1], [date2, date3], [date4, date61]]);
});
@@ -154,7 +128,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{
var new_range = [undefined, date01];
it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([])
expect(result.new_ranges).toEqual([[undefined, date1]]);
});
@@ -163,7 +137,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{
var new_range = [undefined, date1];
it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[undefined, date1]]);
});
@@ -172,7 +146,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{
var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]);
});
@@ -182,7 +156,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{
var new_range = [date01, date1];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([])
expect(result.new_ranges).toEqual([[undefined, date1]]);
});
@@ -191,7 +165,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{
var new_range = [date1, date61];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]);
});
@@ -200,7 +174,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{
var new_range = [date5, date61];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date1], [date5, date61]]);
});
@@ -215,7 +189,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{
var new_range = [undefined, date01];
it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2], [date3, date4], [date5, undefined]]);
});
@@ -224,7 +198,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{
var new_range = [undefined, date3];
it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3]]);
expect(result.new_ranges).toEqual([[undefined, date4], [date5, undefined]]);
});
@@ -233,7 +207,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{
var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date5]]);
expect(result.new_ranges).toEqual([[undefined, undefined]]);
});
@@ -242,7 +216,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{
var new_range = [date1, date41];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date2, date3], [date4, date41]]);
expect(result.new_ranges).toEqual([[date1, date41], [date5, undefined]]);
});
@@ -251,7 +225,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{
var new_range = [date31, date61];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date4, date5]]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, undefined]]);
});
@@ -260,7 +234,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{
var new_range = [date5, date61];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, date4], [date5, undefined]]);
});
@@ -273,7 +247,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{
var new_range = [undefined, date01];
it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, undefined]]);
});
@@ -282,7 +256,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{
var new_range = [undefined, date1];
it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1]]);
expect(result.new_ranges).toEqual([[undefined, undefined]]);
});
@@ -291,7 +265,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{
var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1]]);
expect(result.new_ranges).toEqual([[undefined, undefined]]);
});
@@ -300,7 +274,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{
var new_range = [date1, date1];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, undefined]]);
});
@@ -309,7 +283,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{
var new_range = [date1, undefined];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, undefined]]);
});
@@ -318,7 +292,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{
var new_range = [date5, undefined];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, undefined]]);
});
@@ -334,7 +308,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{
var new_range = [undefined, date01];
it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2], [date3, date4], [date5, date6]]);
});
@@ -343,7 +317,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{
var new_range = [undefined, date41];
it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date41]]);
expect(result.new_ranges).toEqual([[undefined, date41], [date5, date6]]);
});
@@ -352,7 +326,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{
var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date5], [date6, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]);
});
@@ -361,7 +335,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{
var new_range = [date11, date41];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date2, date3], [date4, date41]]);
expect(result.new_ranges).toEqual([[date1, date41], [date5, date6]]);
});
@@ -370,7 +344,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{
var new_range = [date31, undefined];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date4, date5], [date6, undefined]]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, undefined]]);
});
@@ -379,7 +353,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{
var new_range = [date61, undefined];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date61, undefined]]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, date4], [date5, date6], [date61, undefined]]);
});
@@ -393,7 +367,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{
var new_range = [undefined, date01];
it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2]]);
});
@@ -402,7 +376,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{
var new_range = [undefined, date11];
it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1]]);
expect(result.new_ranges).toEqual([[undefined, date2]]);
});
@@ -411,7 +385,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{
var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]);
});
@@ -420,7 +394,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{
var new_range = [date11, date2];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, date2]]);
});
@@ -429,7 +403,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{
var new_range = [date11, undefined];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date2, undefined]]);
expect(result.new_ranges).toEqual([[date1, undefined]]);
});
@@ -438,7 +412,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{
var new_range = [date61, undefined];
it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges);
var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date61, undefined]]);
expect(result.new_ranges).toEqual([[date1, date2], [date61, undefined]]);
});