@bluedot-innovation/models 6.0.11 → 6.1.1

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 CHANGED
@@ -1,3 +1,10 @@
1
+ ## 6.1.1
2
+ - Add destinationId to Zone model
3
+ - Edit features.eta.enabled to Account model
4
+
5
+ ## 6.1.0
6
+ - Remove unused fields in remote config
7
+
1
8
  ## 6.0.11
2
9
  - Add ETA Webhooks to Project model
3
10
 
@@ -389,5 +389,17 @@ describe('Zone', () => {
389
389
  done()
390
390
  })
391
391
  })
392
+
393
+ it('should throw an error when eta.destinationId is longer than 128 characters', (done) => {
394
+ zone.eta = {
395
+ "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'
396
+ }
397
+ let Zone = new ZoneModel(zone)
398
+ Zone.validate((err, res) => {
399
+ assert.exists(err, 'err object should exist')
400
+ assert.match(err.message, /(destinationId must be no more than 128 characters long)/i)
401
+ done()
402
+ })
403
+ })
392
404
  })
393
405
  })
package/helpers.js CHANGED
@@ -240,6 +240,10 @@ helpers.ensureNonEmptyGeofeatures = function(zone, next){
240
240
  next()
241
241
  }
242
242
 
243
+ helpers.validateEtaDestinationId = function(etaDestinationId) {
244
+ return !(etaDestinationId.length > 128)
245
+ }
246
+
243
247
  helpers.validateTriggerWebhooks = function(webhooks) {
244
248
  const notTrigger = webhooks.some(webhook => {
245
249
  return webhook.type && webhook.type != 'trigger'
package/models/Project.js CHANGED
@@ -47,7 +47,7 @@ let ProjectSchema = new mongoose.Schema({
47
47
  firebaseApiKey: {type: String, validate: helpers.validateNotNull},
48
48
  apiKey: {type: String},
49
49
  integrations: IntegrationSchema,
50
- eta: {type: [projectEtaSchema]}
50
+ eta: projectEtaSchema
51
51
  },
52
52
  {collection: 'project'})
53
53
 
package/models/Zone.js CHANGED
@@ -22,6 +22,8 @@ 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 zoneEtaSchema = require('../schemas/ZoneEta')
26
+
25
27
  let uuidv4 = require('uuid/v4')
26
28
  let patcher = require('@bluedot-innovation/mongoose-json-patch')
27
29
  let helpers = require('../helpers')
@@ -117,7 +119,8 @@ let zoneSchema = new Schema({
117
119
  lastUpdateTime: {type: Date, default: Date.now},
118
120
  projectId: {type: String, required: true, validate: {validator: helpers.validateUUIDv4, message: 'Invalid Project Id.'}},
119
121
  state: {type: String, default: StateEnum.ACTIVE, select: false},
120
- accountId: {type: String, required: true, validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'default error message'}}
122
+ accountId: {type: String, required: true, validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'default error message'}},
123
+ eta: zoneEtaSchema
121
124
  }, {collection: 'zone'})
122
125
 
123
126
  // Mongoose-json-patch
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "6.0.11",
3
+ "version": "6.1.1",
4
4
  "main": "Models.js",
5
5
  "scripts": {
6
6
  "lint": "./node_modules/.bin/eslint -c .eslintrc.js ./models/*.js ./__tests__/**/*.js ./__tests__/**/**/*.js ./schemas/*.js",
@@ -0,0 +1,9 @@
1
+ let mongoose = require('mongoose')
2
+
3
+ let AccountEtaSchema = new mongoose.Schema({
4
+ enabled: {type: Boolean}
5
+ }, {
6
+ _id: false
7
+ })
8
+
9
+ module.exports = AccountEtaSchema
@@ -1,7 +1,8 @@
1
1
  let mongoose = require('mongoose')
2
+ let AccountEtaSchema = require('./AccountEta')
2
3
 
3
4
  let AccountFeaturesSchema = new mongoose.Schema({
4
- etaEnabled: {type: Boolean}
5
+ eta: AccountEtaSchema
5
6
  }, {
6
7
  _id: false
7
8
  })
@@ -16,12 +16,10 @@ let AndroidSchema = new mongoose.Schema({
16
16
  beaconReevaluationDistance: {type: Number, required: true},
17
17
  beaconActivationCoefficient: {type: Number, required: true},
18
18
  beaconActivationDistance: {type: Number, required: true},
19
- endpointUrl: {type: String, required: true, validate: {validator: validators.validateUrl, msg: 'endpoint Url is required'}},
20
- filteringEnabled: {type: Boolean, required: true},
21
- applicationLoggingEnabled: {type: Boolean, required: true}, //Local logging on the device
22
- telemetry : telemetrySchema,
23
- useCaseType : {type: String, enum: useCaseTypeEnum, required: true},
24
- maximumPageSize: {type: Number, required: true},
19
+ filteringEnabled: {type: Boolean, default: false},
20
+ applicationLoggingEnabled: {type: Boolean, default: false}, //Local logging on the device
21
+ useCaseType : {type: String, enum: useCaseTypeEnum, default: "Default"},
22
+ maximumPageSize: {type: Number},
25
23
  enableAlarmClock: {type: Boolean, default: false}
26
24
  }, {
27
25
  _id: false
@@ -28,20 +28,19 @@ let IosSchema = new mongoose.Schema({
28
28
  beaconReevaluationDistance : {type: Number, required: true},
29
29
  beaconActivationCoefficient : {type: Number, required: true},
30
30
  beaconActivationDistance : {type: Number, required: true},
31
- periodicPollingEnabled : {type: Boolean, required: true},
31
+ periodicPollingEnabled : {type: Boolean, default: true},
32
32
  triggeringOnPollingLocationBasicThreshold : {type: Number, required: true},
33
33
  triggeringOnPollingLocationFurtherThreshold : {type: Number, required: true},
34
34
  triggeringOnPollingLocationFarthestThreshold : {type: Number, required: true},
35
35
  focalDistanceAccuracyCoefficient : {type: Number, required: true},
36
- endpointUrl : {type: String, required: true, validate: {validator: validators.validateUrl, msg: 'endpoint Url is required'}},
37
36
  filteringEnabled : {type: Boolean, required: true},
38
- applicationLoggingEnabled : {type: Boolean, required: true},
39
- useCaseType : {type: String, enum: useCaseTypeEnum, required: true},
40
- telemetry: telemetrySchema,
37
+ applicationLoggingEnabled : {type: Boolean, default: false},
38
+ useCaseType : {type: String, enum: useCaseTypeEnum, default: "Default"},
41
39
  accuracySuppression: accuracySuppressionSchema,
42
40
  starvationDetector: starvationDetectionSchema,
43
- triggerEngine: {type: String, enum: triggerEngineEnum, required: true},
44
- disableBackgroundLocation: {type: String, enum: disableBackgroundLocationEnum, required: true}
41
+ triggerEngine: {type: String, enum: triggerEngineEnum, default: "BD"},
42
+ disableBackgroundLocation: {type: String, enum: disableBackgroundLocationEnum, default: "None"},
43
+ maximumPageSize: {type: Number}
45
44
  }, {
46
45
  _id: false
47
46
  })
@@ -0,0 +1,10 @@
1
+ let mongoose = require('mongoose')
2
+ let helpers = require('../helpers')
3
+
4
+ let ZoneEtaSchema = new mongoose.Schema({
5
+ destinationId: {type: String, validate: { validator: helpers.validateEtaDestinationId, msg: 'destinationId must be no more than 128 characters long' }}
6
+ }, {
7
+ _id: false
8
+ })
9
+
10
+ module.exports = ZoneEtaSchema