@bluedot-innovation/models 3.0.0-alpha.1 → 3.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/Models.js +14 -13
- package/__tests__/filter/{calendarDateRange/calendarDateRangeFilter.data.json → dayRange/dayRange.data.json} +2 -2
- package/__tests__/filter/dayRange/dayRange.rules.json +3 -0
- package/__tests__/filter/dayRange/dayRange.spec.js +62 -0
- package/__tests__/filter/percentageCrossed/travelPath.data.json +5 -0
- package/__tests__/filter/percentageCrossed/travelPath.rules.json +3 -0
- package/__tests__/filter/percentageCrossed/{percentageCrossedFilter.spec.js → travelPath.spec.js} +12 -12
- package/__tests__/filter/speed/{speedFilter.spec.js → speed.spec.js} +3 -3
- package/__tests__/filter/timeActive/timeActive.data.json +5 -0
- package/__tests__/filter/{timeOfDayRange/timeOfDayRange.spec.js → timeActive/timeActive.spec.js} +15 -15
- package/__tests__/zone/zone.data.json +1 -1
- package/models/Zone.js +12 -9
- package/models/{CalendarDateRangeFilter.js → filters/DayRange.js} +5 -5
- package/models/{SpeedFilter.js → filters/Speed.js} +1 -1
- package/models/{TimeOfDayRangeFilter.js → filters/TimeActive.js} +1 -1
- package/models/filters/TravelPath.js +33 -0
- package/package.json +1 -1
- package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.rules.json +0 -3
- package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.spec.js +0 -62
- package/__tests__/filter/percentageCrossed/percentageCrossedFilter.data.json +0 -5
- package/__tests__/filter/percentageCrossed/percentageCrossedFilter.rules.json +0 -3
- package/__tests__/filter/timeOfDayRange/timeOfDayRange.data.json +0 -5
- package/models/BeaconFilter.js +0 -34
- package/models/PercentageCrossedFilter.js +0 -29
- /package/__tests__/filter/speed/{speedFilter.data.json → speed.data.json} +0 -0
- /package/__tests__/filter/speed/{speedFilter.rules.json → speed.rules.json} +0 -0
- /package/__tests__/filter/{timeOfDayRange/timeOfDayRange.rules.json → timeActive/timeActive.rules.json} +0 -0
- /package/models/filters/{travelDirection.js → TravelDirection.js} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
- `bearing` -> `travelDirection`
|
|
5
5
|
- `percentageCrossed` -> `travelPath`
|
|
6
6
|
- `percentage.percentage` -> `travelPath.minimumGeofeaturesCrossed`
|
|
7
|
-
- `
|
|
7
|
+
- `timeOfDayRange` -> `timeActive`
|
|
8
8
|
- `calendarDateRange` -> `dayRange`
|
|
9
9
|
|
|
10
10
|
## 2.0.22
|
package/Models.js
CHANGED
|
@@ -6,47 +6,48 @@ let Models = {}
|
|
|
6
6
|
|
|
7
7
|
Models.Account = require('./models/Account').Model
|
|
8
8
|
Models.Beacon = require('./models/Beacon').Model
|
|
9
|
-
Models.BeaconFilter = require('./models/BeaconFilter').Model
|
|
10
|
-
Models.TravelDirection = require('./models/filters/TravelDirection').Model
|
|
11
9
|
Models.BoundingBox = require('./models/BoundingBox').Model
|
|
12
|
-
Models.CalendarDateRangeFilter = require('./models/CalendarDateRangeFilter').Model
|
|
13
10
|
Models.Circle = require('./models/Circle').Model
|
|
14
11
|
Models.MessageAction = require('./models/MessageAction').Model
|
|
15
12
|
Models.MonthlyStat = require('./models/MonthlyStats').Model
|
|
16
|
-
Models.PercentageCrossedFilter = require('./models/PercentageCrossedFilter').Model
|
|
17
13
|
Models.Polygon = require('./models/Polygon').Model
|
|
18
14
|
Models.Polyline = require('./models/Polyline').Model
|
|
19
15
|
Models.Project = require('./models/Project').Model
|
|
20
16
|
Models.RuleRequestAggregation = require('./models/RuleRequestAggregation').Model
|
|
21
|
-
Models.SpeedFilter = require('./models/SpeedFilter').Model
|
|
22
|
-
Models.TimeOfDayRangeFilter = require('./models/TimeOfDayRangeFilter').Model
|
|
23
17
|
Models.UrlAction = require('./models/UrlAction').Model
|
|
24
18
|
Models.User = require('./models/User').Model
|
|
25
19
|
Models.Zone = require('./models/Zone').Model
|
|
26
20
|
Models.ZoneBeacon = require('./models/ZoneBeacon').Model
|
|
27
21
|
|
|
22
|
+
// Filters
|
|
23
|
+
Models.DayRange = require('./models/filters/DayRange').Model
|
|
24
|
+
Models.TimeActive = require('./models/filters/TimeActive').Model
|
|
25
|
+
Models.TravelPath = require('./models/filters/TravelPath').Model
|
|
26
|
+
Models.Speed = require('./models/filters/Speed').Model
|
|
27
|
+
Models.TravelDirection = require('./models/filters/TravelDirection').Model
|
|
28
|
+
|
|
28
29
|
let Schemas = {}
|
|
29
30
|
|
|
30
31
|
Schemas.Account = require('./models/Account').Schema
|
|
31
32
|
Schemas.Beacon = require('./models/Beacon').Schema
|
|
32
|
-
Schemas.BeaconFilter = require('./models/BeaconFilter').Schema
|
|
33
|
-
Schemas.TravelDirection = require('./models/filters/TravelDirection').Schema
|
|
34
33
|
Schemas.BoundingBox = require('./models/BoundingBox').Schema
|
|
35
|
-
Schemas.CalendarDateRangeFilter = require('./models/CalendarDateRangeFilter').Schema
|
|
36
34
|
Schemas.Circle = require('./models/Circle').Schema
|
|
37
35
|
Schemas.MessageAction = require('./models/MessageAction').Schema
|
|
38
36
|
Schemas.MonthlyStat = require('./models/MonthlyStats').Schema
|
|
39
|
-
Schemas.PercentageCrossedFilter = require('./models/PercentageCrossedFilter').Schema
|
|
40
37
|
Schemas.Polygon = require('./models/Polygon').Schema
|
|
41
38
|
Schemas.Polyline = require('./models/Polyline').Schema
|
|
42
39
|
Schemas.Project = require('./models/Project').Schema
|
|
43
40
|
Schemas.RuleRequestAggregation = require('./models/RuleRequestAggregation').Schema
|
|
44
|
-
Schemas.SpeedFilter = require('./models/SpeedFilter').Schema
|
|
45
|
-
Schemas.TimeOfDayRangeFilter = require('./models/TimeOfDayRangeFilter').Schema
|
|
46
41
|
Schemas.UrlAction = require('./models/UrlAction').Schema
|
|
47
42
|
Schemas.User = require('./models/User').Schema
|
|
48
43
|
Schemas.Zone = require('./models/Zone').Schema
|
|
49
44
|
|
|
50
|
-
|
|
45
|
+
// Filters
|
|
46
|
+
Schemas.DayRange = require('./models/filters/DayRange').Schema
|
|
47
|
+
Schemas.Speed = require('./models/filters/Speed').Schema
|
|
48
|
+
Schemas.TimeActive = require('./models/filters/TimeActive').Schema
|
|
49
|
+
Schemas.TravelPath = require('./models/filters/TravelPath').Schema
|
|
50
|
+
Schemas.TravelDirection = require('./models/filters/TravelDirection').Schema
|
|
51
51
|
|
|
52
|
+
Models.Schemas = Schemas
|
|
52
53
|
module.exports = Models
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
let mongoose = require('mongoose')
|
|
2
|
+
|
|
3
|
+
mongoose.Promise = global.Promise
|
|
4
|
+
|
|
5
|
+
let DayRangeModel = require('../../../Models').DayRange(mongoose)
|
|
6
|
+
let testCase = require('mocha').describe
|
|
7
|
+
let assertions = require('mocha').it
|
|
8
|
+
let chai = require('chai')
|
|
9
|
+
|
|
10
|
+
let assert = chai.assert
|
|
11
|
+
let mocha = require('mocha')
|
|
12
|
+
let beforeEach = mocha.beforeEach
|
|
13
|
+
|
|
14
|
+
let rules = require('./dayRange.rules.json')
|
|
15
|
+
|
|
16
|
+
let dayRange
|
|
17
|
+
|
|
18
|
+
beforeEach(() => {
|
|
19
|
+
dayRange = JSON.parse(JSON.stringify(require('./dayRange.data.json')))
|
|
20
|
+
})
|
|
21
|
+
|
|
22
|
+
testCase('DayRangeFilter', () => {
|
|
23
|
+
testCase('Valid DayRangeFilter', () => {
|
|
24
|
+
assertions('should validate a valid dayRange', (done) => {
|
|
25
|
+
let DayRangeFilter = new DayRangeModel(dayRange)
|
|
26
|
+
DayRangeFilter.validate((err, res) => {
|
|
27
|
+
assert.notExists(res)
|
|
28
|
+
assert(err === null, 'err should equals null')
|
|
29
|
+
done()
|
|
30
|
+
})
|
|
31
|
+
})
|
|
32
|
+
})
|
|
33
|
+
|
|
34
|
+
testCase('Invalid DayRangeFilter', () => {
|
|
35
|
+
assertions('should not validate a dayRange with invalid DayRangeFilter', (done) => {
|
|
36
|
+
delete dayRange[rules.requiredFields[0]]
|
|
37
|
+
let DayRangeFilter = new DayRangeModel(dayRange)
|
|
38
|
+
DayRangeFilter.validate((err, res) => {
|
|
39
|
+
assert.exists(err, 'err object should exist')
|
|
40
|
+
assert.isObject(err)
|
|
41
|
+
done()
|
|
42
|
+
})
|
|
43
|
+
})
|
|
44
|
+
testCase('check each required property of the model and validate that it is present', () => {
|
|
45
|
+
let requiredFields = rules.requiredFields
|
|
46
|
+
requiredFields.map((i) => {
|
|
47
|
+
assertions(`should throw an error with property '${i}' if '${i}' is not present`, (done) => {
|
|
48
|
+
// delete i from geofeatures' dayRange child
|
|
49
|
+
delete dayRange[i]
|
|
50
|
+
let DayRangeFilter = new DayRangeModel(dayRange)
|
|
51
|
+
DayRangeFilter.validate((err, res) => {
|
|
52
|
+
assert.notExists(res)
|
|
53
|
+
assert.exists(err, 'err object should exist')
|
|
54
|
+
assert.isObject(err)
|
|
55
|
+
assert.nestedProperty(err, `errors.${i}`, `error should have a ${i} property`)
|
|
56
|
+
done()
|
|
57
|
+
})
|
|
58
|
+
})
|
|
59
|
+
})
|
|
60
|
+
})
|
|
61
|
+
})
|
|
62
|
+
})
|
package/__tests__/filter/percentageCrossed/{percentageCrossedFilter.spec.js → travelPath.spec.js}
RENAMED
|
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
|
|
|
2
2
|
|
|
3
3
|
mongoose.Promise = global.Promise
|
|
4
4
|
|
|
5
|
-
let
|
|
5
|
+
let TravelPathFilterModel = require('../../../Models').TravelPath(mongoose)
|
|
6
6
|
let testCase = require('mocha').describe
|
|
7
7
|
let assertions = require('mocha').it
|
|
8
8
|
let chai = require('chai')
|
|
@@ -11,18 +11,18 @@ let assert = chai.assert
|
|
|
11
11
|
let mocha = require('mocha')
|
|
12
12
|
let beforeEach = mocha.beforeEach
|
|
13
13
|
|
|
14
|
-
let rules = require('./
|
|
14
|
+
let rules = require('./travelPath.rules.json')
|
|
15
15
|
|
|
16
|
-
let
|
|
16
|
+
let travelPath
|
|
17
17
|
|
|
18
18
|
beforeEach(() => {
|
|
19
|
-
|
|
19
|
+
travelPath = JSON.parse(JSON.stringify(require('./travelPath.data.json')))
|
|
20
20
|
})
|
|
21
21
|
|
|
22
22
|
testCase('PercentageCrossedFilter', () => {
|
|
23
23
|
testCase('Valid PercentageCrossedFilter', () => {
|
|
24
|
-
assertions('should validate a valid
|
|
25
|
-
let PercentageCrossedFilter = new
|
|
24
|
+
assertions('should validate a valid travelPath ', (done) => {
|
|
25
|
+
let PercentageCrossedFilter = new TravelPathFilterModel(travelPath)
|
|
26
26
|
PercentageCrossedFilter.validate((err, res) => {
|
|
27
27
|
assert.notExists(res)
|
|
28
28
|
assert(err === null, 'err should equals null')
|
|
@@ -32,9 +32,9 @@ testCase('PercentageCrossedFilter', () => {
|
|
|
32
32
|
})
|
|
33
33
|
|
|
34
34
|
testCase('Invalid PercentageCrossedFilter', () => {
|
|
35
|
-
assertions('should not validate a
|
|
36
|
-
delete
|
|
37
|
-
let PercentageCrossedFilter = new
|
|
35
|
+
assertions('should not validate a travelPath with invalid PercentageCrossedFilter', (done) => {
|
|
36
|
+
delete travelPath[rules.requiredFields[0]]
|
|
37
|
+
let PercentageCrossedFilter = new TravelPathFilterModel(travelPath)
|
|
38
38
|
PercentageCrossedFilter.validate((err, res) => {
|
|
39
39
|
assert.exists(err, 'err object should exist')
|
|
40
40
|
assert.isObject(err)
|
|
@@ -45,9 +45,9 @@ testCase('PercentageCrossedFilter', () => {
|
|
|
45
45
|
let requiredFields = rules.requiredFields
|
|
46
46
|
requiredFields.map((i) => {
|
|
47
47
|
assertions(`should throw an error with property '${i}' if '${i}' is not present`, (done) => {
|
|
48
|
-
// delete i from geofeatures'
|
|
49
|
-
delete
|
|
50
|
-
let PercentageCrossedFilter = new
|
|
48
|
+
// delete i from geofeatures' travelPath child
|
|
49
|
+
delete travelPath[i]
|
|
50
|
+
let PercentageCrossedFilter = new TravelPathFilterModel(travelPath)
|
|
51
51
|
PercentageCrossedFilter.validate((err, res) => {
|
|
52
52
|
assert.notExists(res)
|
|
53
53
|
assert.exists(err, 'err object should exist')
|
|
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
|
|
|
2
2
|
|
|
3
3
|
mongoose.Promise = global.Promise
|
|
4
4
|
|
|
5
|
-
let SpeedFilterModel = require('../../../Models').
|
|
5
|
+
let SpeedFilterModel = require('../../../Models').Speed(mongoose)
|
|
6
6
|
let testCase = require('mocha').describe
|
|
7
7
|
let assertions = require('mocha').it
|
|
8
8
|
let chai = require('chai')
|
|
@@ -11,12 +11,12 @@ let assert = chai.assert
|
|
|
11
11
|
let mocha = require('mocha')
|
|
12
12
|
let beforeEach = mocha.beforeEach
|
|
13
13
|
|
|
14
|
-
let rules = require('./
|
|
14
|
+
let rules = require('./speed.rules.json')
|
|
15
15
|
|
|
16
16
|
let speedFilter
|
|
17
17
|
|
|
18
18
|
beforeEach(() => {
|
|
19
|
-
speedFilter = JSON.parse(JSON.stringify(require('./
|
|
19
|
+
speedFilter = JSON.parse(JSON.stringify(require('./speed.data.json')))
|
|
20
20
|
})
|
|
21
21
|
|
|
22
22
|
testCase('SpeedFilter', () => {
|
package/__tests__/filter/{timeOfDayRange/timeOfDayRange.spec.js → timeActive/timeActive.spec.js}
RENAMED
|
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
|
|
|
2
2
|
|
|
3
3
|
mongoose.Promise = global.Promise
|
|
4
4
|
|
|
5
|
-
let
|
|
5
|
+
let TimeActiveFilterModel = require('../../../Models').TimeActive(mongoose)
|
|
6
6
|
let testCase = require('mocha').describe
|
|
7
7
|
let assertions = require('mocha').it
|
|
8
8
|
let chai = require('chai')
|
|
@@ -11,18 +11,18 @@ let assert = chai.assert
|
|
|
11
11
|
let mocha = require('mocha')
|
|
12
12
|
let beforeEach = mocha.beforeEach
|
|
13
13
|
|
|
14
|
-
let rules = require('./
|
|
14
|
+
let rules = require('./timeActive.rules.json')
|
|
15
15
|
|
|
16
|
-
let
|
|
16
|
+
let timeActiveFilter
|
|
17
17
|
|
|
18
18
|
beforeEach(() => {
|
|
19
|
-
|
|
19
|
+
timeActiveFilter = JSON.parse(JSON.stringify(require('./timeActive.data.json')))
|
|
20
20
|
})
|
|
21
21
|
|
|
22
22
|
testCase('TimeOfDayRangeFilter', () => {
|
|
23
23
|
testCase('Valid TimeOfDayRangeFilter', () => {
|
|
24
|
-
assertions('should validate a valid
|
|
25
|
-
let TimeOfDayRangeFilter = new
|
|
24
|
+
assertions('should validate a valid timeActiveFilter ', (done) => {
|
|
25
|
+
let TimeOfDayRangeFilter = new TimeActiveFilterModel(timeActiveFilter)
|
|
26
26
|
TimeOfDayRangeFilter.validate((err, res) => {
|
|
27
27
|
assert.notExists(res)
|
|
28
28
|
assert(err === null, 'err should equals null')
|
|
@@ -32,9 +32,9 @@ testCase('TimeOfDayRangeFilter', () => {
|
|
|
32
32
|
})
|
|
33
33
|
|
|
34
34
|
testCase('Invalid TimeOfDayRangeFilter', () => {
|
|
35
|
-
assertions('should not validate a
|
|
36
|
-
delete
|
|
37
|
-
let TimeOfDayRangeFilter = new
|
|
35
|
+
assertions('should not validate a timeActiveFilter with invalid TimeOfDayRangeFilter', (done) => {
|
|
36
|
+
delete timeActiveFilter[rules.requiredFields[0]]
|
|
37
|
+
let TimeOfDayRangeFilter = new TimeActiveFilterModel(timeActiveFilter)
|
|
38
38
|
TimeOfDayRangeFilter.validate((err, res) => {
|
|
39
39
|
assert.exists(err, 'err object should exist')
|
|
40
40
|
assert.isObject(err)
|
|
@@ -42,9 +42,9 @@ testCase('TimeOfDayRangeFilter', () => {
|
|
|
42
42
|
})
|
|
43
43
|
})
|
|
44
44
|
assertions('should throw an error when toAngle === fromAngle', (done) => {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
let TimeOfDayRangeFilter = new
|
|
45
|
+
timeActiveFilter.toTime = 10
|
|
46
|
+
timeActiveFilter.fromTime = 10
|
|
47
|
+
let TimeOfDayRangeFilter = new TimeActiveFilterModel(timeActiveFilter)
|
|
48
48
|
TimeOfDayRangeFilter.validate((err, res) => {
|
|
49
49
|
assert.exists(err, 'err object should exist')
|
|
50
50
|
assert.isObject(err)
|
|
@@ -56,9 +56,9 @@ testCase('TimeOfDayRangeFilter', () => {
|
|
|
56
56
|
let requiredFields = rules.requiredFields
|
|
57
57
|
requiredFields.map((i) => {
|
|
58
58
|
assertions(`should throw an error with property '${i}' if '${i}' is not present`, (done) => {
|
|
59
|
-
// delete i from geofeatures'
|
|
60
|
-
delete
|
|
61
|
-
let TimeOfDayRangeFilter = new
|
|
59
|
+
// delete i from geofeatures' timeActiveFilter child
|
|
60
|
+
delete timeActiveFilter[i]
|
|
61
|
+
let TimeOfDayRangeFilter = new TimeActiveFilterModel(timeActiveFilter)
|
|
62
62
|
TimeOfDayRangeFilter.validate((err, res) => {
|
|
63
63
|
assert.notExists(res)
|
|
64
64
|
assert.exists(err, 'err object should exist')
|
package/models/Zone.js
CHANGED
|
@@ -14,11 +14,14 @@ let boundingBoxSchema = require('./BoundingBox').boundingBoxSchema
|
|
|
14
14
|
let polylineSchema = require('./Polyline').polylineSchema
|
|
15
15
|
let polygonSchema = require('./Polygon').polygonSchema
|
|
16
16
|
let beaconSchema = require('./ZoneBeacon').beaconSchema
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
let
|
|
20
|
-
let
|
|
21
|
-
let
|
|
17
|
+
|
|
18
|
+
// Filters
|
|
19
|
+
let speedRawSchema = require('./filters/Speed').rawSchema
|
|
20
|
+
let dayRangeRawSchema = require('./filters/DayRange').rawSchema
|
|
21
|
+
let travelDirectionRawSchema = require('./filters/TravelDirection').rawSchema
|
|
22
|
+
let travelPathRawSchema = require('./filters/TravelPath').rawSchema
|
|
23
|
+
let timeActiveRawSchema = require('./filters/TimeActive').rawSchema
|
|
24
|
+
|
|
22
25
|
let uuidv4 = require('uuid/v4')
|
|
23
26
|
let patcher = require('mongoose-json-patch')
|
|
24
27
|
let helpers = require('../helpers')
|
|
@@ -75,11 +78,11 @@ zoneSchema.plugin(patcher)
|
|
|
75
78
|
zoneSchema.path('actions').discriminator('url', new Schema(urlActionSchema))
|
|
76
79
|
zoneSchema.path('actions').discriminator('message', new Schema(messageActionSchema))
|
|
77
80
|
|
|
81
|
+
zoneSchema.path('filters').discriminator('dayRange', new Schema(dayRangeRawSchema))
|
|
82
|
+
zoneSchema.path('filters').discriminator('speed', new Schema(speedRawSchema))
|
|
83
|
+
zoneSchema.path('filters').discriminator('timeActive', new Schema(timeActiveRawSchema))
|
|
78
84
|
zoneSchema.path('filters').discriminator('travelDirection', new Schema(travelDirectionRawSchema))
|
|
79
|
-
zoneSchema.path('filters').discriminator('
|
|
80
|
-
zoneSchema.path('filters').discriminator('percentageCrossed', new Schema(percentageCrossedFilterSchema))
|
|
81
|
-
zoneSchema.path('filters').discriminator('speed', new Schema(speedFilterSchema))
|
|
82
|
-
zoneSchema.path('filters').discriminator('timeOfDayRange', new Schema(timeOfDayRangeFilterSchema))
|
|
85
|
+
zoneSchema.path('filters').discriminator('travelPath', new Schema(travelPathRawSchema))
|
|
83
86
|
|
|
84
87
|
zoneSchema.path('geofeatures').discriminator('beacon', new Schema(beaconSchema))
|
|
85
88
|
zoneSchema.path('geofeatures').discriminator('circle', new Schema(circleSchema))
|
|
@@ -6,13 +6,13 @@ let schema = {
|
|
|
6
6
|
startDate: {type: Date},
|
|
7
7
|
endDate: {type: Date, validate: {isAsync: true, validator: validateDateRange}}
|
|
8
8
|
}
|
|
9
|
-
let
|
|
9
|
+
let DayRangeFilterSchema = new mongoose.Schema(
|
|
10
10
|
schema,
|
|
11
11
|
{
|
|
12
12
|
versionKey: false
|
|
13
13
|
})
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
DayRangeFilterSchema.add({
|
|
16
16
|
type:
|
|
17
17
|
{type: String, required: true}
|
|
18
18
|
})
|
|
@@ -38,12 +38,12 @@ function validateDateRange (endDate, magicCallback) {
|
|
|
38
38
|
let model = (mongooseInstance) => {
|
|
39
39
|
let CalendarDateRangeFilter
|
|
40
40
|
if (mongooseInstance) {
|
|
41
|
-
CalendarDateRangeFilter = mongooseInstance.model('CalendarDateRange',
|
|
41
|
+
CalendarDateRangeFilter = mongooseInstance.model('CalendarDateRange', DayRangeFilterSchema)
|
|
42
42
|
} else {
|
|
43
|
-
CalendarDateRangeFilter = mongoose.model('CalendarDateRange',
|
|
43
|
+
CalendarDateRangeFilter = mongoose.model('CalendarDateRange', DayRangeFilterSchema)
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
return CalendarDateRangeFilter
|
|
47
47
|
}
|
|
48
48
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
49
|
-
module.exports = { Model: model, Schema:
|
|
49
|
+
module.exports = { Model: model, Schema: DayRangeFilterSchema, rawSchema: schema }
|
|
@@ -41,4 +41,4 @@ let model = (mongooseInstance) => {
|
|
|
41
41
|
return SpeedFilter
|
|
42
42
|
}
|
|
43
43
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
44
|
-
module.exports = { Model: model, Schema: SpeedFilterSchema,
|
|
44
|
+
module.exports = { Model: model, Schema: SpeedFilterSchema, rawSchema: schema }
|
|
@@ -35,4 +35,4 @@ let model = (mongooseInstance) => {
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
38
|
-
module.exports = { Model: model, Schema: TimeOfDayRangeFilterSchema,
|
|
38
|
+
module.exports = { Model: model, Schema: TimeOfDayRangeFilterSchema, rawSchema: schema }
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
// In V2 this is becoming "Travel Path" filter
|
|
2
|
+
let mongoose = require('mongoose')
|
|
3
|
+
let uuidv4 = require('uuid/v4')
|
|
4
|
+
|
|
5
|
+
let schema = {
|
|
6
|
+
_id: {type: String, default: uuidv4},
|
|
7
|
+
minimumGeofeaturesCrossed: {
|
|
8
|
+
type: Number,
|
|
9
|
+
required: [true, 'minimumGeofeaturesCrossed is required.'],
|
|
10
|
+
min: 1
|
|
11
|
+
},
|
|
12
|
+
timeOutSeconds: {type: Number, required: [true, 'timeOutSeconds is required. '], min: 60, max: 86400},
|
|
13
|
+
sequential: {type: Boolean, default: false}
|
|
14
|
+
}
|
|
15
|
+
let TravelPathFilterSchema = new mongoose.Schema(schema, { versionKey: false })
|
|
16
|
+
|
|
17
|
+
TravelPathFilterSchema.add({
|
|
18
|
+
type: {type: String, required: true}
|
|
19
|
+
})
|
|
20
|
+
|
|
21
|
+
// optional mongoose
|
|
22
|
+
let model = (mongooseInstance) => {
|
|
23
|
+
let TravelPathFilter
|
|
24
|
+
if (mongooseInstance) {
|
|
25
|
+
TravelPathFilter = mongooseInstance.model('TravelPathFilter', TravelPathFilterSchema)
|
|
26
|
+
} else {
|
|
27
|
+
TravelPathFilter = mongoose.model('TravelPathFilter', TravelPathFilterSchema)
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
return TravelPathFilter
|
|
31
|
+
}
|
|
32
|
+
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
33
|
+
module.exports = { Model: model, Schema: TravelPathFilterSchema, rawSchema: schema }
|
package/package.json
CHANGED
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
let mongoose = require('mongoose')
|
|
2
|
-
|
|
3
|
-
mongoose.Promise = global.Promise
|
|
4
|
-
|
|
5
|
-
let CalendarDateRangeFilterModel = require('../../../Models').CalendarDateRangeFilter(mongoose)
|
|
6
|
-
let testCase = require('mocha').describe
|
|
7
|
-
let assertions = require('mocha').it
|
|
8
|
-
let chai = require('chai')
|
|
9
|
-
|
|
10
|
-
let assert = chai.assert
|
|
11
|
-
let mocha = require('mocha')
|
|
12
|
-
let beforeEach = mocha.beforeEach
|
|
13
|
-
|
|
14
|
-
let rules = require('./calendarDateRangeFilter.rules.json')
|
|
15
|
-
|
|
16
|
-
let calendarDateRangeFilter
|
|
17
|
-
|
|
18
|
-
beforeEach(() => {
|
|
19
|
-
calendarDateRangeFilter = JSON.parse(JSON.stringify(require('./calendarDateRangeFilter.data.json')))
|
|
20
|
-
})
|
|
21
|
-
|
|
22
|
-
testCase('CalendarDateRangeFilter', () => {
|
|
23
|
-
testCase('Valid CalendarDateRangeFilter', () => {
|
|
24
|
-
assertions('should validate a valid calendarDateRangeFilter ', (done) => {
|
|
25
|
-
let CalendarDateRangeFilter = new CalendarDateRangeFilterModel(calendarDateRangeFilter)
|
|
26
|
-
CalendarDateRangeFilter.validate((err, res) => {
|
|
27
|
-
assert.notExists(res)
|
|
28
|
-
assert(err === null, 'err should equals null')
|
|
29
|
-
done()
|
|
30
|
-
})
|
|
31
|
-
})
|
|
32
|
-
})
|
|
33
|
-
|
|
34
|
-
testCase('Invalid CalendarDateRangeFilter', () => {
|
|
35
|
-
assertions('should not validate a calendarDateRangeFilter with invalid CalendarDateRangeFilter', (done) => {
|
|
36
|
-
delete calendarDateRangeFilter[rules.requiredFields[0]]
|
|
37
|
-
let CalendarDateRangeFilter = new CalendarDateRangeFilterModel(calendarDateRangeFilter)
|
|
38
|
-
CalendarDateRangeFilter.validate((err, res) => {
|
|
39
|
-
assert.exists(err, 'err object should exist')
|
|
40
|
-
assert.isObject(err)
|
|
41
|
-
done()
|
|
42
|
-
})
|
|
43
|
-
})
|
|
44
|
-
testCase('check each required property of the model and validate that it is present', () => {
|
|
45
|
-
let requiredFields = rules.requiredFields
|
|
46
|
-
requiredFields.map((i) => {
|
|
47
|
-
assertions(`should throw an error with property '${i}' if '${i}' is not present`, (done) => {
|
|
48
|
-
// delete i from geofeatures' calendarDateRangeFilter child
|
|
49
|
-
delete calendarDateRangeFilter[i]
|
|
50
|
-
let CalendarDateRangeFilter = new CalendarDateRangeFilterModel(calendarDateRangeFilter)
|
|
51
|
-
CalendarDateRangeFilter.validate((err, res) => {
|
|
52
|
-
assert.notExists(res)
|
|
53
|
-
assert.exists(err, 'err object should exist')
|
|
54
|
-
assert.isObject(err)
|
|
55
|
-
assert.nestedProperty(err, `errors.${i}`, `error should have a ${i} property`)
|
|
56
|
-
done()
|
|
57
|
-
})
|
|
58
|
-
})
|
|
59
|
-
})
|
|
60
|
-
})
|
|
61
|
-
})
|
|
62
|
-
})
|
package/models/BeaconFilter.js
DELETED
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Created by Arun on 10/09/2014.
|
|
3
|
-
* Copyright : Bluedot Innovations.
|
|
4
|
-
* Owner :
|
|
5
|
-
*/
|
|
6
|
-
let mongoose = require('mongoose')
|
|
7
|
-
|
|
8
|
-
let schema = {
|
|
9
|
-
'_class': {type: String, default: 'au.com.bluedot.application.spring.filter.spatial.BeaconFilter'},
|
|
10
|
-
'beacon': {},
|
|
11
|
-
'_id': String,
|
|
12
|
-
'type': {type: String, default: 'beacon'}
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
let BeaconFilterSchema = new mongoose.Schema(schema)
|
|
16
|
-
|
|
17
|
-
BeaconFilterSchema.add({
|
|
18
|
-
type:
|
|
19
|
-
{type: String, required: true}
|
|
20
|
-
})
|
|
21
|
-
|
|
22
|
-
// optional mongoose
|
|
23
|
-
let model = (mongooseInstance) => {
|
|
24
|
-
let BeaconFilter
|
|
25
|
-
if (mongooseInstance) {
|
|
26
|
-
BeaconFilter = mongooseInstance.model('BeaconFilter', BeaconFilterSchema)
|
|
27
|
-
} else {
|
|
28
|
-
BeaconFilter = mongoose.model('BeaconFilter', BeaconFilterSchema)
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
return BeaconFilter
|
|
32
|
-
}
|
|
33
|
-
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
34
|
-
module.exports = { Model: model, Schema: BeaconFilterSchema, beaconFilterSchema: schema }
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
// In V2 this is becoming "Travel Path" filter
|
|
2
|
-
let mongoose = require('mongoose')
|
|
3
|
-
let uuidv4 = require('uuid/v4')
|
|
4
|
-
|
|
5
|
-
let schema = {
|
|
6
|
-
_id: {type: String, default: uuidv4},
|
|
7
|
-
percentage: {type: Number, required: [true, 'percentage is required. '], min: 1, max: 100},
|
|
8
|
-
timeOutSeconds: {type: Number, required: [true, 'timeOutSeconds is required. '], min: 60, max: 86400},
|
|
9
|
-
sequential: {type: Boolean, default: false}
|
|
10
|
-
}
|
|
11
|
-
let PercentageCrossedFilterSchema = new mongoose.Schema(schema, { versionKey: false })
|
|
12
|
-
|
|
13
|
-
PercentageCrossedFilterSchema.add({
|
|
14
|
-
type: {type: String, required: true}
|
|
15
|
-
})
|
|
16
|
-
|
|
17
|
-
// optional mongoose
|
|
18
|
-
let model = (mongooseInstance) => {
|
|
19
|
-
let PercentageCrossedFilter
|
|
20
|
-
if (mongooseInstance) {
|
|
21
|
-
PercentageCrossedFilter = mongooseInstance.model('PercentageCrossedFilter', PercentageCrossedFilterSchema)
|
|
22
|
-
} else {
|
|
23
|
-
PercentageCrossedFilter = mongoose.model('PercentageCrossedFilter', PercentageCrossedFilterSchema)
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
return PercentageCrossedFilter
|
|
27
|
-
}
|
|
28
|
-
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
29
|
-
module.exports = { Model: model, Schema: PercentageCrossedFilterSchema, percentageCrossedFilterSchema: schema }
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|