@bluedot-innovation/models 3.0.8-alpha.3 → 3.0.9
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 +3 -4
- package/Models.js +9 -15
- package/__tests__/filter/dayRange/dayRange.spec.js +12 -0
- package/models/{geofeatures/BoundingBox.js → BoundingBox.js} +4 -3
- package/models/{geofeatures/Circle.js → Circle.js} +3 -2
- package/models/{geofeatures/Polygon.js → Polygon.js} +3 -3
- package/models/{geofeatures/Polyline.js → Polyline.js} +3 -2
- package/models/Zone.js +7 -7
- package/models/{geofeatures/ZoneBeacon.js → ZoneBeacon.js} +1 -1
- package/models/filters/DayRange.js +5 -4
- package/package.json +2 -1
package/CHANGELOG.md
CHANGED
package/Models.js
CHANGED
|
@@ -6,21 +6,18 @@ let Models = {}
|
|
|
6
6
|
|
|
7
7
|
Models.Account = require('./models/Account').Model
|
|
8
8
|
Models.Beacon = require('./models/Beacon').Model
|
|
9
|
-
|
|
9
|
+
Models.BoundingBox = require('./models/BoundingBox').Model
|
|
10
|
+
Models.Circle = require('./models/Circle').Model
|
|
10
11
|
Models.MessageAction = require('./models/MessageAction').Model
|
|
11
12
|
Models.MonthlyStat = require('./models/MonthlyStats').Model
|
|
13
|
+
Models.Polygon = require('./models/Polygon').Model
|
|
14
|
+
Models.Polyline = require('./models/Polyline').Model
|
|
12
15
|
Models.Project = require('./models/Project').Model
|
|
13
16
|
Models.RuleRequestAggregation = require('./models/RuleRequestAggregation').Model
|
|
14
17
|
Models.UrlAction = require('./models/UrlAction').Model
|
|
15
18
|
Models.User = require('./models/User').Model
|
|
16
19
|
Models.Zone = require('./models/Zone').Model
|
|
17
|
-
|
|
18
|
-
// Geofeatures
|
|
19
|
-
Models.BoundingBox = require('./models/geofeatures/BoundingBox').Model
|
|
20
|
-
Models.Circle = require('./models/geofeatures/Circle').Model
|
|
21
|
-
Models.Polygon = require('./models/geofeatures/Polygon').Model
|
|
22
|
-
Models.Polyline = require('./models/geofeatures/Polyline').Model
|
|
23
|
-
Models.ZoneBeacon = require('./models/geofeatures/ZoneBeacon').Model
|
|
20
|
+
Models.ZoneBeacon = require('./models/ZoneBeacon').Model
|
|
24
21
|
|
|
25
22
|
// Filters
|
|
26
23
|
Models.DayRange = require('./models/filters/DayRange').Model
|
|
@@ -33,21 +30,18 @@ let Schemas = {}
|
|
|
33
30
|
|
|
34
31
|
Schemas.Account = require('./models/Account').Schema
|
|
35
32
|
Schemas.Beacon = require('./models/Beacon').Schema
|
|
33
|
+
Schemas.BoundingBox = require('./models/BoundingBox').Schema
|
|
34
|
+
Schemas.Circle = require('./models/Circle').Schema
|
|
36
35
|
Schemas.MessageAction = require('./models/MessageAction').Schema
|
|
37
36
|
Schemas.MonthlyStat = require('./models/MonthlyStats').Schema
|
|
37
|
+
Schemas.Polygon = require('./models/Polygon').Schema
|
|
38
|
+
Schemas.Polyline = require('./models/Polyline').Schema
|
|
38
39
|
Schemas.Project = require('./models/Project').Schema
|
|
39
40
|
Schemas.RuleRequestAggregation = require('./models/RuleRequestAggregation').Schema
|
|
40
41
|
Schemas.UrlAction = require('./models/UrlAction').Schema
|
|
41
42
|
Schemas.User = require('./models/User').Schema
|
|
42
43
|
Schemas.Zone = require('./models/Zone').Schema
|
|
43
44
|
|
|
44
|
-
// Geofeatures
|
|
45
|
-
Schemas.BoundingBox = require('./models/geofeatures/BoundingBox').Schema
|
|
46
|
-
Schemas.Circle = require('./models/geofeatures/Circle').Schema
|
|
47
|
-
Schemas.Polygon = require('./models/geofeatures/Polygon').Schema
|
|
48
|
-
Schemas.Polyline = require('./models/geofeatures/Polyline').Schema
|
|
49
|
-
Schemas.ZoneBeacon = require('./models/geofeatures/ZoneBeacon').Schema
|
|
50
|
-
|
|
51
45
|
// Filters
|
|
52
46
|
Schemas.DayRange = require('./models/filters/DayRange').Schema
|
|
53
47
|
Schemas.Speed = require('./models/filters/Speed').Schema
|
|
@@ -41,6 +41,18 @@ testCase('DayRangeFilter', () => {
|
|
|
41
41
|
done()
|
|
42
42
|
})
|
|
43
43
|
})
|
|
44
|
+
|
|
45
|
+
assertions('should throw an error if both startDate and endDate are not provided', (done) => {
|
|
46
|
+
delete dayRange.startDate
|
|
47
|
+
delete dayRange.endDate
|
|
48
|
+
let DayRangeFilter = new DayRangeModel(dayRange)
|
|
49
|
+
DayRangeFilter.validate((err, res) => {
|
|
50
|
+
assert.exists(err, 'err object should exist')
|
|
51
|
+
assert.isObject(err)
|
|
52
|
+
done()
|
|
53
|
+
})
|
|
54
|
+
})
|
|
55
|
+
|
|
44
56
|
testCase('check each required property of the model and validate that it is present', () => {
|
|
45
57
|
let requiredFields = rules.requiredFields
|
|
46
58
|
requiredFields.map((i) => {
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
3
|
let uuidv4 = require('uuid/v4')
|
|
4
|
-
let Point = require('
|
|
5
|
-
let
|
|
4
|
+
let Point = require('../schemas/Point')
|
|
5
|
+
let PolygonGeometry = require('../schemas/PolygonGeometry')
|
|
6
|
+
let helpers = require('../helpers')
|
|
6
7
|
|
|
7
8
|
const schema = {
|
|
8
9
|
_id: {type: String, default: uuidv4},
|
|
9
|
-
geometry: {type:
|
|
10
|
+
geometry: {type: PolygonGeometry},
|
|
10
11
|
name: {type: String, required: [true, 'name is required.']},
|
|
11
12
|
color: String,
|
|
12
13
|
northEast: {type: Point, required: [true, 'northEast is required.']},
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
let Point = require('
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
|
+
let PolygonGeometry = require('../schemas/PolygonGeometry')
|
|
5
6
|
|
|
6
7
|
let schema = {
|
|
7
8
|
_id: {type: String, default: uuidv4},
|
|
8
|
-
geometry: {type:
|
|
9
|
+
geometry: {type: PolygonGeometry},
|
|
9
10
|
name: {type: String, required: [true, 'name is required. ']},
|
|
10
11
|
color: String,
|
|
11
12
|
radius: {type: Number, required: [true, 'radius is required. '], min: 5},
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
let Point = require('
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
|
-
let helpers = require('
|
|
5
|
+
let helpers = require('../helpers')
|
|
6
6
|
|
|
7
7
|
const schema = {
|
|
8
8
|
_id: {type: String, default: uuidv4},
|
|
9
|
-
geometry: {type:
|
|
9
|
+
geometry: {type: mongoose.Schema.Types.Mixed},
|
|
10
10
|
name: {type: String, required: [true, 'name is required.']},
|
|
11
11
|
color: String,
|
|
12
12
|
vertices: {
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
let Point = require('
|
|
3
|
+
let Point = require('../schemas/Point')
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
|
+
let MultiLineStringGeometry = require('../schemas/MultiLineStringGeometry')
|
|
5
6
|
|
|
6
7
|
const schema = {
|
|
7
8
|
_id: {type: String, default: uuidv4},
|
|
8
|
-
geometry: {type:
|
|
9
|
+
geometry: {type: MultiLineStringGeometry},
|
|
9
10
|
name: {type: String, required: [true, 'name is required. ']},
|
|
10
11
|
vertices: {type: [Point], required: [true, 'vertices is required. ']}
|
|
11
12
|
}
|
package/models/Zone.js
CHANGED
|
@@ -9,11 +9,11 @@ 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('./
|
|
16
|
-
let beaconSchema = 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
|
+
let beaconSchema = require('./ZoneBeacon').beaconSchema
|
|
17
17
|
|
|
18
18
|
// Filters
|
|
19
19
|
let speedRawSchema = require('./filters/Speed').rawSchema
|
|
@@ -46,10 +46,10 @@ let geofeatureSchema = new Schema({},
|
|
|
46
46
|
|
|
47
47
|
let zoneSchema = new Schema({
|
|
48
48
|
_id: {type: String, default: uuidv4},
|
|
49
|
-
name: {type: String, required: true},
|
|
49
|
+
name: {type: String, required: [true, 'name is required']},
|
|
50
50
|
minimumRetriggerTime: {
|
|
51
51
|
type: Number,
|
|
52
|
-
required: true,
|
|
52
|
+
required: [true, 'minimumRetriggerTime is required'],
|
|
53
53
|
min: 60,
|
|
54
54
|
max: 359940,
|
|
55
55
|
validate: {
|
|
@@ -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)
|
|
@@ -3,7 +3,7 @@ let uuidv4 = require('uuid/v4')
|
|
|
3
3
|
|
|
4
4
|
let schema = {
|
|
5
5
|
startDate: {type: Date},
|
|
6
|
-
endDate: {type: Date
|
|
6
|
+
endDate: {type: Date}
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
let DayRangeFilterSchema = new mongoose.Schema(schema, {
|
|
@@ -12,11 +12,12 @@ let DayRangeFilterSchema = new mongoose.Schema(schema, {
|
|
|
12
12
|
})
|
|
13
13
|
|
|
14
14
|
DayRangeFilterSchema.add({
|
|
15
|
-
type: {type: String, required: true}
|
|
15
|
+
type: {type: String, required: true, validate: {isAsync: true, validator: validateDateRange}}
|
|
16
16
|
})
|
|
17
17
|
|
|
18
|
-
function validateDateRange (
|
|
19
|
-
let startDate = this.startDate
|
|
18
|
+
function validateDateRange (type, callback) {
|
|
19
|
+
let startDate = this.startDate;
|
|
20
|
+
let endDate = this.endDate;
|
|
20
21
|
|
|
21
22
|
if (!startDate && !endDate) {
|
|
22
23
|
return callback(false, `Must have a startDate, endDate, or both.`)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bluedot-innovation/models",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.9",
|
|
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",
|
|
@@ -33,6 +33,7 @@
|
|
|
33
33
|
"fast-deep-equal": "^2.0.1",
|
|
34
34
|
"lodash.clonedeep": "4.5.0",
|
|
35
35
|
"mongoose": "^4.13.9",
|
|
36
|
+
"mongoose-error-helper": "0.0.2",
|
|
36
37
|
"mongoose-json-patch": "^1.1.1",
|
|
37
38
|
"uuid": "^3.1.0"
|
|
38
39
|
}
|