@bluedot-innovation/models 5.1.0 → 5.1.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 +6 -0
- package/__tests__/geofeature/boundingBox/boundingBox.rules.json +1 -1
- package/__tests__/geofeature/circle/circle.rules.json +1 -1
- package/__tests__/geofeature/geoline/geoline.rules.json +1 -1
- package/__tests__/geofeature/polygon/polygon.rules.json +1 -1
- package/__tests__/user/user.rules.js +1 -1
- package/__tests__/user/user.spec.js +11 -0
- package/models/User.js +1 -1
- package/models/geofeatures/BoundingBox.js +1 -1
- package/models/geofeatures/Circle.js +1 -1
- package/models/geofeatures/Geoline.js +1 -1
- package/models/geofeatures/Polygon.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -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
|
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,
|
|
@@ -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,
|
|
12
|
+
accuracy: {type: String, 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,
|
|
11
|
+
accuracy: {type: String, 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,
|
|
10
|
+
accuracy: {type: String, default: ZoneEnum.fenceAccuracy.HIGH},
|
|
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,
|
|
14
|
+
accuracy: {type: String, enum: Object.values(ZoneEnum.fenceAccuracy)},
|
|
15
15
|
vertices: {
|
|
16
16
|
type: [Point], required: [true, 'vertices is required.'],
|
|
17
17
|
validate: [{
|
package/package.json
CHANGED