@bluedot-innovation/models 5.1.12 → 5.1.14
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 +10 -0
- package/helpers.js +1 -1
- package/models/Account.js +1 -1
- package/models/AdminPortalUser.js +1 -1
- package/models/Beacon.js +3 -2
- package/models/CustomerLogin.js +1 -1
- package/models/PartnerCustomer.js +1 -1
- package/models/PartnerUser.js +1 -1
- package/models/User.js +1 -1
- package/models/Zone.js +1 -1
- package/models/ZoneUIState.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
## 5.1.14
|
|
2
|
+
- Validate Mac address against 64-bit Mac Address format
|
|
3
|
+
|
|
4
|
+
## 5.1.13
|
|
5
|
+
- Fixed default value from active to ACTIVE
|
|
6
|
+
|
|
7
|
+
## 5.1.12
|
|
8
|
+
- Validate proximityUUID against UUIDv4 format
|
|
9
|
+
- Separate error messages of ProximityUUID and Mac Address
|
|
10
|
+
|
|
1
11
|
## 5.1.11
|
|
2
12
|
- Remove reference to package name in TestScenario
|
|
3
13
|
|
package/helpers.js
CHANGED
|
@@ -169,7 +169,7 @@ helpers.validateNotNull = function(value) {
|
|
|
169
169
|
}
|
|
170
170
|
|
|
171
171
|
helpers.isValidMacAddress = function (value){
|
|
172
|
-
return /^([0-9a-f]{1,2}[
|
|
172
|
+
return /^([0-9a-f]{1,2}[\:]){5}([0-9a-f]{1,2})$/i.test(value);
|
|
173
173
|
}
|
|
174
174
|
|
|
175
175
|
const isValidObject = data => {
|
package/models/Account.js
CHANGED
|
@@ -23,7 +23,7 @@ let AccountSchema = new mongoose.Schema({
|
|
|
23
23
|
// the createdBy will be.
|
|
24
24
|
default: uuidv4
|
|
25
25
|
},
|
|
26
|
-
state: {type: String, default: StateEnum.
|
|
26
|
+
state: {type: String, default: StateEnum.ACTIVE},
|
|
27
27
|
poiCredits: Number,
|
|
28
28
|
integrations: Object,
|
|
29
29
|
features: Object,
|
|
@@ -11,7 +11,7 @@ let AdminPortalUser = mongoose.model('AdminPortalUser', new mongoose.Schema(
|
|
|
11
11
|
password: String,
|
|
12
12
|
firstName: String,
|
|
13
13
|
lastName: String,
|
|
14
|
-
state: {type: String, default: Enums.StateEnum.
|
|
14
|
+
state: {type: String, default: Enums.StateEnum.ACTIVE},
|
|
15
15
|
'creationTime': {type: Date, default: Date.now},
|
|
16
16
|
'dataSource': {type: String, select: false, default: 'AdminPortal'},
|
|
17
17
|
adminId: String,
|
package/models/Beacon.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
const
|
|
1
|
+
const BeaconEnum = require('@bluedot-innovation/enums').BeaconEnum
|
|
2
2
|
const PointGeometry = require('../schemas/PointGeometry')
|
|
3
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')
|
|
7
7
|
const helpers = require('../helpers')
|
|
8
|
+
const StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
8
9
|
|
|
9
10
|
function validateMacAddress(beaconType, macAddress) {
|
|
10
11
|
if(isRequiredForAndroid(beaconType)){
|
|
@@ -36,7 +37,7 @@ let schema = {
|
|
|
36
37
|
description: {type: String, default: '', require: true},
|
|
37
38
|
creationTime: {type: Date, default: Date.now},
|
|
38
39
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
39
|
-
state: {type: String, default: StateEnum.
|
|
40
|
+
state: {type: String, default: StateEnum.ACTIVE},
|
|
40
41
|
beaconType: {
|
|
41
42
|
type: String,
|
|
42
43
|
required: true,
|
package/models/CustomerLogin.js
CHANGED
|
@@ -19,7 +19,7 @@ var CustomerLogin = mongoose.model('CustomerLogin', new mongoose.Schema(
|
|
|
19
19
|
integrations: {},
|
|
20
20
|
resetToken: String,
|
|
21
21
|
lastLoginTime: Date,
|
|
22
|
-
state: {type: String, default: StateEnum.
|
|
22
|
+
state: {type: String, default: StateEnum.ACTIVE},
|
|
23
23
|
creationTime: {type: Date, default: Date.now},
|
|
24
24
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
25
25
|
createdBy: String,
|
|
@@ -21,7 +21,7 @@ let PartnerCustomer = mongoose.model('PartnerCustomer', new mongoose.Schema(
|
|
|
21
21
|
isUsingGeofencing: Boolean,
|
|
22
22
|
additionalComments: String,
|
|
23
23
|
referredBy: mongoose.Schema.Types.ObjectId,
|
|
24
|
-
state: {type: String, default: StateEnum.
|
|
24
|
+
state: {type: String, default: StateEnum.ACTIVE},
|
|
25
25
|
'creationTime': {type: Date, default: Date.now},
|
|
26
26
|
'dataSource': {type: String, select: false, default: 'PartnerPortal'},
|
|
27
27
|
partnerId: String
|
package/models/PartnerUser.js
CHANGED
|
@@ -16,7 +16,7 @@ let PartnerUser = mongoose.model('PartnerUser', new mongoose.Schema(
|
|
|
16
16
|
approvalToken: String,
|
|
17
17
|
phoneNumber: String,
|
|
18
18
|
partnerCompany: String,
|
|
19
|
-
state: {type: String, default: StateEnum.
|
|
19
|
+
state: {type: String, default: StateEnum.ACTIVE},
|
|
20
20
|
'creationTime': {type: Date, default: Date.now},
|
|
21
21
|
'dataSource': {type: String, select: false, default: 'PartnerPortal'},
|
|
22
22
|
partnerId: String
|
package/models/User.js
CHANGED
|
@@ -29,7 +29,7 @@ let UserSchema = new mongoose.Schema({
|
|
|
29
29
|
firstName: {type: String, required: true},
|
|
30
30
|
lastName: {type: String, required: true},
|
|
31
31
|
phoneNumber: {type: String, maxlength: 20, validate: helpers.validateNotNull},
|
|
32
|
-
state: {type: String, default: StateEnum.
|
|
32
|
+
state: {type: String, default: StateEnum.ACTIVE},
|
|
33
33
|
creationTime: {type: Date, default: Date.now},
|
|
34
34
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
35
35
|
isAdmin: {type: Boolean, required: true},
|
package/models/Zone.js
CHANGED
|
@@ -77,7 +77,7 @@ let zoneSchema = new Schema({
|
|
|
77
77
|
creationTime: {type: Date, default: Date.now},
|
|
78
78
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
79
79
|
projectId: {type: String, required: true},
|
|
80
|
-
state: {type: String, default: StateEnum.
|
|
80
|
+
state: {type: String, default: StateEnum.ACTIVE, select: false},
|
|
81
81
|
accountId: {type: String, required: true, validate: {isAsync: false, validator: helpers.validateUUIDv4, msg: 'default error message'}}
|
|
82
82
|
}, {collection: 'zone'})
|
|
83
83
|
|
package/models/ZoneUIState.js
CHANGED
|
@@ -15,7 +15,7 @@ let ZoneUIStateSchema = new mongoose.Schema({
|
|
|
15
15
|
zoom: {type: Number, default: 4},
|
|
16
16
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
17
17
|
creationTime: {type: Date, default: Date.now},
|
|
18
|
-
state: {type: String, default: StateEnum.
|
|
18
|
+
state: {type: String, default: StateEnum.ACTIVE, select: false},
|
|
19
19
|
zoneId: String
|
|
20
20
|
},
|
|
21
21
|
{collection: 'zoneUIState'}
|
package/package.json
CHANGED