@bluedot-innovation/models 2.0.19-alpha.4 → 2.0.19-alpha.51
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 +1 -1
- package/Models.js +10 -10
- package/models/{geofeatures/Beacon.js → Beacon.js} +6 -8
- package/models/{geofeatures/BoundingBox.js → BoundingBox.js} +8 -12
- package/models/{geofeatures/Circle.js → Circle.js} +13 -15
- package/models/{geofeatures/Polygon.js → Polygon.js} +6 -10
- package/models/{geofeatures/Polyline.js → Polyline.js} +9 -11
- package/models/Project.js +0 -2
- package/models/User.js +0 -3
- package/models/Zone.js +4 -6
- package/models/ZoneBeacon.js +2 -2
- package/package.json +2 -3
- package/utils/mongooseHidden.js +0 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
## 2.0.19
|
|
2
|
-
-
|
|
2
|
+
- Allow "immediate" on proximity field in beacons.
|
|
3
3
|
|
|
4
4
|
## 2.0.18
|
|
5
5
|
- `password` on `user` model no longer required. We will rely on cognito to throw an error
|
package/Models.js
CHANGED
|
@@ -5,17 +5,17 @@
|
|
|
5
5
|
let Models = {}
|
|
6
6
|
|
|
7
7
|
Models.Account = require('./models/Account').Model
|
|
8
|
-
Models.Beacon = require('./models/
|
|
8
|
+
Models.Beacon = require('./models/Beacon').Model
|
|
9
9
|
Models.BeaconFilter = require('./models/BeaconFilter').Model
|
|
10
10
|
Models.BearingFilter = require('./models/BearingFilter').Model
|
|
11
|
-
Models.BoundingBox = require('./models/
|
|
11
|
+
Models.BoundingBox = require('./models/BoundingBox').Model
|
|
12
12
|
Models.CalendarDateRangeFilter = require('./models/CalendarDateRangeFilter').Model
|
|
13
|
-
Models.Circle = require('./models/
|
|
13
|
+
Models.Circle = require('./models/Circle').Model
|
|
14
14
|
Models.MessageAction = require('./models/MessageAction').Model
|
|
15
15
|
Models.MonthlyStat = require('./models/MonthlyStats').Model
|
|
16
16
|
Models.PercentageCrossedFilter = require('./models/PercentageCrossedFilter').Model
|
|
17
|
-
Models.Polygon = require('./models/
|
|
18
|
-
Models.Polyline = require('./models/
|
|
17
|
+
Models.Polygon = require('./models/Polygon').Model
|
|
18
|
+
Models.Polyline = require('./models/Polyline').Model
|
|
19
19
|
Models.Project = require('./models/Project').Model
|
|
20
20
|
Models.RuleRequestAggregation = require('./models/RuleRequestAggregation').Model
|
|
21
21
|
Models.SpeedFilter = require('./models/SpeedFilter').Model
|
|
@@ -28,17 +28,17 @@ Models.ZoneBeacon = require('./models/ZoneBeacon').Model
|
|
|
28
28
|
let Schemas = {}
|
|
29
29
|
|
|
30
30
|
Schemas.Account = require('./models/Account').Schema
|
|
31
|
-
Schemas.Beacon = require('./models/
|
|
31
|
+
Schemas.Beacon = require('./models/Beacon').Schema
|
|
32
32
|
Schemas.BeaconFilter = require('./models/BeaconFilter').Schema
|
|
33
33
|
Schemas.BearingFilter = require('./models/BearingFilter').Schema
|
|
34
|
-
Schemas.BoundingBox = require('./models/
|
|
34
|
+
Schemas.BoundingBox = require('./models/BoundingBox').Schema
|
|
35
35
|
Schemas.CalendarDateRangeFilter = require('./models/CalendarDateRangeFilter').Schema
|
|
36
|
-
Schemas.Circle = require('./models/
|
|
36
|
+
Schemas.Circle = require('./models/Circle').Schema
|
|
37
37
|
Schemas.MessageAction = require('./models/MessageAction').Schema
|
|
38
38
|
Schemas.MonthlyStat = require('./models/MonthlyStats').Schema
|
|
39
39
|
Schemas.PercentageCrossedFilter = require('./models/PercentageCrossedFilter').Schema
|
|
40
|
-
Schemas.Polygon = require('./models/
|
|
41
|
-
Schemas.Polyline = require('./models/
|
|
40
|
+
Schemas.Polygon = require('./models/Polygon').Schema
|
|
41
|
+
Schemas.Polyline = require('./models/Polyline').Schema
|
|
42
42
|
Schemas.Project = require('./models/Project').Schema
|
|
43
43
|
Schemas.RuleRequestAggregation = require('./models/RuleRequestAggregation').Schema
|
|
44
44
|
Schemas.SpeedFilter = require('./models/SpeedFilter').Schema
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const Point = require.main.require('schemas/Point')
|
|
1
|
+
let mongoose = require('mongoose')
|
|
2
|
+
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
4
|
+
let PointGeometry = require('../schemas/PointGeometry')
|
|
5
|
+
let uuidv4 = require('uuid/v4')
|
|
6
|
+
let patcher = require('mongoose-json-patch')
|
|
8
7
|
|
|
9
8
|
let schema = {
|
|
10
9
|
_id: {type: String, default: uuidv4},
|
|
@@ -42,7 +41,6 @@ BeaconSchema.index({ accountId: 1, geometry: '2dsphere' })
|
|
|
42
41
|
// accountId: 1, geometry: "2dsphere"
|
|
43
42
|
|
|
44
43
|
BeaconSchema.plugin(patcher)
|
|
45
|
-
BeaconSchema.plugin(mongooseHidden)
|
|
46
44
|
|
|
47
45
|
// mongoose validator helper plugin
|
|
48
46
|
BeaconSchema.post('validate', function (doc) {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
2
1
|
let mongoose = require('mongoose')
|
|
2
|
+
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
3
|
let uuidv4 = require('uuid/v4')
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
4
|
+
let Point = require('../schemas/Point')
|
|
5
|
+
let PolygonGeometry = require('../schemas/PolygonGeometry')
|
|
7
6
|
|
|
8
7
|
const schema = {
|
|
9
8
|
_id: {type: String, default: uuidv4},
|
|
@@ -17,31 +16,28 @@ const schema = {
|
|
|
17
16
|
state: {type: String, default: StateEnum.active, select: false}
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
const
|
|
19
|
+
const BoundingBoxSchema = new mongoose.Schema(
|
|
21
20
|
schema,
|
|
22
21
|
{
|
|
23
22
|
_id: false,
|
|
24
23
|
versionKey: false
|
|
25
24
|
})
|
|
26
25
|
|
|
27
|
-
|
|
26
|
+
BoundingBoxSchema.add({
|
|
28
27
|
type:
|
|
29
28
|
{type: String, required: true}
|
|
30
29
|
})
|
|
31
30
|
|
|
32
|
-
boundingBoxSchema.plugin(mongooseHidden)
|
|
33
|
-
|
|
34
|
-
|
|
35
31
|
// optional mongoose
|
|
36
32
|
let model = (mongooseInstance) => {
|
|
37
33
|
let BoundingBox
|
|
38
34
|
if (mongooseInstance) {
|
|
39
|
-
BoundingBox = mongooseInstance.model('BoundingBox',
|
|
35
|
+
BoundingBox = mongooseInstance.model('BoundingBox', BoundingBoxSchema)
|
|
40
36
|
} else {
|
|
41
|
-
BoundingBox = mongoose.model('BoundingBox',
|
|
37
|
+
BoundingBox = mongoose.model('BoundingBox', BoundingBoxSchema)
|
|
42
38
|
}
|
|
43
39
|
|
|
44
40
|
return BoundingBox
|
|
45
41
|
}
|
|
46
42
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
47
|
-
module.exports = { Model: model, Schema:
|
|
43
|
+
module.exports = { Model: model, Schema: BoundingBoxSchema, boundingBoxSchema: schema }
|
|
@@ -1,45 +1,43 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
3
4
|
let uuidv4 = require('uuid/v4')
|
|
4
|
-
|
|
5
|
-
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
6
|
-
const Point = require.main.require('schemas/Point')
|
|
5
|
+
let PolygonGeometry = require('../schemas/PolygonGeometry')
|
|
7
6
|
|
|
8
7
|
let schema = {
|
|
9
8
|
_id: {type: String, default: uuidv4},
|
|
10
|
-
|
|
11
|
-
name: {type: String, required: [true, 'name is required. ']},
|
|
9
|
+
name: {type: String, required: [true, 'name is required.']},
|
|
12
10
|
color: String,
|
|
13
|
-
radius: {type: Number, required: [true, 'radius is required.
|
|
14
|
-
center: {type: Point, required: [true, 'center is required.
|
|
11
|
+
radius: {type: Number, required: [true, 'radius is required.'], min: 5},
|
|
12
|
+
center: {type: Point, required: [true, 'center is required.']},
|
|
15
13
|
creationTime: {type: Date, default: Date.now},
|
|
16
14
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
15
|
+
geometry: {type: PolygonGeometry},
|
|
17
16
|
state: {type: String, default: StateEnum.active, select: false}
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
let
|
|
19
|
+
let CircleSchema = new mongoose.Schema(
|
|
21
20
|
schema,
|
|
22
21
|
{
|
|
23
22
|
_id: false,
|
|
24
23
|
__v: false
|
|
25
24
|
})
|
|
26
25
|
|
|
27
|
-
|
|
28
|
-
type:
|
|
26
|
+
CircleSchema.add({
|
|
27
|
+
type:
|
|
28
|
+
{type: String, required: true}
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
-
circleSchema.plugin(mongooseHidden)
|
|
32
|
-
|
|
33
31
|
// optional mongoose
|
|
34
32
|
let model = (mongooseInstance) => {
|
|
35
33
|
let Circle
|
|
36
34
|
if (mongooseInstance) {
|
|
37
|
-
Circle = mongooseInstance.model('Circle',
|
|
35
|
+
Circle = mongooseInstance.model('Circle', CircleSchema)
|
|
38
36
|
} else {
|
|
39
|
-
Circle = mongoose.model('Circle',
|
|
37
|
+
Circle = mongoose.model('Circle', CircleSchema)
|
|
40
38
|
}
|
|
41
39
|
|
|
42
40
|
return Circle
|
|
43
41
|
}
|
|
44
42
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
45
|
-
module.exports = { Model: model, Schema:
|
|
43
|
+
module.exports = { Model: model, Schema: CircleSchema, circleSchema: schema }
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
|
|
4
|
-
const Point = require.main.require('schemas/Point')
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
5
4
|
let uuidv4 = require('uuid/v4')
|
|
6
5
|
|
|
7
6
|
const schema = {
|
|
@@ -14,31 +13,28 @@ const schema = {
|
|
|
14
13
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
15
14
|
state: {type: String, default: StateEnum.active, select: false}
|
|
16
15
|
}
|
|
17
|
-
const
|
|
16
|
+
const PolygonSchema = new mongoose.Schema(
|
|
18
17
|
schema,
|
|
19
18
|
{
|
|
20
19
|
_id: false,
|
|
21
20
|
versionKey: false
|
|
22
21
|
})
|
|
23
22
|
|
|
24
|
-
|
|
23
|
+
PolygonSchema.add({
|
|
25
24
|
type:
|
|
26
25
|
{type: String, required: true}
|
|
27
26
|
})
|
|
28
27
|
|
|
29
|
-
polygonSchema.plugin(mongooseHidden)
|
|
30
|
-
|
|
31
|
-
|
|
32
28
|
// optional mongoose
|
|
33
29
|
let model = (mongooseInstance) => {
|
|
34
30
|
let Polygon
|
|
35
31
|
if (mongooseInstance) {
|
|
36
|
-
Polygon = mongooseInstance.model('Polygon',
|
|
32
|
+
Polygon = mongooseInstance.model('Polygon', PolygonSchema)
|
|
37
33
|
} else {
|
|
38
|
-
Polygon = mongoose.model('Polygon',
|
|
34
|
+
Polygon = mongoose.model('Polygon', PolygonSchema)
|
|
39
35
|
}
|
|
40
36
|
|
|
41
37
|
return Polygon
|
|
42
38
|
}
|
|
43
39
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
44
|
-
module.exports = { Model: model, Schema:
|
|
40
|
+
module.exports = { Model: model, Schema: PolygonSchema, polygonSchema: schema }
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
|
-
|
|
6
|
-
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
5
|
+
let MultiLineStringGeometry = require('../schemas/MultiLineStringGeometry')
|
|
7
6
|
|
|
8
7
|
const schema = {
|
|
9
8
|
_id: {type: String, default: uuidv4},
|
|
@@ -15,29 +14,28 @@ const schema = {
|
|
|
15
14
|
state: {type: String, default: StateEnum.active, select: false}
|
|
16
15
|
}
|
|
17
16
|
|
|
18
|
-
const
|
|
17
|
+
const PolylineSchema = new mongoose.Schema(
|
|
19
18
|
schema,
|
|
20
19
|
{
|
|
21
20
|
_id: false,
|
|
22
21
|
versionKey: false
|
|
23
22
|
})
|
|
24
23
|
|
|
25
|
-
|
|
26
|
-
type:
|
|
24
|
+
PolylineSchema.add({
|
|
25
|
+
type:
|
|
26
|
+
{type: String, required: true}
|
|
27
27
|
})
|
|
28
28
|
|
|
29
|
-
polylineSchema.plugin(mongooseHidden)
|
|
30
|
-
|
|
31
29
|
// optional mongoose
|
|
32
30
|
let model = (mongooseInstance) => {
|
|
33
31
|
let Polyline
|
|
34
32
|
if (mongooseInstance) {
|
|
35
|
-
Polyline = mongooseInstance.model('Polyline',
|
|
33
|
+
Polyline = mongooseInstance.model('Polyline', PolylineSchema)
|
|
36
34
|
} else {
|
|
37
|
-
Polyline = mongoose.model('Polyline',
|
|
35
|
+
Polyline = mongoose.model('Polyline', PolylineSchema)
|
|
38
36
|
}
|
|
39
37
|
|
|
40
38
|
return Polyline
|
|
41
39
|
}
|
|
42
40
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
43
|
-
module.exports = { Model: model, Schema:
|
|
41
|
+
module.exports = { Model: model, Schema: PolylineSchema, polylineSchema: schema }
|
package/models/Project.js
CHANGED
|
@@ -9,7 +9,6 @@ let Schema = mongoose.Schema
|
|
|
9
9
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
10
10
|
let uuidv4 = require('uuid/v4')
|
|
11
11
|
let patcher = require('mongoose-json-patch')
|
|
12
|
-
const mongooseHidden = require('../utils/mongooseHidden')
|
|
13
12
|
let helpers = require('../helpers')
|
|
14
13
|
|
|
15
14
|
let WebhookSchema = require('../schemas/Webhook')
|
|
@@ -39,7 +38,6 @@ let ProjectSchema = new mongoose.Schema({
|
|
|
39
38
|
{collection: 'project'})
|
|
40
39
|
|
|
41
40
|
ProjectSchema.plugin(patcher)
|
|
42
|
-
ProjectSchema.plugin(mongooseHidden)
|
|
43
41
|
|
|
44
42
|
// optional mongoose
|
|
45
43
|
let model = (mongooseInstance) => {
|
package/models/User.js
CHANGED
|
@@ -9,7 +9,6 @@ const patcher = require('mongoose-json-patch')
|
|
|
9
9
|
const helpers = require('../helpers')
|
|
10
10
|
const ProjectPermission = require('../schemas/ProjectPermission')
|
|
11
11
|
const uuidv4 = require('uuid/v4')
|
|
12
|
-
const mongooseHidden = require('../utils/mongooseHidden')
|
|
13
12
|
|
|
14
13
|
let UserSchema = new mongoose.Schema({
|
|
15
14
|
_id: {type: String, default: uuidv4},
|
|
@@ -46,8 +45,6 @@ let UserSchema = new mongoose.Schema({
|
|
|
46
45
|
{collection: 'user'})
|
|
47
46
|
|
|
48
47
|
UserSchema.plugin(patcher)
|
|
49
|
-
UserSchema.plugin(mongooseHidden)
|
|
50
|
-
|
|
51
48
|
|
|
52
49
|
// optional mongoose
|
|
53
50
|
let model = (mongooseInstance) => {
|
package/models/Zone.js
CHANGED
|
@@ -9,10 +9,10 @@ let Schema = mongoose.Schema
|
|
|
9
9
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
10
10
|
let messageActionSchema = require('./MessageAction').messageActionSchema
|
|
11
11
|
let urlActionSchema = require('./UrlAction').urlActionSchema
|
|
12
|
-
let circleSchema = require('./
|
|
13
|
-
let boundingBoxSchema = require('./
|
|
14
|
-
let polylineSchema = require('./
|
|
15
|
-
let polygonSchema = require('./
|
|
12
|
+
let circleSchema = require('./Circle').circleSchema
|
|
13
|
+
let boundingBoxSchema = require('./BoundingBox').boundingBoxSchema
|
|
14
|
+
let polylineSchema = require('./Polyline').polylineSchema
|
|
15
|
+
let polygonSchema = require('./Polygon').polygonSchema
|
|
16
16
|
let beaconSchema = require('./ZoneBeacon').beaconSchema
|
|
17
17
|
let speedFilterSchema = require('./SpeedFilter').speedFilterSchema
|
|
18
18
|
let bearingFilterSchema = require('./BearingFilter').bearingFilterSchema
|
|
@@ -22,7 +22,6 @@ let percentageCrossedFilterSchema = require('./PercentageCrossedFilter').percent
|
|
|
22
22
|
let uuidv4 = require('uuid/v4')
|
|
23
23
|
let patcher = require('mongoose-json-patch')
|
|
24
24
|
let helpers = require('../helpers')
|
|
25
|
-
const mongooseHidden = require('../utils/mongooseHidden')
|
|
26
25
|
|
|
27
26
|
// ////// //
|
|
28
27
|
// Schema //
|
|
@@ -72,7 +71,6 @@ let zoneSchema = new Schema({
|
|
|
72
71
|
|
|
73
72
|
// TODO: Test patcher and include for other schemas if required
|
|
74
73
|
zoneSchema.plugin(patcher)
|
|
75
|
-
zoneSchema.plugin(mongooseHidden)
|
|
76
74
|
|
|
77
75
|
zoneSchema.path('actions').discriminator('url', new Schema(urlActionSchema))
|
|
78
76
|
zoneSchema.path('actions').discriminator('message', new Schema(messageActionSchema))
|
package/models/ZoneBeacon.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const cloneDeep = require('lodash.clonedeep')
|
|
2
2
|
const mongoose = require('mongoose')
|
|
3
|
-
const beaconSchema = require('./
|
|
3
|
+
const beaconSchema = require('./Beacon').beaconSchema
|
|
4
4
|
const BeaconEnum = require('@bluedot-innovation/enums').BeaconEnum
|
|
5
5
|
|
|
6
6
|
const schema = cloneDeep(beaconSchema)
|
|
@@ -8,7 +8,7 @@ const schema = cloneDeep(beaconSchema)
|
|
|
8
8
|
schema.proximity = {
|
|
9
9
|
type: String,
|
|
10
10
|
default: BeaconEnum.FAR,
|
|
11
|
-
enum: [BeaconEnum.NEAR, BeaconEnum.FAR]
|
|
11
|
+
enum: [BeaconEnum.NEAR, BeaconEnum.IMMEDIATE, BeaconEnum.FAR]
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
const ZoneBeaconSchema = new mongoose.Schema(schema)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bluedot-innovation/models",
|
|
3
|
-
"version": "2.0.19-alpha.
|
|
3
|
+
"version": "2.0.19-alpha.51",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "Models.js",
|
|
6
6
|
"scripts": {
|
|
@@ -30,11 +30,10 @@
|
|
|
30
30
|
"sinon": "^4.1.2"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@bluedot-innovation/enums": "2.
|
|
33
|
+
"@bluedot-innovation/enums": "2.1.1",
|
|
34
34
|
"lodash.clonedeep": "4.5.0",
|
|
35
35
|
"mongoose": "^4.13.9",
|
|
36
36
|
"mongoose-error-helper": "0.0.2",
|
|
37
|
-
"mongoose-hidden": "^1.5.3",
|
|
38
37
|
"mongoose-json-patch": "^1.1.1",
|
|
39
38
|
"uuid": "^3.1.0"
|
|
40
39
|
}
|