@bluedot-innovation/models 5.1.2 → 5.1.3-alpha.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,9 +1,3 @@
1
- ## 5.1.2
2
- - Remove Accuracy required validation
3
-
4
- ## 5.1.1
5
- - Added ProjectPermisisons as required
6
-
7
1
  ## 5.0.4
8
2
  - Removed value 'configurationChanged' from typeEnum from Webhook schema
9
3
 
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["name", "northEast", "southWest"]
2
+ "requiredFields":["name", "northEast", "southWest", "accuracy"]
3
3
  }
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["name", "radius", "center"]
2
+ "requiredFields":["name", "radius", "center", "accuracy"]
3
3
  }
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["type", "name", "vertices"]
2
+ "requiredFields":["type", "name", "vertices", "accuracy"]
3
3
  }
@@ -1,3 +1,3 @@
1
1
  {
2
- "requiredFields":["type", "name", "vertices"]
2
+ "requiredFields":["type", "name", "vertices", "accuracy"]
3
3
  }
@@ -1,5 +1,5 @@
1
1
  module.exports = {
2
- requiredFields: ['username', 'firstName', 'lastName', 'isAdmin', 'accountId', 'projectPermissions'],
2
+ requiredFields: ['username', 'firstName', 'lastName', 'isAdmin', 'accountId'],
3
3
  customValidators: [
4
4
  {name: 'phoneNumber', invalidInputs: ['409203492039284232034398']},
5
5
  {name: 'creationTime', invalidInputs: ['21/07/2017', 'thursday']},
@@ -116,17 +116,6 @@ 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
-
130
119
  it('should fail if permissionLevel is missing', (done) => {
131
120
  user = JSON.parse(JSON.stringify(user))
132
121
  user.projectPermissions[0].permissionLevel = undefined
package/models/Account.js CHANGED
@@ -7,7 +7,7 @@ let mongoose = require('mongoose')
7
7
  // let Schema = mongoose.Schema
8
8
  let StateEnum = require('@bluedot-innovation/enums').StateEnum
9
9
  let uuidv4 = require('uuid/v4')
10
- let patcher = require('mongoose-json-patch')
10
+ let patcher = require('@bluedot-innovation/mongoose-json-patch')
11
11
  const helpers = require('../helpers')
12
12
 
13
13
  let AccountSchema = new mongoose.Schema({
package/models/Beacon.js CHANGED
@@ -1,6 +1,6 @@
1
1
  const { BeaconEnum, StateEnum } = require('@bluedot-innovation/enums')
2
2
  const PointGeometry = require('../schemas/PointGeometry')
3
- const patcher = require('mongoose-json-patch')
3
+ const patcher = require('@bluedot-innovation/mongoose-json-patch')
4
4
  const Point = require('../schemas/Point')
5
5
  const mongoose = require('mongoose')
6
6
  const uuidv4 = require('uuid/v4')
package/models/Project.js CHANGED
@@ -8,7 +8,7 @@ let mongoose = require('mongoose')
8
8
  let Schema = mongoose.Schema
9
9
  let StateEnum = require('@bluedot-innovation/enums').StateEnum
10
10
  let uuidv4 = require('uuid/v4')
11
- let patcher = require('mongoose-json-patch')
11
+ let patcher = require('@bluedot-innovation/mongoose-json-patch')
12
12
  let helpers = require('../helpers')
13
13
 
14
14
  let WebhookSchema = require('../schemas/Webhook')
package/models/User.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  const StateEnum = require('@bluedot-innovation/enums').StateEnum
7
7
  const mongoose = require('mongoose')
8
- const patcher = require('mongoose-json-patch')
8
+ const patcher = require('@bluedot-innovation/mongoose-json-patch')
9
9
  const helpers = require('../helpers')
10
10
  const ProjectPermission = require('../schemas/ProjectPermission')
11
11
  const uuidv4 = require('uuid/v4')
@@ -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: {type: [ProjectPermission], required: [true, 'ProjectPermissions is required']},
37
+ projectPermissions: [ProjectPermission],
38
38
  accountId: {
39
39
  type: String,
40
40
  required: true,
package/models/Zone.js CHANGED
@@ -23,7 +23,7 @@ let travelPathRawSchema = require('./conditions/TravelPath').rawSchema
23
23
  let timeActiveRawSchema = require('./conditions/TimeActive').rawSchema
24
24
 
25
25
  let uuidv4 = require('uuid/v4')
26
- let patcher = require('mongoose-json-patch')
26
+ let patcher = require('@bluedot-innovation/mongoose-json-patch')
27
27
  let helpers = require('../helpers')
28
28
 
29
29
  // ////// //
@@ -9,7 +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, enum: Object.values(ZoneEnum.fenceAccuracy)},
12
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
13
13
  northEast: {type: Point, required: [true, 'northEast is required.']},
14
14
  southWest: {
15
15
  type: Point, required: [true, 'southWest is required.'],
@@ -8,7 +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, enum: Object.values(ZoneEnum.fenceAccuracy)},
11
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
12
12
  radius: {type: Number, required: [true, 'radius is required. '], min: 5},
13
13
  center: {type: Point, required: [true, 'center is required. ']}
14
14
  }
@@ -7,7 +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, default: ZoneEnum.fenceAccuracy.HIGH},
10
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
11
11
  vertices: {type: [Point], required: [true, 'vertices are required. ']}
12
12
  }
13
13
 
@@ -11,7 +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, enum: Object.values(ZoneEnum.fenceAccuracy)},
14
+ accuracy: {type: String, required: [true, 'accuracy is required'], enum: Object.values(ZoneEnum.fenceAccuracy)},
15
15
  vertices: {
16
16
  type: [Point], required: [true, 'vertices is required.'],
17
17
  validate: [{
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "5.1.2",
3
+ "version": "5.1.3-alpha.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",
@@ -29,11 +29,11 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "@bluedot-innovation/enums": "2.1.4",
32
+ "@bluedot-innovation/mongoose-json-patch": "0.0.4",
32
33
  "deep-equal": "^1.0.1",
33
34
  "fast-deep-equal": "^2.0.1",
34
35
  "lodash.clonedeep": "4.5.0",
35
36
  "mongoose": "^4.13.9",
36
- "mongoose-json-patch": "^1.1.1",
37
37
  "uuid": "^3.1.0"
38
38
  }
39
39
  }