@bluedot-innovation/models 2.0.0-beta.8 → 2.0.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/.gitlab-ci.yml +1 -1
- package/CHANGELOG.md +12 -0
- package/Models.js +2 -0
- package/__tests__/{geofeature/beacon → beacon}/beacon.data.json +3 -2
- package/__tests__/{geofeature/beacon → beacon}/beacon.spec.js +1 -1
- package/__tests__/ruleRequestAggregation/ruleRequestAggregation.data.json +1 -1
- package/__tests__/ruleRequestAggregation/ruleRequestAggregation.spec.js +3 -3
- package/__tests__/user/user.data.js +13 -0
- package/__tests__/user/user.rules.js +8 -0
- package/__tests__/user/user.spec.js +83 -0
- package/__tests__/zone/zone.data.json +3 -1
- package/helpers.js +5 -0
- package/models/Account.js +0 -1
- package/models/Beacon.js +7 -9
- package/models/RuleRequestAggregation.js +1 -1
- package/models/User.js +59 -0
- package/models/Zone.js +4 -0
- package/package.json +1 -1
- package/models/AdminUser.js +0 -11
- package/models/Customer.js +0 -38
- /package/__tests__/{geofeature/beacon → beacon}/beacon.rules.json +0 -0
package/.gitlab-ci.yml
CHANGED
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
## 2.0.1
|
|
2
|
+
- Beacon model: guid -> id
|
|
3
|
+
|
|
4
|
+
## 2.0.0-beta.14
|
|
5
|
+
- Beacon model: Removed console.debug breaking lambda execution
|
|
6
|
+
|
|
7
|
+
## 2.0.0-beta.13
|
|
8
|
+
- Beacon model: Added accountId
|
|
9
|
+
- Zone model: Added beacons
|
|
10
|
+
|
|
11
|
+
## 2.0.0-beta.12
|
|
12
|
+
- User model: `emailAddress` changed to `email`
|
package/Models.js
CHANGED
|
@@ -18,6 +18,7 @@ Models.Polyline = require('./models/Polyline').Model
|
|
|
18
18
|
Models.SpeedFilter = require('./models/SpeedFilter').Model
|
|
19
19
|
Models.TimeOfDayRangeFilter = require('./models/TimeOfDayRangeFilter').Model
|
|
20
20
|
Models.UrlAction = require('./models/UrlAction').Model
|
|
21
|
+
Models.User = require('./models/User').Model
|
|
21
22
|
Models.Zone = require('./models/Zone').Model
|
|
22
23
|
Models.Project = require('./models/Project').Model
|
|
23
24
|
Models.Project = require('./models/Project').Model
|
|
@@ -40,6 +41,7 @@ Schemas.Polyline = require('./models/Polyline').Schema
|
|
|
40
41
|
Schemas.SpeedFilter = require('./models/SpeedFilter').Schema
|
|
41
42
|
Schemas.TimeOfDayRangeFilter = require('./models/TimeOfDayRangeFilter').Schema
|
|
42
43
|
Schemas.UrlAction = require('./models/UrlAction').Schema
|
|
44
|
+
Schemas.User = require('./models/User').Schema
|
|
43
45
|
Schemas.Zone = require('./models/Zone').Schema
|
|
44
46
|
Schemas.Project = require('./models/Project').Schema
|
|
45
47
|
Schemas.MonthlyStat = require('./models/MonthlyStats').Schema
|
|
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
|
|
|
2
2
|
|
|
3
3
|
mongoose.Promise = global.Promise
|
|
4
4
|
|
|
5
|
-
let BeaconModel = require('
|
|
5
|
+
let BeaconModel = require('../../Models').Beacon(mongoose)
|
|
6
6
|
let testCase = require('mocha').describe
|
|
7
7
|
let assertions = require('mocha').it
|
|
8
8
|
let chai = require('chai')
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_id" : "bf93ddd2-e7e9-4a89-9bcb-0b2164c17e45",
|
|
3
|
-
"
|
|
3
|
+
"applicationId" : "fd150b63-08dc-4114-aaf9-359cef30def6",
|
|
4
4
|
"customerId" : "f944c7e9-63cc-4c0a-8ad3-acf3c30415fc",
|
|
5
5
|
"iosCount" : 9,
|
|
6
6
|
"androidCount" : 0,
|
|
@@ -36,11 +36,11 @@ testCase('RuleRequestAggregation', () => {
|
|
|
36
36
|
done()
|
|
37
37
|
})
|
|
38
38
|
})
|
|
39
|
-
assertions('should not accept a invalid
|
|
40
|
-
ruleRequestAggregation.
|
|
39
|
+
assertions('should not accept a invalid applicationId', (done) => {
|
|
40
|
+
ruleRequestAggregation.applicationId = 'invalid-applicationId'
|
|
41
41
|
let RuleRequestAggregation = new RuleRequestAggregationModel(ruleRequestAggregation)
|
|
42
42
|
RuleRequestAggregation.validate((err, res) => {
|
|
43
|
-
assert.exists(err, 'invalid
|
|
43
|
+
assert.exists(err, 'invalid applicationId')
|
|
44
44
|
assert.isObject(err)
|
|
45
45
|
done()
|
|
46
46
|
})
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
username: 'test@bluedot.io',
|
|
3
|
+
email: 'test@bluedot.io',
|
|
4
|
+
password: 'jfmamjasond',
|
|
5
|
+
firstName: 'John',
|
|
6
|
+
lastName: 'Citizen',
|
|
7
|
+
phoneNumber: '23429384',
|
|
8
|
+
state: 'ACTIVE',
|
|
9
|
+
lastUpdateTime: '2018-02-14T04:12:02.103Z',
|
|
10
|
+
creationTime: '2018-02-14T04:12:02.103Z',
|
|
11
|
+
isAdmin: true,
|
|
12
|
+
accountId: '37ac5be3-60ec-4fb7-9f88-a4f6e8895f81'
|
|
13
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
requiredFields: ['username', 'password', 'firstName', 'lastName', 'isAdmin', 'accountId'],
|
|
3
|
+
customValidators: [
|
|
4
|
+
{name: 'phoneNumber', invalidInputs: ['409203492039284232034398']},
|
|
5
|
+
{name: 'creationTime', invalidInputs: ['21/07/2017', 'thursday']},
|
|
6
|
+
{name: 'lastUpdateTime', invalidInputs: ['21/07/2017', 'saturday']}
|
|
7
|
+
]
|
|
8
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
let mongoose = require('mongoose')
|
|
2
|
+
|
|
3
|
+
let UserModel = require('../../Models').User(mongoose)
|
|
4
|
+
let UserModelBuiltInMongoose = require('../../Models').User()
|
|
5
|
+
let testCase = require('mocha').describe
|
|
6
|
+
let assertions = require('mocha').it
|
|
7
|
+
let rules = require('./user.rules.js')
|
|
8
|
+
let chai = require('chai')
|
|
9
|
+
let assert = chai.assert
|
|
10
|
+
let mocha = require('mocha')
|
|
11
|
+
let beforeEach = mocha.beforeEach
|
|
12
|
+
|
|
13
|
+
let user
|
|
14
|
+
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
user = require('./user.data.js')
|
|
17
|
+
})
|
|
18
|
+
|
|
19
|
+
testCase('User', () => {
|
|
20
|
+
testCase('Valid User ', () => {
|
|
21
|
+
assertions('should validate a valid user when initializing the model with an external mongoose instance', (done) => {
|
|
22
|
+
let User = new UserModel(user)
|
|
23
|
+
|
|
24
|
+
User.validate((err, res) => {
|
|
25
|
+
assert.notExists(res)
|
|
26
|
+
assert(err === null, 'err equals null')
|
|
27
|
+
done()
|
|
28
|
+
})
|
|
29
|
+
})
|
|
30
|
+
|
|
31
|
+
assertions('should validate a valid user', (done) => {
|
|
32
|
+
let User = new UserModelBuiltInMongoose(user)
|
|
33
|
+
|
|
34
|
+
User.validate((err, res) => {
|
|
35
|
+
assert.notExists(res)
|
|
36
|
+
assert(err === null, 'err equals null')
|
|
37
|
+
done()
|
|
38
|
+
})
|
|
39
|
+
})
|
|
40
|
+
})
|
|
41
|
+
|
|
42
|
+
testCase('Invalid User', () => {
|
|
43
|
+
testCase('recursive property check', () => {
|
|
44
|
+
let requiredFields = rules.requiredFields
|
|
45
|
+
requiredFields.forEach((requiredField) => {
|
|
46
|
+
assertions(`should throw an error with property '${requiredField}' if '${requiredField}' is not present`, (done) => {
|
|
47
|
+
user = JSON.parse(JSON.stringify(user))
|
|
48
|
+
delete user[requiredField]
|
|
49
|
+
let User = new UserModel(user)
|
|
50
|
+
User.validate((err, res) => {
|
|
51
|
+
assert.notExists(res)
|
|
52
|
+
assert.exists(err, 'err object should exist')
|
|
53
|
+
assert.isObject(err)
|
|
54
|
+
assert.nestedProperty(err, `errors.${requiredField}`, `error should have a ${requiredField} property`)
|
|
55
|
+
done()
|
|
56
|
+
})
|
|
57
|
+
})
|
|
58
|
+
})
|
|
59
|
+
})
|
|
60
|
+
})
|
|
61
|
+
|
|
62
|
+
testCase('recursive invalid entry check', () => {
|
|
63
|
+
const { customValidators } = rules
|
|
64
|
+
|
|
65
|
+
customValidators.forEach((customValidator) => {
|
|
66
|
+
customValidator.invalidInputs.forEach((invalidInput) => {
|
|
67
|
+
assertions(`should throw an error with property '${customValidator.name}' if '${customValidator.name}' is invalid => ${customValidator.name} = ${invalidInput}`, (done) => {
|
|
68
|
+
user = JSON.parse(JSON.stringify(user))
|
|
69
|
+
user[customValidator.name] = invalidInput
|
|
70
|
+
let User = new UserModel(user)
|
|
71
|
+
|
|
72
|
+
User.validate((err, res) => {
|
|
73
|
+
assert.notExists(res)
|
|
74
|
+
assert.exists(err, 'err object should exist')
|
|
75
|
+
assert.isObject(err)
|
|
76
|
+
assert.nestedProperty(err, `errors.${customValidator.name}`, `error should have a ${customValidator.name} property`)
|
|
77
|
+
done()
|
|
78
|
+
})
|
|
79
|
+
})
|
|
80
|
+
})
|
|
81
|
+
})
|
|
82
|
+
})
|
|
83
|
+
})
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
"url": "https://www.google.com"
|
|
25
25
|
}
|
|
26
26
|
],
|
|
27
|
+
"beacons": [],
|
|
27
28
|
"filters": [
|
|
28
29
|
{
|
|
29
30
|
"type" : "calendarDateRange",
|
|
@@ -42,7 +43,8 @@
|
|
|
42
43
|
"phone": 123123123123,
|
|
43
44
|
"minor": 56466,
|
|
44
45
|
"txPower": -77,
|
|
45
|
-
"macAddress": "01:17:c5:31:84:19"
|
|
46
|
+
"macAddress": "01:17:c5:31:84:19",
|
|
47
|
+
"accountId": "90a2ed18-86be-48e7-948b-393b8b679ef6"
|
|
46
48
|
},{
|
|
47
49
|
"type": "circle",
|
|
48
50
|
"name": "Test Circle",
|
package/helpers.js
CHANGED
|
@@ -6,4 +6,9 @@ helpers.validateUUIDv4 = function (id) {
|
|
|
6
6
|
return regex.test(id)
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
+
helpers.validateEmail = function (value) {
|
|
10
|
+
const regex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
|
|
11
|
+
return regex.test(value);
|
|
12
|
+
}
|
|
13
|
+
|
|
9
14
|
module.exports = helpers
|
package/models/Account.js
CHANGED
package/models/Beacon.js
CHANGED
|
@@ -4,7 +4,7 @@ let Point = require('../schemas/Point')
|
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
5
|
|
|
6
6
|
let schema = {
|
|
7
|
-
|
|
7
|
+
_id: {type: String, default: uuidv4},
|
|
8
8
|
name: {type: String, required: [true, 'name is required. ']},
|
|
9
9
|
longitude: {
|
|
10
10
|
type: Number,
|
|
@@ -34,19 +34,17 @@ let schema = {
|
|
|
34
34
|
}
|
|
35
35
|
},
|
|
36
36
|
location: {type: Point},
|
|
37
|
-
proximity: {type: String, default: 'Far'}
|
|
37
|
+
proximity: {type: String, default: 'Far'},
|
|
38
|
+
accountId: {
|
|
39
|
+
type: String, required: true
|
|
40
|
+
}
|
|
38
41
|
}
|
|
39
42
|
|
|
40
|
-
let BeaconSchema = new mongoose.Schema(schema)
|
|
41
|
-
|
|
42
|
-
BeaconSchema.add({
|
|
43
|
-
type:
|
|
44
|
-
{type: String, required: true}
|
|
45
|
-
})
|
|
43
|
+
let BeaconSchema = new mongoose.Schema(schema, {collection: 'beacon'})
|
|
46
44
|
|
|
47
45
|
// mongoose validator helper plugin
|
|
48
46
|
BeaconSchema.post('validate', function (doc) {
|
|
49
|
-
|
|
47
|
+
// Beacon Schema post validate hook
|
|
50
48
|
this.lastUpdateTime = Date.now()
|
|
51
49
|
Object.assign(this.errors || {}, this.errors || {}, this.customErrors)
|
|
52
50
|
})
|
|
@@ -9,7 +9,7 @@ const helpers = require('../helpers')
|
|
|
9
9
|
|
|
10
10
|
const schema = {
|
|
11
11
|
_id: { type: String, default: uuidv4 },
|
|
12
|
-
|
|
12
|
+
applicationId: {type: String, required: [true, 'applicationId is required'], validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'invalid applicationId'}},
|
|
13
13
|
customerId: {type: String, required: [true, 'customerId is required'], validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'invalid customerId'}},
|
|
14
14
|
iosCount: {type: Number, required: [true, 'iosCount is required'], min: 0},
|
|
15
15
|
androidCount: {type: Number, required: [true, 'androidCount is required'], min: 0},
|
package/models/User.js
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Created by Richard Tan on 27/02/18.
|
|
3
|
+
* Copyright : Bluedot Innovation.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
7
|
+
let mongoose = require('mongoose')
|
|
8
|
+
let patcher = require('mongoose-json-patch')
|
|
9
|
+
const helpers = require('../helpers')
|
|
10
|
+
|
|
11
|
+
let UserSchema = new mongoose.Schema({
|
|
12
|
+
username: {
|
|
13
|
+
type: String,
|
|
14
|
+
required: true,
|
|
15
|
+
maxlength: 100,
|
|
16
|
+
unique: true
|
|
17
|
+
},
|
|
18
|
+
email: {
|
|
19
|
+
type: String,
|
|
20
|
+
required: true,
|
|
21
|
+
validate: {
|
|
22
|
+
validator: helpers.validateEmail,
|
|
23
|
+
message: '{VALUE} is not a valid email'
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
password: {type: String, required: true},
|
|
27
|
+
firstName: {type: String, required: true},
|
|
28
|
+
lastName: {type: String, required: true},
|
|
29
|
+
phoneNumber: {type: String, maxlength: 20},
|
|
30
|
+
state: {type: String, default: StateEnum.active},
|
|
31
|
+
creationTime: {type: Date, default: Date.now},
|
|
32
|
+
lastUpdateTime: {type: Date, default: Date.now},
|
|
33
|
+
isAdmin: {type: Boolean, required: true},
|
|
34
|
+
secret: String,
|
|
35
|
+
projectPermissions: Array,
|
|
36
|
+
accountId: {
|
|
37
|
+
type: String,
|
|
38
|
+
required: true,
|
|
39
|
+
validator: helpers.validateUUIDv4
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
{collection: 'user'})
|
|
43
|
+
|
|
44
|
+
UserSchema.plugin(patcher)
|
|
45
|
+
|
|
46
|
+
// optional mongoose
|
|
47
|
+
let model = (mongooseInstance) => {
|
|
48
|
+
let User
|
|
49
|
+
if (mongooseInstance) {
|
|
50
|
+
User = mongooseInstance.model('User', UserSchema)
|
|
51
|
+
} else {
|
|
52
|
+
User = mongoose.model('User', UserSchema)
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return User
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
59
|
+
module.exports = { Model: model, Schema: UserSchema }
|
package/models/Zone.js
CHANGED
|
@@ -58,6 +58,10 @@ let ZoneSchema = new Schema({
|
|
|
58
58
|
type: [geofeatureSchema],
|
|
59
59
|
required: true
|
|
60
60
|
},
|
|
61
|
+
beacons: {
|
|
62
|
+
type: [beaconSchema],
|
|
63
|
+
default: []
|
|
64
|
+
},
|
|
61
65
|
customData: [{type: Schema.Types.Mixed}],
|
|
62
66
|
description: {type: String, default: ''},
|
|
63
67
|
creationTime: {type: Date, required: [true, 'creationTime is required'], select: false},
|
package/package.json
CHANGED
package/models/AdminUser.js
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Created by Arun on 10/09/2014.
|
|
3
|
-
* Copyright : Bluedot Innovations.
|
|
4
|
-
* Owner :
|
|
5
|
-
*/
|
|
6
|
-
let mongoose = require('mongoose')
|
|
7
|
-
let AdminUser = mongoose.model('AdminUser', new mongoose.Schema({},
|
|
8
|
-
{ collection: 'AdminUser' }
|
|
9
|
-
))
|
|
10
|
-
|
|
11
|
-
module.exports = AdminUser
|
package/models/Customer.js
DELETED
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Created by Arun on 10/09/2014.
|
|
3
|
-
* Copyright : Bluedot Innovations.
|
|
4
|
-
* Owner :
|
|
5
|
-
*/
|
|
6
|
-
let mongoose = require('mongoose')
|
|
7
|
-
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
8
|
-
let Schema = mongoose.Schema
|
|
9
|
-
|
|
10
|
-
let Customer = mongoose.model('Customer', new mongoose.Schema(
|
|
11
|
-
{
|
|
12
|
-
_id: String,
|
|
13
|
-
customerApiKey: String,
|
|
14
|
-
email: String,
|
|
15
|
-
password: String,
|
|
16
|
-
name: String,
|
|
17
|
-
userName: String,
|
|
18
|
-
state: {type: String, default: StateEnum.active},
|
|
19
|
-
'creationTime': {type: Date, default: Date.now},
|
|
20
|
-
'lastUpdateTime': {type: Date, default: Date.now},
|
|
21
|
-
'dataSource': {type: String, select: false, default: 'openApi'},
|
|
22
|
-
integrations: Schema.Types.Mixed,
|
|
23
|
-
firstName: String,
|
|
24
|
-
lastName: String,
|
|
25
|
-
oldPassword: String,
|
|
26
|
-
organisationWebsite: String,
|
|
27
|
-
organisationName: String,
|
|
28
|
-
phoneNumber: String,
|
|
29
|
-
createdBy: String,
|
|
30
|
-
poiCredits: {type: Number, default: 0},
|
|
31
|
-
address: []
|
|
32
|
-
},
|
|
33
|
-
{
|
|
34
|
-
collection: 'customer'
|
|
35
|
-
})
|
|
36
|
-
)
|
|
37
|
-
|
|
38
|
-
module.exports = Customer
|
|
File without changes
|