@bluedot-innovation/models 3.0.0-alpha.2 → 3.0.0

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.
Files changed (37) hide show
  1. package/CHANGELOG.md +7 -1
  2. package/Models.js +14 -13
  3. package/__tests__/filter/{calendarDateRange/calendarDateRangeFilter.data.json → dayRange/dayRange.data.json} +2 -2
  4. package/__tests__/filter/dayRange/dayRange.rules.json +3 -0
  5. package/__tests__/filter/dayRange/dayRange.spec.js +62 -0
  6. package/__tests__/filter/percentageCrossed/travelPath.data.json +5 -0
  7. package/__tests__/filter/percentageCrossed/travelPath.rules.json +3 -0
  8. package/__tests__/filter/percentageCrossed/{percentageCrossedFilter.spec.js → travelPath.spec.js} +12 -12
  9. package/__tests__/filter/speed/{speedFilter.spec.js → speed.spec.js} +3 -3
  10. package/__tests__/filter/timeActive/timeActive.data.json +5 -0
  11. package/__tests__/filter/{timeOfDayRange/timeOfDayRange.spec.js → timeActive/timeActive.spec.js} +15 -15
  12. package/__tests__/zone/zone.data.json +1 -1
  13. package/helpers.js +18 -1
  14. package/models/BoundingBox.js +6 -12
  15. package/models/Circle.js +1 -4
  16. package/models/MessageAction.js +6 -11
  17. package/models/Polygon.js +1 -4
  18. package/models/Polyline.js +6 -12
  19. package/models/UrlAction.js +6 -13
  20. package/models/Zone.js +18 -12
  21. package/models/ZoneBeacon.js +5 -0
  22. package/models/{CalendarDateRangeFilter.js → filters/DayRange.js} +13 -15
  23. package/models/{SpeedFilter.js → filters/Speed.js} +5 -7
  24. package/models/{TimeOfDayRangeFilter.js → filters/TimeActive.js} +11 -10
  25. package/models/filters/{travelDirection.js → TravelDirection.js} +1 -1
  26. package/models/filters/TravelPath.js +36 -0
  27. package/package.json +1 -2
  28. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.rules.json +0 -3
  29. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.spec.js +0 -62
  30. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.data.json +0 -5
  31. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.rules.json +0 -3
  32. package/__tests__/filter/timeOfDayRange/timeOfDayRange.data.json +0 -5
  33. package/models/BeaconFilter.js +0 -34
  34. package/models/PercentageCrossedFilter.js +0 -29
  35. /package/__tests__/filter/speed/{speedFilter.data.json → speed.data.json} +0 -0
  36. /package/__tests__/filter/speed/{speedFilter.rules.json → speed.rules.json} +0 -0
  37. /package/__tests__/filter/{timeOfDayRange/timeOfDayRange.rules.json → timeActive/timeActive.rules.json} +0 -0
package/CHANGELOG.md CHANGED
@@ -4,8 +4,14 @@
4
4
  - `bearing` -> `travelDirection`
5
5
  - `percentageCrossed` -> `travelPath`
6
6
  - `percentage.percentage` -> `travelPath.minimumGeofeaturesCrossed`
7
- - `timeofDayRange` -> `timeActive`
7
+ - `timeOfDayRange` -> `timeActive`
8
8
  - `calendarDateRange` -> `dayRange`
9
+ - Remove `state` from all subdocuments
10
+ - Remove `creationTime` from all subdocuments
11
+ - Remove `lastUpdateTime` from all subdocuments
12
+ - Remove `_id` from all subdocuments EXCEPT geofeatures
13
+ - Remove `description` from all subdocuments
14
+ - Remove `__v` from all subdocuments
9
15
 
10
16
  ## 2.0.22
11
17
 
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
- Models.Schemas = Schemas
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
@@ -1,5 +1,5 @@
1
1
  {
2
- "type" : "calendarDateRange",
2
+ "type" : "dayRange",
3
3
  "startDate" : "2017-11-14",
4
4
  "endDate" : "2030-11-15"
5
- }
5
+ }
@@ -0,0 +1,3 @@
1
+ {
2
+ "requiredFields": ["type"]
3
+ }
@@ -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
+ })
@@ -0,0 +1,5 @@
1
+ {
2
+ "type": "travelPath",
3
+ "minimumGeofeaturesCrossed": 20,
4
+ "timeOutSeconds": 300
5
+ }
@@ -0,0 +1,3 @@
1
+ {
2
+ "requiredFields":["timeOutSeconds", "minimumGeofeaturesCrossed"]
3
+ }
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
2
2
 
3
3
  mongoose.Promise = global.Promise
4
4
 
5
- let PercentageCrossedFilterModel = require('../../../Models').PercentageCrossedFilter(mongoose)
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('./percentageCrossedFilter.rules.json')
14
+ let rules = require('./travelPath.rules.json')
15
15
 
16
- let percentageCrossedFilter
16
+ let travelPath
17
17
 
18
18
  beforeEach(() => {
19
- percentageCrossedFilter = JSON.parse(JSON.stringify(require('./percentageCrossedFilter.data.json')))
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 percentageCrossedFilter ', (done) => {
25
- let PercentageCrossedFilter = new PercentageCrossedFilterModel(percentageCrossedFilter)
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 percentageCrossedFilter with invalid PercentageCrossedFilter', (done) => {
36
- delete percentageCrossedFilter[rules.requiredFields[0]]
37
- let PercentageCrossedFilter = new PercentageCrossedFilterModel(percentageCrossedFilter)
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' percentageCrossedFilter child
49
- delete percentageCrossedFilter[i]
50
- let PercentageCrossedFilter = new PercentageCrossedFilterModel(percentageCrossedFilter)
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').SpeedFilter(mongoose)
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('./speedFilter.rules.json')
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('./speedFilter.data.json')))
19
+ speedFilter = JSON.parse(JSON.stringify(require('./speed.data.json')))
20
20
  })
21
21
 
22
22
  testCase('SpeedFilter', () => {
@@ -0,0 +1,5 @@
1
+ {
2
+ "type": "timeActiveFilter",
3
+ "fromTime": 112,
4
+ "toTime": 552
5
+ }
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
2
2
 
3
3
  mongoose.Promise = global.Promise
4
4
 
5
- let TimeOfDayRangeFilterModel = require('../../../Models').TimeOfDayRangeFilter(mongoose)
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('./timeOfDayRange.rules.json')
14
+ let rules = require('./timeActive.rules.json')
15
15
 
16
- let timeOfDayRangeFilter
16
+ let timeActiveFilter
17
17
 
18
18
  beforeEach(() => {
19
- timeOfDayRangeFilter = JSON.parse(JSON.stringify(require('./timeOfDayRange.data.json')))
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 timeOfDayRangeFilter ', (done) => {
25
- let TimeOfDayRangeFilter = new TimeOfDayRangeFilterModel(timeOfDayRangeFilter)
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 timeOfDayRangeFilter with invalid TimeOfDayRangeFilter', (done) => {
36
- delete timeOfDayRangeFilter[rules.requiredFields[0]]
37
- let TimeOfDayRangeFilter = new TimeOfDayRangeFilterModel(timeOfDayRangeFilter)
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
- timeOfDayRangeFilter.toTime = 10
46
- timeOfDayRangeFilter.fromTime = 10
47
- let TimeOfDayRangeFilter = new TimeOfDayRangeFilterModel(timeOfDayRangeFilter)
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' timeOfDayRangeFilter child
60
- delete timeOfDayRangeFilter[i]
61
- let TimeOfDayRangeFilter = new TimeOfDayRangeFilterModel(timeOfDayRangeFilter)
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')
@@ -24,7 +24,7 @@
24
24
  "beacons": [],
25
25
  "filters": [
26
26
  {
27
- "type" : "calendarDateRange",
27
+ "type" : "dayRange",
28
28
  "startDate" : "2017-11-14",
29
29
  "endDate" : "2030-11-15"
30
30
  }
package/helpers.js CHANGED
@@ -20,12 +20,29 @@ helpers.validateCustomData = function (data) {
20
20
  let hasValidationErrors = false
21
21
 
22
22
  customDataKeys.forEach(key => {
23
- const alphaNumericValidation = new RegExp(/^\w+$/)
23
+ const alphaNumericValidation = new RegExp(/^[\w\s]+$/)
24
24
  if(!alphaNumericValidation.test(key)){
25
25
  hasValidationErrors = true
26
26
  }
27
27
  })
28
28
 
29
+ const checkDuplicateKeys = [...new Set(customDataKeys)]
30
+ if(customDataKeys.length > checkDuplicateKeys.length) {
31
+ hasValidationErrors = true
32
+ }
33
+
34
+ return !hasValidationErrors
35
+ }
36
+
37
+ helpers.checkDuplicateKeys = function (data) {
38
+ const customDataKeys = Object.keys(data)
39
+ let hasValidationErrors = false
40
+
41
+ const duplicateKeys = [...new Set(customDataKeys)]
42
+ if(customDataKeys.length > duplicateKeys.length) {
43
+ hasValidationErrors = true
44
+ }
45
+
29
46
  return !hasValidationErrors
30
47
  }
31
48
 
@@ -10,22 +10,16 @@ const schema = {
10
10
  name: {type: String, required: [true, 'name is required. ']},
11
11
  color: String,
12
12
  northEast: {type: Point, required: [true, 'northEast is required. ']},
13
- southWest: {type: Point, required: [true, 'southWest is required. ']},
14
- creationTime: {type: Date, default: Date.now},
15
- lastUpdateTime: {type: Date, default: Date.now},
16
- state: {type: String, default: StateEnum.active, select: false}
13
+ southWest: {type: Point, required: [true, 'southWest is required. ']}
17
14
  }
18
15
 
19
- const BoundingBoxSchema = new mongoose.Schema(
20
- schema,
21
- {
22
- _id: false,
23
- versionKey: false
24
- })
16
+ const BoundingBoxSchema = new mongoose.Schema(schema, {
17
+ _id: false,
18
+ versionKey: false
19
+ })
25
20
 
26
21
  BoundingBoxSchema.add({
27
- type:
28
- {type: String, required: true}
22
+ type: {type: String, required: true}
29
23
  })
30
24
 
31
25
  // optional mongoose
package/models/Circle.js CHANGED
@@ -10,10 +10,7 @@ let schema = {
10
10
  name: {type: String, required: [true, 'name is required. ']},
11
11
  color: String,
12
12
  radius: {type: Number, required: [true, 'radius is required. '], min: 5},
13
- center: {type: Point, required: [true, 'center is required. ']},
14
- creationTime: {type: Date, default: Date.now},
15
- lastUpdateTime: {type: Date, default: Date.now},
16
- state: {type: String, default: StateEnum.active, select: false}
13
+ center: {type: Point, required: [true, 'center is required. ']}
17
14
  }
18
15
 
19
16
  let CircleSchema = new mongoose.Schema(
@@ -3,22 +3,17 @@ let StateEnum = require('@bluedot-innovation/enums').StateEnum
3
3
  let uuidv4 = require('uuid/v4')
4
4
 
5
5
  let schema = {
6
- _id: {type: String, default: uuidv4},
7
6
  title: {type: String, required: [true, 'title is required. ']},
8
- message: {type: String, required: [true, 'message is required. ']},
9
- creationTime: {type: Date, default: Date.now},
10
- lastUpdateTime: {type: Date, default: Date.now},
11
- state: {type: String, default: StateEnum.active, select: false}
7
+ message: {type: String, required: [true, 'message is required. ']}
12
8
  }
13
9
 
14
- let MessageActionSchema = new mongoose.Schema(schema,
15
- {
16
- __v: false
17
- })
10
+ let MessageActionSchema = new mongoose.Schema(schema, {
11
+ _id: false,
12
+ versionKey: false
13
+ })
18
14
 
19
15
  MessageActionSchema.add({
20
- type:
21
- {type: String, required: true}
16
+ type: {type: String, required: true}
22
17
  })
23
18
 
24
19
  // optional mongoose
package/models/Polygon.js CHANGED
@@ -15,10 +15,7 @@ const schema = {
15
15
  validator: helpers.validatePolygonVertices,
16
16
  msg: 'A polygon must have 3 or more vertices.'
17
17
  }
18
- },
19
- creationTime: {type: Date, default: Date.now},
20
- lastUpdateTime: {type: Date, default: Date.now},
21
- state: {type: String, default: StateEnum.active, select: false}
18
+ }
22
19
  }
23
20
 
24
21
  const PolygonSchema = new mongoose.Schema(schema, {
@@ -8,22 +8,16 @@ const schema = {
8
8
  _id: {type: String, default: uuidv4},
9
9
  geometry: {type: MultiLineStringGeometry},
10
10
  name: {type: String, required: [true, 'name is required. ']},
11
- vertices: {type: [Point], required: [true, 'vertices is required. ']},
12
- creationTime: {type: Date, default: Date.now},
13
- lastUpdateTime: {type: Date, default: Date.now},
14
- state: {type: String, default: StateEnum.active, select: false}
11
+ vertices: {type: [Point], required: [true, 'vertices is required. ']}
15
12
  }
16
13
 
17
- const PolylineSchema = new mongoose.Schema(
18
- schema,
19
- {
20
- _id: false,
21
- versionKey: false
22
- })
14
+ const PolylineSchema = new mongoose.Schema(schema, {
15
+ _id: false,
16
+ versionKey: false
17
+ })
23
18
 
24
19
  PolylineSchema.add({
25
- type:
26
- {type: String, required: true}
20
+ type: {type: String, required: true}
27
21
  })
28
22
 
29
23
  // optional mongoose
@@ -3,7 +3,6 @@ let StateEnum = require('@bluedot-innovation/enums').StateEnum
3
3
  let uuidv4 = require('uuid/v4')
4
4
 
5
5
  let schema = {
6
- _id: {type: String, default: uuidv4},
7
6
  url: {
8
7
  type: String,
9
8
  required: [true, 'url is required. '],
@@ -11,22 +10,16 @@ let schema = {
11
10
  isAsync: true,
12
11
  validator: validateURL
13
12
  }
14
- },
15
- description: {type: String, default: ''},
16
- creationTime: {type: Date, default: Date.now},
17
- lastUpdateTime: {type: Date, default: Date.now},
18
- state: {type: String, default: StateEnum.active, select: false}
13
+ }
19
14
  }
20
15
 
21
- let URLActionSchema = new mongoose.Schema(schema,
22
- {
23
- _id: false,
24
- __v: false
25
- })
16
+ let URLActionSchema = new mongoose.Schema(schema, {
17
+ _id: false,
18
+ __v: false
19
+ })
26
20
 
27
21
  URLActionSchema.add({
28
- type:
29
- {type: String, required: true}
22
+ type: {type: String, required: true}
30
23
  })
31
24
 
32
25
  function validateURL (url, magicCallback) {
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
- let speedFilterSchema = require('./SpeedFilter').speedFilterSchema
18
- let travelDirectionRawSchema = require('./filters/travelDirection').rawSchema
19
- let timeOfDayRangeFilterSchema = require('./TimeOfDayRangeFilter').timeOfDayRangeFilterSchema
20
- let calendarDateRangeFilterSchema = require('./CalendarDateRangeFilter').calendarDateRangeFilterSchema
21
- let percentageCrossedFilterSchema = require('./PercentageCrossedFilter').percentageCrossedFilterSchema
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')
@@ -27,6 +30,11 @@ let helpers = require('../helpers')
27
30
  // Schema //
28
31
  // ////// //
29
32
 
33
+ let customDataValidators = [
34
+ {validator: helpers.validateCustomData, msg: 'CustomData key should have alpha numeric and _ characters only'},
35
+ {validator: helpers.checkDuplicateKeys, msg: 'CustomData key should be unique'},
36
+ ];
37
+
30
38
  let actionSchema = new Schema({},
31
39
  { discriminatorKey: 'type', _id: false })
32
40
 
@@ -61,7 +69,7 @@ let zoneSchema = new Schema({
61
69
  required: true
62
70
  },
63
71
  triggerOnExit: {type: Boolean, default: false},
64
- customData: {type: Schema.Types.Mixed},
72
+ customData: {type: Schema.Types.Mixed, validate: customDataValidators},
65
73
  creationTime: {type: Date, default: Date.now},
66
74
  lastUpdateTime: {type: Date, default: Date.now},
67
75
  projectId: {type: String, required: [true, 'projectId is required']},
@@ -75,11 +83,11 @@ zoneSchema.plugin(patcher)
75
83
  zoneSchema.path('actions').discriminator('url', new Schema(urlActionSchema))
76
84
  zoneSchema.path('actions').discriminator('message', new Schema(messageActionSchema))
77
85
 
86
+ zoneSchema.path('filters').discriminator('dayRange', new Schema(dayRangeRawSchema))
87
+ zoneSchema.path('filters').discriminator('speed', new Schema(speedRawSchema))
88
+ zoneSchema.path('filters').discriminator('timeActive', new Schema(timeActiveRawSchema))
78
89
  zoneSchema.path('filters').discriminator('travelDirection', new Schema(travelDirectionRawSchema))
79
- zoneSchema.path('filters').discriminator('calendarDateRange', new Schema(calendarDateRangeFilterSchema))
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))
90
+ zoneSchema.path('filters').discriminator('travelPath', new Schema(travelPathRawSchema))
83
91
 
84
92
  zoneSchema.path('geofeatures').discriminator('beacon', new Schema(beaconSchema))
85
93
  zoneSchema.path('geofeatures').discriminator('circle', new Schema(circleSchema))
@@ -87,8 +95,6 @@ zoneSchema.path('geofeatures').discriminator('polygon', new Schema(polygonSchema
87
95
  zoneSchema.path('geofeatures').discriminator('polyline', new Schema(polylineSchema))
88
96
  zoneSchema.path('geofeatures').discriminator('boundingBox', new Schema(boundingBoxSchema))
89
97
 
90
- zoneSchema.path('customData').validate(helpers.validateCustomData, 'CustomData key should have alpha numeric and _ characters only')
91
-
92
98
  // optional mongoose
93
99
  const model = (mongooseInstance) => {
94
100
  let Zone
@@ -5,6 +5,11 @@ const BeaconEnum = require('@bluedot-innovation/enums').BeaconEnum
5
5
 
6
6
  const schema = cloneDeep(beaconSchema)
7
7
 
8
+ delete schema.state
9
+ delete schema.creationTime
10
+ delete schema.lastUpdateTime
11
+ delete schema.__v
12
+
8
13
  schema.proximity = {
9
14
  type: String,
10
15
  default: BeaconEnum.FAR,
@@ -2,19 +2,17 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  let schema = {
5
- _id: {type: String, default: uuidv4},
6
5
  startDate: {type: Date},
7
6
  endDate: {type: Date, validate: {isAsync: true, validator: validateDateRange}}
8
7
  }
9
- let CalendarDateRangeFilterSchema = new mongoose.Schema(
10
- schema,
11
- {
12
- versionKey: false
13
- })
14
-
15
- CalendarDateRangeFilterSchema.add({
16
- type:
17
- {type: String, required: true}
8
+
9
+ let DayRangeFilterSchema = new mongoose.Schema(schema, {
10
+ _id: false,
11
+ versionKey: false
12
+ })
13
+
14
+ DayRangeFilterSchema.add({
15
+ type: {type: String, required: true}
18
16
  })
19
17
 
20
18
  function validateDateRange (endDate, magicCallback) {
@@ -36,14 +34,14 @@ function validateDateRange (endDate, magicCallback) {
36
34
 
37
35
  // optional mongoose
38
36
  let model = (mongooseInstance) => {
39
- let CalendarDateRangeFilter
37
+ let DayRangeFilter
40
38
  if (mongooseInstance) {
41
- CalendarDateRangeFilter = mongooseInstance.model('CalendarDateRange', CalendarDateRangeFilterSchema)
39
+ DayRangeFilter = mongooseInstance.model('DayRangeFilter', DayRangeFilterSchema)
42
40
  } else {
43
- CalendarDateRangeFilter = mongoose.model('CalendarDateRange', CalendarDateRangeFilterSchema)
41
+ DayRangeFilter = mongoose.model('DayRangeFilter', DayRangeFilterSchema)
44
42
  }
45
43
 
46
- return CalendarDateRangeFilter
44
+ return DayRangeFilter
47
45
  }
48
46
  // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
49
- module.exports = { Model: model, Schema: CalendarDateRangeFilterSchema, calendarDateRangeFilterSchema: schema }
47
+ module.exports = { Model: model, Schema: DayRangeFilterSchema, rawSchema: schema }
@@ -2,15 +2,13 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  let schema = {
5
- _id: {type: String, default: uuidv4},
6
5
  minimumSpeed: {type: Number, required: [true, 'minimumSpeed is required. '], min: 0},
7
6
  maximumSpeed: {type: Number, required: true, validate: {isAsync: true, validator: validateMaxSpeed, msg: 'default error message'}}
8
7
  }
9
- let SpeedFilterSchema = new mongoose.Schema(
10
- schema,
11
- {
12
- versionKey: false
13
- })
8
+ let SpeedFilterSchema = new mongoose.Schema(schema, {
9
+ _id: false,
10
+ versionKey: false
11
+ })
14
12
 
15
13
  SpeedFilterSchema.add({
16
14
  type: {type: String, required: true}
@@ -41,4 +39,4 @@ let model = (mongooseInstance) => {
41
39
  return SpeedFilter
42
40
  }
43
41
  // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
44
- module.exports = { Model: model, Schema: SpeedFilterSchema, speedFilterSchema: schema }
42
+ module.exports = { Model: model, Schema: SpeedFilterSchema, rawSchema: schema }
@@ -2,15 +2,16 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  let schema = {
5
- _id: {type: String, default: uuidv4},
6
5
  fromTime: {type: Number, required: [true, 'time is required. '], min: 0, max: 86400},
7
6
  toTime: {type: Number, required: true, min: 0, max: 86400, validate: {isAsync: true, validator: validateTime}}
8
7
  }
9
- let TimeOfDayRangeFilterSchema = new mongoose.Schema(schema, { versionKey: false })
8
+ let TimeActiveFilterSchema = new mongoose.Schema(schema, {
9
+ _id: false,
10
+ versionKey: false
11
+ })
10
12
 
11
- TimeOfDayRangeFilterSchema.add({
12
- type:
13
- {type: String, required: true}
13
+ TimeActiveFilterSchema.add({
14
+ type: {type: String, required: true}
14
15
  })
15
16
 
16
17
  function validateTime (toTime, magicCallback) {
@@ -24,15 +25,15 @@ function validateTime (toTime, magicCallback) {
24
25
 
25
26
  // optional mongoose
26
27
  let model = (mongooseInstance) => {
27
- let TimeOfDayRangeFilter
28
+ let TimeActiveFilter
28
29
  if (mongooseInstance) {
29
- TimeOfDayRangeFilter = mongooseInstance.model('TimeOfDayRangeFilterSchema', TimeOfDayRangeFilterSchema)
30
+ TimeActiveFilter = mongooseInstance.model('TimeActiveFilter', TimeActiveFilterSchema)
30
31
  } else {
31
- TimeOfDayRangeFilter = mongoose.model('TimeOfDayRangeFilterSchema', TimeOfDayRangeFilterSchema)
32
+ TimeActiveFilter = mongoose.model('TimeActiveFilter', TimeActiveFilterSchema)
32
33
  }
33
34
 
34
- return TimeOfDayRangeFilter
35
+ return TimeActiveFilter
35
36
  }
36
37
 
37
38
  // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
38
- module.exports = { Model: model, Schema: TimeOfDayRangeFilterSchema, timeOfDayRangeFilterSchema: schema }
39
+ module.exports = { Model: model, Schema: TimeActiveFilterSchema, rawSchema: schema }
@@ -2,12 +2,12 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  const schema = {
5
- _id: {type: String, default: uuidv4},
6
5
  fromAngle: {type: Number, required: [true, 'fromAngle is required. '], min: 0, max: 359},
7
6
  toAngle: {type: Number, required: true, min: 0, max: 359, validate: {isAsync: true, validator: validateAngles, msg: 'default error message'}}
8
7
  }
9
8
 
10
9
  const TravelDirectionFilterSchema = new mongoose.Schema(schema, {
10
+ _id: false,
11
11
  versionKey: false
12
12
  })
13
13
 
@@ -0,0 +1,36 @@
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
+ minimumGeofeaturesCrossed: {
7
+ type: Number,
8
+ required: [true, 'minimumGeofeaturesCrossed is required.'],
9
+ min: 1
10
+ },
11
+ timeOutSeconds: {type: Number, required: [true, 'timeOutSeconds is required. '], min: 60, max: 86400},
12
+ sequential: {type: Boolean, default: false}
13
+ }
14
+
15
+ let TravelPathFilterSchema = new mongoose.Schema(schema, {
16
+ _id: false,
17
+ versionKey: false
18
+ })
19
+
20
+ TravelPathFilterSchema.add({
21
+ type: {type: String, required: true}
22
+ })
23
+
24
+ // optional mongoose
25
+ let model = (mongooseInstance) => {
26
+ let TravelPathFilter
27
+ if (mongooseInstance) {
28
+ TravelPathFilter = mongooseInstance.model('TravelPathFilter', TravelPathFilterSchema)
29
+ } else {
30
+ TravelPathFilter = mongoose.model('TravelPathFilter', TravelPathFilterSchema)
31
+ }
32
+
33
+ return TravelPathFilter
34
+ }
35
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
36
+ module.exports = { Model: model, Schema: TravelPathFilterSchema, rawSchema: schema }
package/package.json CHANGED
@@ -1,7 +1,6 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "3.0.0-alpha.2",
4
- "description": "",
3
+ "version": "3.0.0",
5
4
  "main": "Models.js",
6
5
  "scripts": {
7
6
  "lint": "./node_modules/.bin/eslint -c .eslintrc.js ./models/*.js ./__tests__/**/*.js ./__tests__/**/**/*.js ./schemas/*.js",
@@ -1,3 +0,0 @@
1
- {
2
- "requiredFields":["type"]
3
- }
@@ -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
- })
@@ -1,5 +0,0 @@
1
- {
2
- "type" : "percentageCrossed",
3
- "percentage" : 20,
4
- "timeOutSeconds" : 300
5
- }
@@ -1,3 +0,0 @@
1
- {
2
- "requiredFields":["timeOutSeconds", "percentage"]
3
- }
@@ -1,5 +0,0 @@
1
- {
2
- "type" : "timeOfDayRange",
3
- "fromTime" : 112,
4
- "toTime" : 552
5
- }
@@ -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 }