@bluedot-innovation/models 5.1.19 → 5.1.21
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 +3 -0
- package/__tests__/zone/zone.spec.js +11 -1
- package/helpers.js +1 -2
- package/models/Zone.js +2 -2
- package/package.json +1 -1
- package/schemas/AndroidConfig.js +1 -7
- package/schemas/IosConfig.js +7 -2
- package/schemas/Telemetry.js +2 -1
- package/utils/index.js +14 -9
package/CHANGELOG.md
CHANGED
|
@@ -168,7 +168,7 @@ describe('Zone', () => {
|
|
|
168
168
|
zone.customData["name#3"] = "A Custom action"
|
|
169
169
|
let Zone = new ZoneModel(zone)
|
|
170
170
|
Zone.validate((err, res) => {
|
|
171
|
-
assert.match(err.message, /(CustomData key should have alpha numeric and _ characters only)/i);
|
|
171
|
+
assert.match(err.message, /(CustomData key should have alpha numeric, - and _ characters only)/i);
|
|
172
172
|
done()
|
|
173
173
|
})
|
|
174
174
|
})
|
|
@@ -266,6 +266,16 @@ describe('Zone', () => {
|
|
|
266
266
|
helpers.testNullValue(zone, ZoneModel, done)
|
|
267
267
|
})
|
|
268
268
|
|
|
269
|
+
it('should throw an error when projectId is invalid', (done) => {
|
|
270
|
+
zone.projectId = "invalid id"
|
|
271
|
+
let Zone = new ZoneModel(zone)
|
|
272
|
+
Zone.validate((err, res) => {
|
|
273
|
+
assert.exists(err, 'err object should exist')
|
|
274
|
+
assert.match(err.message, /(Invalid Project Id)/i)
|
|
275
|
+
done()
|
|
276
|
+
})
|
|
277
|
+
})
|
|
278
|
+
|
|
269
279
|
describe('should throw an error when any of the values of the array contains a falsy value', () => {
|
|
270
280
|
let arrayTypeFields = rules.arrayTypeFields
|
|
271
281
|
|
package/helpers.js
CHANGED
|
@@ -19,13 +19,12 @@ helpers.threeOrMoreVertices = function(vertices) {
|
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
helpers.validateCustomData = function (data) {
|
|
22
|
-
|
|
23
22
|
if(!isValidObject(data)){
|
|
24
23
|
return false
|
|
25
24
|
}
|
|
26
25
|
|
|
27
26
|
const customDataKeys = Object.keys(data)
|
|
28
|
-
const alphaNumericValidation = new RegExp(/^[\w\s]+$/)
|
|
27
|
+
const alphaNumericValidation = new RegExp(/^[\w\s-]+$/)
|
|
29
28
|
return customDataKeys.every(key => {
|
|
30
29
|
return alphaNumericValidation.test(key)
|
|
31
30
|
});
|
package/models/Zone.js
CHANGED
|
@@ -31,7 +31,7 @@ let helpers = require('../helpers')
|
|
|
31
31
|
// ////// //
|
|
32
32
|
|
|
33
33
|
let customDataValidators = [
|
|
34
|
-
{validator: helpers.validateCustomData, msg: 'CustomData key should have alpha numeric and _ characters only'},
|
|
34
|
+
{validator: helpers.validateCustomData, msg: 'CustomData key should have alpha numeric, - and _ characters only'},
|
|
35
35
|
{validator: helpers.checkDuplicateKeys, msg: 'CustomData key should be unique'},
|
|
36
36
|
{validator: helpers.isCustomDataValuesNotEmpty, msg: 'CustomData value should not be empty'},
|
|
37
37
|
{validator: helpers.isValidCustomDataCount, msg: 'Only 5 custom data fields are allowed to be added per zone'}
|
|
@@ -80,7 +80,7 @@ let zoneSchema = new Schema({
|
|
|
80
80
|
customData: {type: Schema.Types.Mixed, validate: customDataValidators},
|
|
81
81
|
creationTime: {type: Date, default: Date.now},
|
|
82
82
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
83
|
-
projectId: {type: String, required: true},
|
|
83
|
+
projectId: {type: String, required: true, validate: {validator: helpers.validateUUIDv4, message: 'Invalid Project Id.'}},
|
|
84
84
|
state: {type: String, default: StateEnum.ACTIVE, select: false},
|
|
85
85
|
accountId: {type: String, required: true, validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'default error message'}}
|
|
86
86
|
}, {collection: 'zone'})
|
package/package.json
CHANGED
package/schemas/AndroidConfig.js
CHANGED
|
@@ -7,11 +7,6 @@ let useCaseTypeEnum = {
|
|
|
7
7
|
message: 'enum validator failed for path `{PATH}` with value `{VALUE}`'
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
let triggerEngineEnum = {
|
|
11
|
-
values: ['BD', 'Hybrid', 'Native'],
|
|
12
|
-
message: 'enum validator failed for path `{PATH}` with value `{VALUE}`'
|
|
13
|
-
}
|
|
14
|
-
|
|
15
10
|
let AndroidSchema = new mongoose.Schema({
|
|
16
11
|
triggeringOnWifiAccuracyThreshold: {type: Number, required: true},
|
|
17
12
|
triggeringOnGpsAccuracyThreshold: {type: Number, required: true},
|
|
@@ -26,8 +21,7 @@ let AndroidSchema = new mongoose.Schema({
|
|
|
26
21
|
applicationLoggingEnabled: {type: Boolean, required: true}, //Local logging on the device
|
|
27
22
|
telemetry : telemetrySchema,
|
|
28
23
|
useCaseType : {type: String, enum: useCaseTypeEnum, required: true},
|
|
29
|
-
maximumPageSize: {type: Number, required: true
|
|
30
|
-
triggerEngine: {type: String, enum: triggerEngineEnum, required: true}
|
|
24
|
+
maximumPageSize: {type: Number, required: true}
|
|
31
25
|
}, {
|
|
32
26
|
_id: false
|
|
33
27
|
})
|
package/schemas/IosConfig.js
CHANGED
|
@@ -9,6 +9,11 @@ let useCaseTypeEnum = {
|
|
|
9
9
|
message: 'enum validator failed for path `{PATH}` with value `{VALUE}`'
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
+
let triggerEngineEnum = {
|
|
13
|
+
values: ['BD', 'Hybrid', 'Native'],
|
|
14
|
+
message: 'enum validator failed for path `{PATH}` with value `{VALUE}`'
|
|
15
|
+
}
|
|
16
|
+
|
|
12
17
|
let IosSchema = new mongoose.Schema({
|
|
13
18
|
triggeringOnWifiAccuracyThreshold : {type: Number, required: true},
|
|
14
19
|
triggeringOnGpsAccuracyThreshold : {type: Number, required: true},
|
|
@@ -23,14 +28,14 @@ let IosSchema = new mongoose.Schema({
|
|
|
23
28
|
triggeringOnPollingLocationFurtherThreshold : {type: Number, required: true},
|
|
24
29
|
triggeringOnPollingLocationFarthestThreshold : {type: Number, required: true},
|
|
25
30
|
focalDistanceAccuracyCoefficient : {type: Number, required: true},
|
|
26
|
-
accelerometerEnablementThreshold : {type: Number, required: true},
|
|
27
31
|
endpointUrl : {type: String, required: true, validate: {validator: validators.validateUrl, msg: 'endpoint Url is required'}},
|
|
28
32
|
filteringEnabled : {type: Boolean, required: true},
|
|
29
33
|
applicationLoggingEnabled : {type: Boolean, required: true},
|
|
30
34
|
useCaseType : {type: String, enum: useCaseTypeEnum, required: true},
|
|
31
35
|
telemetry: telemetrySchema,
|
|
32
36
|
accuracySuppression: accuracySuppressionSchema,
|
|
33
|
-
starvationDetector: starvationDetectionSchema
|
|
37
|
+
starvationDetector: starvationDetectionSchema,
|
|
38
|
+
triggerEngine: {type: String, enum: triggerEngineEnum, required: true}
|
|
34
39
|
}, {
|
|
35
40
|
_id: false
|
|
36
41
|
})
|
package/schemas/Telemetry.js
CHANGED
package/utils/index.js
CHANGED
|
@@ -17,21 +17,26 @@ const notSameThreeInARow = function(list) {
|
|
|
17
17
|
const cleanList = clean(list)
|
|
18
18
|
let hasSame = false;
|
|
19
19
|
|
|
20
|
-
for (var i =
|
|
21
|
-
const itemA = cleanList[i]
|
|
22
|
-
const itemB = cleanList[i - 1]
|
|
23
|
-
const itemC = cleanList[i - 2]
|
|
24
|
-
|
|
25
|
-
if (equal(itemA, itemB)) {
|
|
26
|
-
hasSame = true;
|
|
27
|
-
}
|
|
28
|
-
if (equal(itemA, itemC)) {
|
|
20
|
+
for (var i = 2; i < cleanList.length; i++) {
|
|
21
|
+
const itemA = trimLatLon(cleanList[i])
|
|
22
|
+
const itemB = trimLatLon(cleanList[i - 1])
|
|
23
|
+
const itemC = trimLatLon(cleanList[i - 2])
|
|
24
|
+
|
|
25
|
+
if (equal(itemA, itemB) || equal(itemA, itemC) || equal(itemB, itemC)) {
|
|
29
26
|
hasSame = true;
|
|
27
|
+
break;
|
|
30
28
|
}
|
|
31
29
|
}
|
|
32
30
|
return !hasSame;
|
|
33
31
|
}
|
|
34
32
|
|
|
33
|
+
const trimLatLon = function(item) {
|
|
34
|
+
let result = {}
|
|
35
|
+
result.latitude = trimDecimals(item.latitude, 6)
|
|
36
|
+
result.longitude = trimDecimals(item.longitude, 6)
|
|
37
|
+
return result;
|
|
38
|
+
}
|
|
39
|
+
|
|
35
40
|
module.exports = {
|
|
36
41
|
clean,
|
|
37
42
|
trimDecimals,
|