@bluedot-innovation/models 2.0.0-beta.10 → 2.0.0-beta.11
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/.gitlab-ci.yml +1 -1
- package/__tests__/ruleRequestAggregation/ruleRequestAggregation.data.json +1 -1
- package/__tests__/ruleRequestAggregation/ruleRequestAggregation.spec.js +3 -3
- package/models/RuleRequestAggregation.js +1 -1
- package/models/User.js +1 -2
- package/models/Zone.js +3 -0
- package/package.json +1 -1
package/.gitlab-ci.yml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_id" : "bf93ddd2-e7e9-4a89-9bcb-0b2164c17e45",
|
|
3
|
-
"
|
|
3
|
+
"applicationId" : "fd150b63-08dc-4114-aaf9-359cef30def6",
|
|
4
4
|
"customerId" : "f944c7e9-63cc-4c0a-8ad3-acf3c30415fc",
|
|
5
5
|
"iosCount" : 9,
|
|
6
6
|
"androidCount" : 0,
|
|
@@ -36,11 +36,11 @@ testCase('RuleRequestAggregation', () => {
|
|
|
36
36
|
done()
|
|
37
37
|
})
|
|
38
38
|
})
|
|
39
|
-
assertions('should not accept a invalid
|
|
40
|
-
ruleRequestAggregation.
|
|
39
|
+
assertions('should not accept a invalid applicationId', (done) => {
|
|
40
|
+
ruleRequestAggregation.applicationId = 'invalid-applicationId'
|
|
41
41
|
let RuleRequestAggregation = new RuleRequestAggregationModel(ruleRequestAggregation)
|
|
42
42
|
RuleRequestAggregation.validate((err, res) => {
|
|
43
|
-
assert.exists(err, 'invalid
|
|
43
|
+
assert.exists(err, 'invalid applicationId')
|
|
44
44
|
assert.isObject(err)
|
|
45
45
|
done()
|
|
46
46
|
})
|
|
@@ -9,7 +9,7 @@ const helpers = require('../helpers')
|
|
|
9
9
|
|
|
10
10
|
const schema = {
|
|
11
11
|
_id: { type: String, default: uuidv4 },
|
|
12
|
-
|
|
12
|
+
applicationId: {type: String, required: [true, 'applicationId is required'], validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'invalid applicationId'}},
|
|
13
13
|
customerId: {type: String, required: [true, 'customerId is required'], validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'invalid customerId'}},
|
|
14
14
|
iosCount: {type: Number, required: [true, 'iosCount is required'], min: 0},
|
|
15
15
|
androidCount: {type: Number, required: [true, 'androidCount is required'], min: 0},
|
package/models/User.js
CHANGED
package/models/Zone.js
CHANGED
|
@@ -58,6 +58,9 @@ let ZoneSchema = new Schema({
|
|
|
58
58
|
type: [geofeatureSchema],
|
|
59
59
|
required: true
|
|
60
60
|
},
|
|
61
|
+
beacons: {
|
|
62
|
+
type: [beaconSchema]
|
|
63
|
+
},
|
|
61
64
|
customData: [{type: Schema.Types.Mixed}],
|
|
62
65
|
description: {type: String, default: ''},
|
|
63
66
|
creationTime: {type: Date, required: [true, 'creationTime is required'], select: false},
|