@bluedot-innovation/models 7.0.1 → 7.0.2
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 +5 -0
- package/__tests__/project/project.data.json +1 -18
- package/__tests__/project/project.remote.config.json +1 -1
- package/__tests__/project/project.spec.js +2 -21
- package/__tests__/zone/zone.spec.js +0 -73
- package/helpers.js +1 -29
- package/models/Zone.js +0 -16
- package/package.json +1 -1
- package/schemas/ProjectTempo.js +0 -11
- package/schemas/Webhook.js +1 -2
- package/utils/DbInitialiser/indexInitialiser.js +0 -12
- package/schemas/ZoneTempo.js +0 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
## 7.0.2
|
|
2
|
+
- Removed tempo webhooks array for post doorbell migration deployment
|
|
3
|
+
- Removed tempo destinationId for post doorbell migration deployment
|
|
4
|
+
- Removed geoTrigger type from webhooks
|
|
5
|
+
|
|
1
6
|
## 7.0.1
|
|
2
7
|
- Added tempo webhooks array back for migration
|
|
3
8
|
- Added tempo destinationId back for migration
|
|
@@ -6,13 +6,6 @@
|
|
|
6
6
|
"name": "A New Project",
|
|
7
7
|
"accountId":"b0824b76-ce73-4fcf-81f8-1b63edb1114e",
|
|
8
8
|
"webhooks": [
|
|
9
|
-
{
|
|
10
|
-
"type": "geoTrigger",
|
|
11
|
-
"url": "https://webhooklistener.bluedotinnovation.com",
|
|
12
|
-
"headers" : {
|
|
13
|
-
"securityToken" : "value"
|
|
14
|
-
}
|
|
15
|
-
},
|
|
16
9
|
{
|
|
17
10
|
"type": "tempo",
|
|
18
11
|
"url": "https://webhooklistener.bluedotinnovation.com",
|
|
@@ -47,16 +40,6 @@
|
|
|
47
40
|
}
|
|
48
41
|
},
|
|
49
42
|
"tempo": {
|
|
50
|
-
"isochroneBracketInterval": [60, 120, 300]
|
|
51
|
-
"webhooks": [
|
|
52
|
-
{
|
|
53
|
-
"type": "tempo",
|
|
54
|
-
"url": "https://webhooklistener.bluedotinnovation.com",
|
|
55
|
-
"headers" : {
|
|
56
|
-
"securityToken" : "value"
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
]
|
|
60
|
-
|
|
43
|
+
"isochroneBracketInterval": [60, 120, 300]
|
|
61
44
|
}
|
|
62
45
|
}
|
|
@@ -91,8 +91,7 @@ testCase('Project', () => {
|
|
|
91
91
|
})
|
|
92
92
|
})
|
|
93
93
|
|
|
94
|
-
|
|
95
|
-
assertions(`should not validate if one of webhooks have a type other than 'geoTrigger', 'tempo', 'doorbell' or 'trigger'`, (done) => {
|
|
94
|
+
assertions(`should not validate if one of webhooks have a type other than 'tempo', 'doorbell' or 'trigger'`, (done) => {
|
|
96
95
|
project.webhooks.push({
|
|
97
96
|
"type": "sandwich",
|
|
98
97
|
"url": "https://webhooklistener.bluedotinnovation.com",
|
|
@@ -280,8 +279,7 @@ testCase('Project', () => {
|
|
|
280
279
|
})
|
|
281
280
|
|
|
282
281
|
testCase('should not validate if webhooks contains two webhooks of the same type', () => {
|
|
283
|
-
|
|
284
|
-
const webhookTypes = ['geoTrigger', 'tempo', 'doorbell', 'trigger']
|
|
282
|
+
const webhookTypes = ['tempo', 'doorbell', 'trigger']
|
|
285
283
|
|
|
286
284
|
webhookTypes.map(webhookType => {
|
|
287
285
|
assertions(`should not validate if there are duplicate ${webhookType} webhooks`, (done) => {
|
|
@@ -303,23 +301,6 @@ testCase('Project', () => {
|
|
|
303
301
|
})
|
|
304
302
|
})
|
|
305
303
|
|
|
306
|
-
// TODO: Remove this test after migration
|
|
307
|
-
assertions(`should not validate if one of tempo webhooks have a type other than 'tempo'`, (done) => {
|
|
308
|
-
project.tempo.webhooks.push({
|
|
309
|
-
"type": "trigger",
|
|
310
|
-
"url": "https://webhooklistener.bluedotinnovation.com",
|
|
311
|
-
"headers" : {
|
|
312
|
-
"securityToken" : "value"
|
|
313
|
-
}
|
|
314
|
-
})
|
|
315
|
-
let Project = new ProjectModel(project)
|
|
316
|
-
Project.validate((err, res) => {
|
|
317
|
-
assert.exists(err)
|
|
318
|
-
assert.match(err.message, /tempo.webhooks should contain tempo webhooks only/)
|
|
319
|
-
done()
|
|
320
|
-
})
|
|
321
|
-
})
|
|
322
|
-
|
|
323
304
|
|
|
324
305
|
describe('should throw an error when any of the values of the array contains a falsy value', () => {
|
|
325
306
|
let arrayTypeFields = rules.arrayTypeFields
|
|
@@ -450,77 +450,4 @@ describe('Zone', () => {
|
|
|
450
450
|
})
|
|
451
451
|
})
|
|
452
452
|
})
|
|
453
|
-
|
|
454
|
-
// TODO: Remove all tests in below describe block after migration
|
|
455
|
-
describe("tempo.destinationId tests", () => {
|
|
456
|
-
it('should save without errors when tempo.destinationId is null', (done) => {
|
|
457
|
-
zone.tempo = {
|
|
458
|
-
destinationId: null
|
|
459
|
-
}
|
|
460
|
-
let Zone = new ZoneModel(zone)
|
|
461
|
-
Zone.validate((err, res) => {
|
|
462
|
-
assert.notExists(res)
|
|
463
|
-
assert.notExists(err)
|
|
464
|
-
done()
|
|
465
|
-
})
|
|
466
|
-
})
|
|
467
|
-
|
|
468
|
-
const validTempoGeofeatureTypes = ['boundingBox', 'circle', 'polygon']
|
|
469
|
-
|
|
470
|
-
validTempoGeofeatureTypes.map(type => {
|
|
471
|
-
it(`should save without errors when tempo.destinationId is set and there is a single ${type} geofeature`, (done) => {
|
|
472
|
-
zone.tempo = {
|
|
473
|
-
"destinationId": "test-destination-id"
|
|
474
|
-
}
|
|
475
|
-
zone.geofeatures = zone.geofeatures.filter(gf => gf.type.match(new RegExp(type)))
|
|
476
|
-
let Zone = new ZoneModel(zone)
|
|
477
|
-
Zone.validate((err, res) => {
|
|
478
|
-
assert.notExists(res)
|
|
479
|
-
assert.notExists(err)
|
|
480
|
-
done()
|
|
481
|
-
})
|
|
482
|
-
})
|
|
483
|
-
})
|
|
484
|
-
|
|
485
|
-
it('should throw an error when tempo.destinationId is longer than 128 characters', (done) => {
|
|
486
|
-
zone.tempo = {
|
|
487
|
-
"destinationId": 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry standard dummy text ever since the 1500s'
|
|
488
|
-
}
|
|
489
|
-
let Zone = new ZoneModel(zone)
|
|
490
|
-
Zone.validate((err, res) => {
|
|
491
|
-
assert.exists(err, 'err object should exist')
|
|
492
|
-
assert.match(err.message, /(destinationId must be less than 129 characters long)/i)
|
|
493
|
-
done()
|
|
494
|
-
})
|
|
495
|
-
})
|
|
496
|
-
|
|
497
|
-
const invalidTempoGeofeatures = ['geoline', 'beacon']
|
|
498
|
-
|
|
499
|
-
invalidTempoGeofeatures.map(type => {
|
|
500
|
-
it(`should throw an error when tempo.destinationId is set and there is a single ${type} geofeature`, (done) => {
|
|
501
|
-
zone.tempo = {
|
|
502
|
-
"destinationId": "test-destination-id"
|
|
503
|
-
}
|
|
504
|
-
zone.geofeatures = zone.geofeatures.filter(gf => gf.type.match(new RegExp(type)))
|
|
505
|
-
let Zone = new ZoneModel(zone)
|
|
506
|
-
Zone.validate((err, res) => {
|
|
507
|
-
assert.exists(err, 'err object should exist')
|
|
508
|
-
assert.match(err.message, /(destinationId cannot be set on zones with a geoline or beacon)/i)
|
|
509
|
-
done()
|
|
510
|
-
})
|
|
511
|
-
})
|
|
512
|
-
})
|
|
513
|
-
|
|
514
|
-
it('should throw an error when tempo.destinationId is set and there is more than one geofeature', (done) => {
|
|
515
|
-
zone.tempo = {
|
|
516
|
-
"destinationId": "test-destination-id"
|
|
517
|
-
}
|
|
518
|
-
let Zone = new ZoneModel(zone)
|
|
519
|
-
Zone.validate((err, res) => {
|
|
520
|
-
assert.exists(err, 'err object should exist')
|
|
521
|
-
assert.match(err.message, /(destinationId can only be set on zones with a single geofeature)/i)
|
|
522
|
-
done()
|
|
523
|
-
})
|
|
524
|
-
})
|
|
525
|
-
})
|
|
526
453
|
})
|
package/helpers.js
CHANGED
|
@@ -267,8 +267,7 @@ helpers.validateDestinationIdGeofeatureType = function(destinationId) {
|
|
|
267
267
|
}
|
|
268
268
|
|
|
269
269
|
helpers.validateNoDuplicateWebhookTypes = function(webhookArray) {
|
|
270
|
-
|
|
271
|
-
const webhookTypes = ['geoTrigger', 'tempo', 'doorbell', 'trigger']
|
|
270
|
+
const webhookTypes = ['tempo', 'doorbell', 'trigger']
|
|
272
271
|
const webhookCounts = {};
|
|
273
272
|
webhookTypes.forEach(webhookType => webhookCounts[webhookType] = 0);
|
|
274
273
|
let duplicateFound = false
|
|
@@ -281,32 +280,5 @@ helpers.validateNoDuplicateWebhookTypes = function(webhookArray) {
|
|
|
281
280
|
return !duplicateFound;
|
|
282
281
|
}
|
|
283
282
|
|
|
284
|
-
// TODO: Remove below three methods after migration
|
|
285
|
-
helpers.validateTempoWebhooks = function(webhooks) {
|
|
286
|
-
const notTempo = webhooks.some(webhook => {
|
|
287
|
-
return webhook.type && webhook.type != 'tempo'
|
|
288
|
-
})
|
|
289
|
-
return !notTempo
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
helpers.validateTempoDestinationSingleGeofeature = function(destinationId) {
|
|
293
|
-
if(destinationId){
|
|
294
|
-
const geofeatures = this.ownerDocument().geofeatures
|
|
295
|
-
if(!geofeatures.length){
|
|
296
|
-
return false
|
|
297
|
-
}
|
|
298
|
-
return geofeatures.length === 1
|
|
299
|
-
}
|
|
300
|
-
return true
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
helpers.validateTempoDestinationIdGeofeatureType = function(destinationId) {
|
|
304
|
-
const geofeatures = this.ownerDocument().geofeatures
|
|
305
|
-
if(destinationId && geofeatures.length){
|
|
306
|
-
return !(geofeatures[0].type === 'geoline' || geofeatures[0].type === 'beacon')
|
|
307
|
-
}
|
|
308
|
-
return true
|
|
309
|
-
}
|
|
310
|
-
|
|
311
283
|
|
|
312
284
|
module.exports = helpers
|
package/models/Zone.js
CHANGED
|
@@ -22,8 +22,6 @@ let travelDirectionRawSchema = require('./conditions/TravelDirection').rawSchema
|
|
|
22
22
|
let travelPathRawSchema = require('./conditions/TravelPath').rawSchema
|
|
23
23
|
let timeActiveRawSchema = require('./conditions/TimeActive').rawSchema
|
|
24
24
|
|
|
25
|
-
let zoneTempoSchema = require('../schemas/ZoneTempo')
|
|
26
|
-
|
|
27
25
|
let uuidv4 = require('uuid/v4')
|
|
28
26
|
let patcher = require('@bluedot-innovation/mongoose-json-patch')
|
|
29
27
|
let helpers = require('../helpers')
|
|
@@ -125,8 +123,6 @@ let zoneSchema = new Schema({
|
|
|
125
123
|
{ validator: helpers.validateDestinationSingleGeofeature, msg: 'destinationId can only be set on zones with a single geofeature' },
|
|
126
124
|
{ validator: helpers.validateDestinationIdGeofeatureType, msg: 'destinationId cannot be set on zones with a geoline or beacon' }
|
|
127
125
|
]},
|
|
128
|
-
// TODO: Remove tempo object after migration
|
|
129
|
-
tempo: zoneTempoSchema
|
|
130
126
|
}, {collection: 'zone', autoIndex: false})
|
|
131
127
|
|
|
132
128
|
zoneSchema.index(
|
|
@@ -140,18 +136,6 @@ zoneSchema.index(
|
|
|
140
136
|
name: "destinationUniqueWithinProject"
|
|
141
137
|
})
|
|
142
138
|
|
|
143
|
-
// TODO: Remove below index after migration
|
|
144
|
-
zoneSchema.index(
|
|
145
|
-
{
|
|
146
|
-
projectId: 1,
|
|
147
|
-
'tempo.destinationId': 1
|
|
148
|
-
},
|
|
149
|
-
{
|
|
150
|
-
unique: true,
|
|
151
|
-
partialFilterExpression: { 'tempo.destinationId': { $exists:true, $type:"string" } },
|
|
152
|
-
name: "tempoDestinationUniqueWithinProject"
|
|
153
|
-
})
|
|
154
|
-
|
|
155
139
|
// Mongoose-json-patch
|
|
156
140
|
// https://www.npmjs.com/package/mongoose-json-patch
|
|
157
141
|
// plugin for PATCH operations
|
package/package.json
CHANGED
package/schemas/ProjectTempo.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
|
-
// TODO: Remove below imports after migration
|
|
3
|
-
let WebhookSchema = require('./Webhook')
|
|
4
|
-
let helpers = require('../helpers')
|
|
5
2
|
|
|
6
3
|
function validateIsochroneBracketInterval (brackets) {
|
|
7
4
|
const isInteger = brackets.every((bracket) => {
|
|
@@ -11,16 +8,8 @@ function validateIsochroneBracketInterval (brackets) {
|
|
|
11
8
|
return isInteger
|
|
12
9
|
}
|
|
13
10
|
|
|
14
|
-
// TODO: Remove below validators after migration
|
|
15
|
-
let webhooksValidators = [
|
|
16
|
-
{validator: helpers.validateNotNull},
|
|
17
|
-
{validator: helpers.validateTempoWebhooks, msg: 'tempo.webhooks should contain tempo webhooks only'}
|
|
18
|
-
];
|
|
19
|
-
|
|
20
11
|
let ProjectTempoSchema = new mongoose.Schema({
|
|
21
12
|
isochroneBracketInterval: {type: [Number], validate: { validator: validateIsochroneBracketInterval, msg: 'tempo.isochroneBracketInterval should contain integer numbers only' }},
|
|
22
|
-
// TODO: Remove webhooks after migration
|
|
23
|
-
webhooks: {type:[WebhookSchema], validate: webhooksValidators}
|
|
24
13
|
}, {
|
|
25
14
|
_id: false
|
|
26
15
|
})
|
package/schemas/Webhook.js
CHANGED
|
@@ -2,8 +2,7 @@ let mongoose = require('mongoose')
|
|
|
2
2
|
let validators = require('../utils/validators')
|
|
3
3
|
|
|
4
4
|
let WebhookSchema = new mongoose.Schema({
|
|
5
|
-
|
|
6
|
-
type: {type: String, enum: ['geoTrigger', 'tempo', 'doorbell', 'trigger'], required: [true, 'webhook type is required']},
|
|
5
|
+
type: {type: String, enum: ['tempo', 'doorbell', 'trigger'], required: [true, 'webhook type is required']},
|
|
7
6
|
url: {type: String, required: [true, 'URL is required'], validate: {validator: validators.validateUrl, msg: 'Please enter a valid URL'}},
|
|
8
7
|
headers: {type: mongoose.Schema.Types.Mixed, validate: { validator: validateHeaderlength, msg: 'Header object can only have 1 key <-> value pair' }}
|
|
9
8
|
}, {
|
|
@@ -17,18 +17,6 @@ const indexes = {
|
|
|
17
17
|
partialFilterExpression: { destinationId: { $exists:true, $type:"string" } },
|
|
18
18
|
name: "destinationUniqueWithinProject"
|
|
19
19
|
}
|
|
20
|
-
},
|
|
21
|
-
// TODO: Remove below index after migration
|
|
22
|
-
{
|
|
23
|
-
fields: {
|
|
24
|
-
projectId: 1,
|
|
25
|
-
'tempo.destinationId': 1
|
|
26
|
-
},
|
|
27
|
-
options: {
|
|
28
|
-
unique: true,
|
|
29
|
-
partialFilterExpression: { 'tempo.destinationId': { $exists:true, $type:"string" } },
|
|
30
|
-
name: "tempoDestinationUniqueWithinProject"
|
|
31
|
-
}
|
|
32
20
|
}
|
|
33
21
|
]
|
|
34
22
|
}
|
package/schemas/ZoneTempo.js
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
// TODO: Remove this file after migration
|
|
2
|
-
let mongoose = require('mongoose')
|
|
3
|
-
let helpers = require('../helpers')
|
|
4
|
-
|
|
5
|
-
let ZoneTempoSchema = new mongoose.Schema({
|
|
6
|
-
destinationId: {type: String, validate: [
|
|
7
|
-
{ validator: helpers.validateDestinationIdLength, msg: 'destinationId must be less than 129 characters long' },
|
|
8
|
-
{ validator: helpers.validateTempoDestinationSingleGeofeature, msg: 'destinationId can only be set on zones with a single geofeature' },
|
|
9
|
-
{ validator: helpers.validateTempoDestinationIdGeofeatureType, msg: 'destinationId cannot be set on zones with a geoline or beacon' }
|
|
10
|
-
]}
|
|
11
|
-
}, {
|
|
12
|
-
_id: false
|
|
13
|
-
})
|
|
14
|
-
|
|
15
|
-
module.exports = ZoneTempoSchema
|