@bluedot-innovation/models 5.0.3 → 5.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,11 @@
1
+ ## 5.1.1
2
+ - Added ProjectPermisisons as required
3
+
4
+ ## 5.0.4
5
+ - Removed value 'configurationChanged' from typeEnum from Webhook schema
6
+
7
+ ## 5.1.0
8
+ - Added field `accuracy` to all geofences models (BoundingBox, Circle, Geoline and Polygon)
1
9
 
2
10
  ## 5.0.3
3
11
  - Update Project nextRuleUpdateInterval minimum to 300
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["name", "northEast", "southWest"]
2
+ "requiredFields":["name", "northEast", "southWest", "accuracy"]
3
3
  }
@@ -1,4 +1,5 @@
1
1
  let mongoose = require('mongoose')
2
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
2
3
 
3
4
  mongoose.Promise = global.Promise
4
5
 
@@ -18,6 +19,7 @@ let boundingBox
18
19
 
19
20
  beforeEach(() => {
20
21
  boundingBox = JSON.parse(JSON.stringify(require('./boundingBox.data.json')))
22
+ boundingBox.accuracy = ZoneEnum.fenceAccuracy.LOW
21
23
  })
22
24
 
23
25
  describe('BoundingBox', () => {
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["name", "radius", "center"]
2
+ "requiredFields":["name", "radius", "center", "accuracy"]
3
3
  }
@@ -1,4 +1,5 @@
1
1
  let mongoose = require('mongoose')
2
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
2
3
 
3
4
  mongoose.Promise = global.Promise
4
5
 
@@ -17,6 +18,7 @@ let circle
17
18
 
18
19
  beforeEach(() => {
19
20
  circle = JSON.parse(JSON.stringify(require('./circle.data.json')))
21
+ circle.accuracy = ZoneEnum.fenceAccuracy.LOW
20
22
  })
21
23
 
22
24
  testCase('Circle', () => {
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["type", "name", "vertices"]
2
+ "requiredFields":["type", "name", "vertices", "accuracy"]
3
3
  }
@@ -1,4 +1,5 @@
1
1
  let mongoose = require('mongoose')
2
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
2
3
 
3
4
  mongoose.Promise = global.Promise
4
5
 
@@ -18,6 +19,7 @@ let geoline
18
19
 
19
20
  beforeEach(() => {
20
21
  geoline = JSON.parse(JSON.stringify(require('./geoline.data.json')))
22
+ geoline.accuracy = ZoneEnum.fenceAccuracy.LOW
21
23
  })
22
24
  testCase('Geoline', () => {
23
25
  testCase('Valid Geoline', () => {
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["type", "name", "vertices"]
2
+ "requiredFields":["type", "name", "vertices", "accuracy"]
3
3
  }
@@ -2,6 +2,7 @@ let mongoose = require('mongoose')
2
2
  mongoose.Promise = global.Promise
3
3
  let PolygonModel = require('../../../Models').Polygon(mongoose)
4
4
  let PolygonModelBuiltInMongoose = require('../../../Models').Polygon()
5
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
5
6
  const { VERTICES_TOO_CLOSE, CANT_HAVE_THREE_OR_MORE_VERTICES } = require('../../../constants/errorMessages')
6
7
  let rules = require('./polygon.rules.json')
7
8
  let chai = require('chai')
@@ -12,6 +13,7 @@ let polygon
12
13
 
13
14
  beforeEach(() => {
14
15
  polygon = JSON.parse(JSON.stringify(require('./polygon.data.json')))
16
+ polygon.accuracy = ZoneEnum.fenceAccuracy.LOW
15
17
  })
16
18
 
17
19
  describe('Polygon', () => {
@@ -1,5 +1,5 @@
1
1
  module.exports = {
2
- requiredFields: ['username', 'firstName', 'lastName', 'isAdmin', 'accountId'],
2
+ requiredFields: ['username', 'firstName', 'lastName', 'isAdmin', 'accountId', 'projectPermissions'],
3
3
  customValidators: [
4
4
  {name: 'phoneNumber', invalidInputs: ['409203492039284232034398']},
5
5
  {name: 'creationTime', invalidInputs: ['21/07/2017', 'thursday']},
@@ -116,6 +116,17 @@ describe('User', () => {
116
116
  })
117
117
  })
118
118
 
119
+ it('should fail if projectPermissions is not provided', (done) => {
120
+ user = JSON.parse(JSON.stringify(user))
121
+ delete user.projectPermissions
122
+ const User = new UserModel(user)
123
+
124
+ User.validate((err, res) => {
125
+ assert.match(err, /(ProjectPermissions is required)/i)
126
+ done()
127
+ })
128
+ })
129
+
119
130
  it('should fail if permissionLevel is missing', (done) => {
120
131
  user = JSON.parse(JSON.stringify(user))
121
132
  user.projectPermissions[0].permissionLevel = undefined
@@ -47,6 +47,7 @@
47
47
  },{
48
48
  "type": "circle",
49
49
  "name": "Test Circle",
50
+ "accuracy": "high",
50
51
  "radius": 10,
51
52
  "center": {
52
53
  "latitude": -37.8159544565362,
@@ -55,6 +56,7 @@
55
56
  },{
56
57
  "type": "boundingBox",
57
58
  "name": "Test BoundingBox",
59
+ "accuracy": "low",
58
60
  "northEast": {
59
61
  "latitude": -37.81794619852986,
60
62
  "longitude": 144.97999548912048
@@ -66,6 +68,7 @@
66
68
  },{
67
69
  "type": "polygon",
68
70
  "name": "Test Polygon",
71
+ "accuracy": "low",
69
72
  "vertices": [
70
73
  {
71
74
  "latitude": -37.81902680201739,
@@ -111,6 +114,7 @@
111
114
  },{
112
115
  "type": "geoline",
113
116
  "name": "Test Geoline",
117
+ "accuracy": "low",
114
118
  "vertices": [
115
119
  {
116
120
  "latitude": -37.81902680201739,
package/models/User.js CHANGED
@@ -34,7 +34,7 @@ let UserSchema = new mongoose.Schema({
34
34
  lastUpdateTime: {type: Date, default: Date.now},
35
35
  isAdmin: {type: Boolean, required: true},
36
36
  secret: String,
37
- projectPermissions: [ProjectPermission],
37
+ projectPermissions: {type: [ProjectPermission], required: [true, 'ProjectPermissions is required']},
38
38
  accountId: {
39
39
  type: String,
40
40
  required: true,
@@ -1,5 +1,5 @@
1
1
  let mongoose = require('mongoose')
2
- let StateEnum = require('@bluedot-innovation/enums').StateEnum
2
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
3
3
  let uuidv4 = require('uuid/v4')
4
4
  let Point = require('../../schemas/Point')
5
5
  let helpers = require('../../helpers')
@@ -9,6 +9,7 @@ const schema = {
9
9
  geometry: {type: {}},
10
10
  name: {type: String, required: [true, 'name is required.']},
11
11
  color: String,
12
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
12
13
  northEast: {type: Point, required: [true, 'northEast is required.']},
13
14
  southWest: {
14
15
  type: Point, required: [true, 'southWest is required.'],
@@ -1,5 +1,5 @@
1
1
  let mongoose = require('mongoose')
2
- let StateEnum = require('@bluedot-innovation/enums').StateEnum
2
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
3
3
  let Point = require('../../schemas/Point')
4
4
  let uuidv4 = require('uuid/v4')
5
5
 
@@ -8,6 +8,7 @@ let schema = {
8
8
  geometry: {type: {}},
9
9
  name: {type: String, required: [true, 'name is required. ']},
10
10
  color: String,
11
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
11
12
  radius: {type: Number, required: [true, 'radius is required. '], min: 5},
12
13
  center: {type: Point, required: [true, 'center is required. ']}
13
14
  }
@@ -1,5 +1,5 @@
1
1
  let mongoose = require('mongoose')
2
- let StateEnum = require('@bluedot-innovation/enums').StateEnum
2
+ let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
3
3
  let Point = require('../../schemas/Point')
4
4
  let uuidv4 = require('uuid/v4')
5
5
 
@@ -7,6 +7,7 @@ const schema = {
7
7
  _id: {type: String, default: uuidv4},
8
8
  geometry: {type: {}},
9
9
  name: {type: String, required: [true, 'name is required. ']},
10
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
10
11
  vertices: {type: [Point], required: [true, 'vertices are required. ']}
11
12
  }
12
13
 
@@ -1,5 +1,5 @@
1
1
  const mongoose = require('mongoose')
2
- const StateEnum = require('@bluedot-innovation/enums').StateEnum
2
+ const ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
3
3
  const Point = require('../../schemas/Point')
4
4
  const uuidv4 = require('uuid/v4')
5
5
  const checkDistanceBetweenVertices = require('../../validators/checkDistanceBetweenVertices')
@@ -11,6 +11,7 @@ const schema = {
11
11
  geometry: {type: {}},
12
12
  name: {type: String, required: [true, 'name is required.']},
13
13
  color: String,
14
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
14
15
  vertices: {
15
16
  type: [Point], required: [true, 'vertices is required.'],
16
17
  validate: [{
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "5.0.3",
3
+ "version": "5.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",
@@ -28,7 +28,7 @@
28
28
  "sinon": "^4.1.2"
29
29
  },
30
30
  "dependencies": {
31
- "@bluedot-innovation/enums": "2.1.1",
31
+ "@bluedot-innovation/enums": "2.1.4",
32
32
  "deep-equal": "^1.0.1",
33
33
  "fast-deep-equal": "^2.0.1",
34
34
  "lodash.clonedeep": "4.5.0",
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
2
2
  let validators = require('../utils/validators')
3
3
 
4
4
  let typeEnum = {
5
- values: ['trigger', 'configurationChanged'],
5
+ values: ['trigger'],
6
6
  message: 'enum validator failed for path `{PATH}` with value `{VALUE}`'
7
7
  }
8
8