@bluedot-innovation/models 2.0.0-alpha.10 → 2.0.0-alpha.12
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.
|
@@ -60,5 +60,15 @@ testCase('Zone - Action', () => {
|
|
|
60
60
|
done()
|
|
61
61
|
})
|
|
62
62
|
})
|
|
63
|
+
assertions('should throw an error when an no geofeature is instantiated within a zone', (done) => {
|
|
64
|
+
zone.geofeatures = []
|
|
65
|
+
let Zone = new ZoneModel(zone)
|
|
66
|
+
Zone.validate((err, res) => {
|
|
67
|
+
assert.exists(err, 'err object should exist')
|
|
68
|
+
assert.isObject(err)
|
|
69
|
+
assert('geofeatures' in err.errors)
|
|
70
|
+
done()
|
|
71
|
+
})
|
|
72
|
+
})
|
|
63
73
|
})
|
|
64
74
|
})
|
package/models/Beacon.js
CHANGED
|
@@ -82,11 +82,11 @@ function validateBeaconType (v, cb) {
|
|
|
82
82
|
let bothRegex = new RegExp(/(both)/ig)
|
|
83
83
|
|
|
84
84
|
if (androidRegex.test(beaconType)) {
|
|
85
|
-
magicCallback((!!macAddress && !!txPower), 'Beacon type
|
|
85
|
+
magicCallback((!!macAddress && !!txPower), 'Beacon type `Android` must have both mac address and tx power values')
|
|
86
86
|
} else if (iosRegex.test(beaconType)) {
|
|
87
|
-
magicCallback((!!minor && !!major), 'Beacon type
|
|
87
|
+
magicCallback((!!minor && !!major), 'Beacon type `IOS` must have both minor and major values')
|
|
88
88
|
} else if (bothRegex.test(beaconType)) {
|
|
89
|
-
magicCallback((!!minor && !!major && !!txPower && !!macAddress), 'Beacon type
|
|
89
|
+
magicCallback((!!minor && !!major && !!txPower && !!macAddress), 'Beacon type `Both` must have all of minor, major, tx power, and mac address values')
|
|
90
90
|
} else {
|
|
91
91
|
magicCallback(true)
|
|
92
92
|
}
|
package/models/BearingFilter.js
CHANGED
|
@@ -4,7 +4,7 @@ let uuidv4 = require('uuid/v4')
|
|
|
4
4
|
const schema = {
|
|
5
5
|
guid: {type: String, default: uuidv4},
|
|
6
6
|
fromAngle: {type: Number, required: [true, 'fromAngle is required. '], min: 0, max: 359},
|
|
7
|
-
toAngle: {type: Number, required: true, min: 0, max: 359, validate: {validator: validateAngles, msg: 'default error message'}}
|
|
7
|
+
toAngle: {type: Number, required: true, min: 0, max: 359, validate: {isAsync: true, validator: validateAngles, msg: 'default error message'}}
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
const BearingFilterSchema = new mongoose.Schema(
|
package/models/SpeedFilter.js
CHANGED
|
@@ -4,7 +4,7 @@ let uuidv4 = require('uuid/v4')
|
|
|
4
4
|
let schema = {
|
|
5
5
|
guid: {type: String, default: uuidv4},
|
|
6
6
|
minimumSpeed: {type: Number, required: [true, 'minimumSpeed is required. '], min: 0},
|
|
7
|
-
maximumSpeed: {type: Number, required: true, validate: {validator: validateMaxSpeed, msg: 'default error message'}}
|
|
7
|
+
maximumSpeed: {type: Number, required: true, validate: {isAsync: true, validator: validateMaxSpeed, msg: 'default error message'}}
|
|
8
8
|
}
|
|
9
9
|
let SpeedFilterSchema = new mongoose.Schema(
|
|
10
10
|
schema,
|
|
@@ -4,7 +4,7 @@ let uuidv4 = require('uuid/v4')
|
|
|
4
4
|
let schema = {
|
|
5
5
|
guid: {type: String, default: uuidv4},
|
|
6
6
|
fromTime: {type: Number, required: [true, 'time is required. '], min: 0, max: 86400},
|
|
7
|
-
toTime: {type: Number, required: true, min: 0, max: 86400, validate: validateTime}
|
|
7
|
+
toTime: {type: Number, required: true, min: 0, max: 86400, validate: {isAsync: true, validator: validateTime}}
|
|
8
8
|
}
|
|
9
9
|
let TimeOfDayRangeFilterSchema = new mongoose.Schema(
|
|
10
10
|
schema,
|
package/models/UrlAction.js
CHANGED
package/models/Zone.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bluedot-innovation/models",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.12",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "Models.js",
|
|
6
6
|
"scripts": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@bluedot-innovation/enums": "*",
|
|
31
|
-
"mongoose": "^4.13.
|
|
31
|
+
"mongoose": "^4.13.9",
|
|
32
32
|
"mongoose-error-helper": "0.0.2",
|
|
33
33
|
"mongoose-json-patch": "^1.1.1",
|
|
34
34
|
"uuid": "^3.1.0"
|