@bluedot-innovation/models 5.1.22 → 5.1.23-alpha.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 CHANGED
@@ -1,3 +1,6 @@
1
+ ## 5.1.23
2
+ - Validate Geofeatures for missing type property
3
+
1
4
  ## 5.1.22
2
5
  - Validate zones' actions and conditions for missing type
3
6
 
@@ -71,5 +71,38 @@ testCase('Zone - Action', () => {
71
71
  done()
72
72
  })
73
73
  })
74
+
75
+ assertions('should throw an error when a geofeature is missing a type', (done) => {
76
+ delete zone.geofeatures[0].type
77
+ let Zone = new ZoneModel(zone)
78
+ Zone.validate((err, res) => {
79
+ assert.exists(err, 'err object should exist')
80
+ assert.isObject(err)
81
+ assert.match(err.message, /(Geofeature requires a type of `beacon`, `circle`, `polygon`, `geoline` or `boundingBox`.)/i)
82
+ done()
83
+ })
84
+ })
85
+
86
+ assertions('should throw an error when a geofeature type is invalid', (done) => {
87
+ zone.geofeatures[0].type = 'test'
88
+ let Zone = new ZoneModel(zone)
89
+ Zone.validate((err, res) => {
90
+ assert.exists(err, 'err object should exist')
91
+ assert.isObject(err)
92
+ assert.match(err.message, /(Geofeature requires a type of `beacon`, `circle`, `polygon`, `geoline` or `boundingBox`.)/i)
93
+ done()
94
+ })
95
+ })
96
+
97
+ assertions('should throw an error when a geofeature object is empty', (done) => {
98
+ zone.geofeatures = [{}]
99
+ let Zone = new ZoneModel(zone)
100
+ Zone.validate((err, res) => {
101
+ assert.exists(err, 'err object should exist')
102
+ assert.isObject(err)
103
+ assert.match(err.message, /(Geofeature requires a type of `beacon`, `circle`, `polygon`, `geoline` or `boundingBox`.)/i)
104
+ done()
105
+ })
106
+ })
74
107
  })
75
108
  })
package/models/Zone.js CHANGED
@@ -64,6 +64,13 @@ conditionSchema.pre('validate', function(next){
64
64
  let geofeatureSchema = new Schema({},
65
65
  { discriminatorKey: 'type', _id: false })
66
66
 
67
+ geofeatureSchema.pre('validate', function(next){
68
+ if(this.type === undefined){
69
+ return next(new Error('Geofeature requires a type of `beacon`, `circle`, `polygon`, `geoline` or `boundingBox`.'))
70
+ }
71
+ next()
72
+ })
73
+
67
74
  let zoneSchema = new Schema({
68
75
  _id: {type: String, default: uuidv4},
69
76
  name: {type: String, required: true},
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "5.1.22",
3
+ "version": "5.1.23-alpha.2",
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",
@@ -28,8 +28,9 @@
28
28
  "sinon": "^4.1.2"
29
29
  },
30
30
  "dependencies": {
31
- "@bluedot-innovation/enums": "2.1.5",
31
+ "@bluedot-innovation/enums": "^2.1.5",
32
32
  "@bluedot-innovation/mongoose-json-patch": "0.0.6",
33
+ "@mongoosejs/double": "^0.1.2",
33
34
  "deep-equal": "^1.0.1",
34
35
  "fast-deep-equal": "^2.0.1",
35
36
  "lodash.clonedeep": "4.5.0",
package/schemas/Point.js CHANGED
@@ -1,9 +1,10 @@
1
1
  let mongoose = require('mongoose')
2
+ const Double = require('@mongoosejs/double')
2
3
 
3
4
  let PointSchema = new mongoose.Schema({
4
5
  type: {type: String},
5
- latitude: {type: Number, required: [true, 'latitude is required. '], min: -90, max: 90},
6
- longitude: {type: Number, required: [true, 'longitude is required. '], min: -180, max: 180}
6
+ latitude: {type: Double, required: [true, 'latitude is required. '], min: -90, max: 90},
7
+ longitude: {type: Double, required: [true, 'longitude is required. '], min: -180, max: 180}
7
8
  },
8
9
  {
9
10
  _id: false,