@bluedot-innovation/models 2.0.6 → 2.0.7-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,9 @@
1
+ ## 2.0.7
2
+ - All `guid`'s changed to `_id`'s
3
+
4
+ ## 2.0.6
5
+ - Added `geometry` to geofeature models
6
+
1
7
  ## 2.0.5
2
8
  - Beacon using a `location` property instead of `latitude` and `longitude` on the root
3
9
  - ZoneBeacon model inheriting from Beacon, adds `proximity` and `type`
@@ -8,16 +8,11 @@ let mongoose = require('mongoose')
8
8
  let schema = {
9
9
  '_class': {type: String, default: 'au.com.bluedot.application.spring.filter.spatial.BeaconFilter'},
10
10
  'beacon': {},
11
- 'guid': String,
11
+ '_id': String,
12
12
  'type': {type: String, default: 'beacon'}
13
13
  }
14
14
 
15
- let BeaconFilterSchema = new mongoose.Schema(
16
- schema,
17
- {
18
- _id: false
19
- }
20
- )
15
+ let BeaconFilterSchema = new mongoose.Schema(schema)
21
16
 
22
17
  BeaconFilterSchema.add({
23
18
  type:
@@ -2,7 +2,7 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  const schema = {
5
- guid: {type: String, default: uuidv4},
5
+ _id: {type: String, default: uuidv4},
6
6
  fromAngle: {type: Number, required: [true, 'fromAngle is required. '], min: 0, max: 359},
7
7
  toAngle: {type: Number, required: true, min: 0, max: 359, validate: {isAsync: true, validator: validateAngles, msg: 'default error message'}}
8
8
  }
@@ -10,7 +10,6 @@ const schema = {
10
10
  const BearingFilterSchema = new mongoose.Schema(
11
11
  schema,
12
12
  {
13
- _id: false,
14
13
  versionKey: false
15
14
  })
16
15
 
@@ -2,14 +2,13 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  let schema = {
5
- guid: {type: String, default: uuidv4},
5
+ _id: {type: String, default: uuidv4},
6
6
  startDate: {type: Date, required: [true, 'startDate is required. ']},
7
7
  endDate: {type: Date, required: [true, 'endDate is required. '], validate: validateDateRange}
8
8
  }
9
9
  let CalendarDateRangeFilterSchema = new mongoose.Schema(
10
10
  schema,
11
11
  {
12
- _id: false,
13
12
  versionKey: false
14
13
  })
15
14
 
@@ -3,7 +3,7 @@ let StateEnum = require('@bluedot-innovation/enums').StateEnum
3
3
  let uuidv4 = require('uuid/v4')
4
4
 
5
5
  let schema = {
6
- guid: {type: String, default: uuidv4},
6
+ _id: {type: String, default: uuidv4},
7
7
  title: {type: String, required: [true, 'title is required. ']},
8
8
  message: {type: String, required: [true, 'message is required. ']},
9
9
  creationTime: {type: Date, default: Date.now},
@@ -13,7 +13,6 @@ let schema = {
13
13
 
14
14
  let MessageActionSchema = new mongoose.Schema(schema,
15
15
  {
16
- _id: false,
17
16
  __v: false
18
17
  })
19
18
 
@@ -3,21 +3,15 @@ let mongoose = require('mongoose')
3
3
  let uuidv4 = require('uuid/v4')
4
4
 
5
5
  let schema = {
6
- guid: {type: String, default: uuidv4},
6
+ _id: {type: String, default: uuidv4},
7
7
  percentage: {type: Number, required: [true, 'percentage is required. '], min: 1, max: 100},
8
8
  timeOutSeconds: {type: Number, required: [true, 'timeOutSeconds is required. '], min: 60, max: 86400},
9
9
  sequential: {type: Boolean, default: false}
10
10
  }
11
- let PercentageCrossedFilterSchema = new mongoose.Schema(
12
- schema,
13
- {
14
- _id: false,
15
- versionKey: false
16
- })
11
+ let PercentageCrossedFilterSchema = new mongoose.Schema(schema, { versionKey: false })
17
12
 
18
13
  PercentageCrossedFilterSchema.add({
19
- type:
20
- {type: String, required: true}
14
+ type: {type: String, required: true}
21
15
  })
22
16
 
23
17
  // optional mongoose
@@ -2,20 +2,18 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  let schema = {
5
- guid: {type: String, default: uuidv4},
5
+ _id: {type: String, default: uuidv4},
6
6
  minimumSpeed: {type: Number, required: [true, 'minimumSpeed is required. '], min: 0},
7
7
  maximumSpeed: {type: Number, required: true, validate: {isAsync: true, validator: validateMaxSpeed, msg: 'default error message'}}
8
8
  }
9
9
  let SpeedFilterSchema = new mongoose.Schema(
10
10
  schema,
11
11
  {
12
- _id: false,
13
12
  versionKey: false
14
13
  })
15
14
 
16
15
  SpeedFilterSchema.add({
17
- type:
18
- {type: String, required: true}
16
+ type: {type: String, required: true}
19
17
  })
20
18
 
21
19
  function validateMaxSpeed (v, cb) {
@@ -2,16 +2,11 @@ let mongoose = require('mongoose')
2
2
  let uuidv4 = require('uuid/v4')
3
3
 
4
4
  let schema = {
5
- guid: {type: String, default: uuidv4},
5
+ _id: {type: String, default: uuidv4},
6
6
  fromTime: {type: Number, required: [true, 'time is required. '], min: 0, max: 86400},
7
7
  toTime: {type: Number, required: true, min: 0, max: 86400, validate: {isAsync: true, validator: validateTime}}
8
8
  }
9
- let TimeOfDayRangeFilterSchema = new mongoose.Schema(
10
- schema,
11
- {
12
- _id: false,
13
- versionKey: false
14
- })
9
+ let TimeOfDayRangeFilterSchema = new mongoose.Schema(schema, { versionKey: false })
15
10
 
16
11
  TimeOfDayRangeFilterSchema.add({
17
12
  type:
@@ -3,7 +3,7 @@ let StateEnum = require('@bluedot-innovation/enums').StateEnum
3
3
  let uuidv4 = require('uuid/v4')
4
4
 
5
5
  let schema = {
6
- guid: {type: String, default: uuidv4},
6
+ _id: {type: String, default: uuidv4},
7
7
  url: {
8
8
  type: String,
9
9
  required: [true, 'url is required. '],
@@ -1,14 +1,14 @@
1
+ const cloneDeep = require('lodash.clonedeep')
1
2
  const mongoose = require('mongoose')
2
3
  const beaconSchema = require('./Beacon').beaconSchema
3
4
  const BeaconEnum = require('@bluedot-innovation/enums').BeaconEnum
4
5
 
5
- const schema = {
6
- ...beaconSchema,
7
- proximity: {
8
- type: String,
9
- default: BeaconEnum.FAR,
10
- enum: [BeaconEnum.NEAR, BeaconEnum.FAR]
11
- }
6
+ const schema = cloneDeep(beaconSchema)
7
+
8
+ schema.proximity = {
9
+ type: String,
10
+ default: BeaconEnum.FAR,
11
+ enum: [BeaconEnum.NEAR, 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.6",
3
+ "version": "2.0.7-alpha.2",
4
4
  "description": "",
5
5
  "main": "Models.js",
6
6
  "scripts": {
@@ -28,6 +28,7 @@
28
28
  },
29
29
  "dependencies": {
30
30
  "@bluedot-innovation/enums": "2.0.2",
31
+ "lodash.clonedeep": "^4.5.0",
31
32
  "mongoose": "^4.13.9",
32
33
  "mongoose-error-helper": "0.0.2",
33
34
  "mongoose-json-patch": "^1.1.1",