@bluedot-innovation/models 2.0.0-alpha1 → 2.0.0-beta.1

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.
Files changed (117) hide show
  1. package/.eslintrc.js +6 -0
  2. package/.gitlab-ci.yml +43 -0
  3. package/.npmignore +3 -0
  4. package/.nyc_output/295801a153bad60b994d5c6b5a8016d9.json +1 -0
  5. package/.nyc_output/2963e30f6030a94b16dd86e7b5594ebe.json +1 -0
  6. package/.nyc_output/5fc62324d665599db6649363a937708e.json +1 -0
  7. package/.nyc_output/95eec4b77e4566b36a6300f0cf8bea0b.json +1 -0
  8. package/Models.js +36 -10
  9. package/README.MD +36 -0
  10. package/__tests__/action/message/messageAction.data.json +5 -0
  11. package/__tests__/action/message/messageAction.rules.json +3 -0
  12. package/__tests__/action/message/messageAction.spec.js +61 -0
  13. package/__tests__/action/url/urlAction.data.json +4 -0
  14. package/__tests__/action/url/urlAction.rules.json +3 -0
  15. package/__tests__/action/url/urlAction.spec.js +62 -0
  16. package/__tests__/dailyStats/checkDailyStats.js +30 -0
  17. package/__tests__/filter/beacon/beaconFilter.data.json +1 -0
  18. package/__tests__/filter/beacon/beaconFilter.rules.json +3 -0
  19. package/__tests__/filter/beacon/beaconFilter.spec.js +1 -0
  20. package/__tests__/filter/bearing/bearingFilter.data.json +5 -0
  21. package/__tests__/filter/bearing/bearingFilter.rules.json +3 -0
  22. package/__tests__/filter/bearing/bearingFilter.spec.js +95 -0
  23. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.data.json +5 -0
  24. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.rules.json +3 -0
  25. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.spec.js +62 -0
  26. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.data.json +5 -0
  27. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.rules.json +3 -0
  28. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.spec.js +62 -0
  29. package/__tests__/filter/speed/speedFilter.data.json +5 -0
  30. package/__tests__/filter/speed/speedFilter.rules.json +3 -0
  31. package/__tests__/filter/speed/speedFilter.spec.js +73 -0
  32. package/__tests__/filter/timeOfDayRange/timeOfDayRange.data.json +5 -0
  33. package/__tests__/filter/timeOfDayRange/timeOfDayRange.rules.json +3 -0
  34. package/__tests__/filter/timeOfDayRange/timeOfDayRange.spec.js +73 -0
  35. package/__tests__/geofeature/beacon/beacon.data.json +12 -0
  36. package/__tests__/geofeature/beacon/beacon.rules.json +13 -0
  37. package/__tests__/geofeature/beacon/beacon.spec.js +95 -0
  38. package/__tests__/geofeature/boundingBox/boundingBox.data.json +12 -0
  39. package/__tests__/geofeature/boundingBox/boundingBox.rules.json +3 -0
  40. package/__tests__/geofeature/boundingBox/boundingBox.spec.js +61 -0
  41. package/__tests__/geofeature/circle/circle.data.json +9 -0
  42. package/__tests__/geofeature/circle/circle.rules.json +3 -0
  43. package/__tests__/geofeature/circle/circle.spec.js +62 -0
  44. package/__tests__/geofeature/polygon/polygon.data.json +46 -0
  45. package/__tests__/geofeature/polygon/polygon.rules.json +3 -0
  46. package/__tests__/geofeature/polygon/polygon.spec.js +61 -0
  47. package/__tests__/geofeature/polyline/polyline.data.json +46 -0
  48. package/__tests__/geofeature/polyline/polyline.rules.json +3 -0
  49. package/__tests__/geofeature/polyline/polyline.spec.js +61 -0
  50. package/__tests__/monthlyStats/monthlyStats.data.json +29 -0
  51. package/__tests__/monthlyStats/monthlyStats.spec.js +40 -0
  52. package/__tests__/zone/zone.action.spec.js +50 -0
  53. package/__tests__/zone/zone.data.json +154 -0
  54. package/__tests__/zone/zone.filter.spec.js +50 -0
  55. package/__tests__/zone/zone.geofeatures.spec.js +74 -0
  56. package/__tests__/zone/zone.spec.js +98 -0
  57. package/models/AdminPortalUser.js +10 -11
  58. package/models/AdminUser.js +6 -5
  59. package/models/Application.js +31 -30
  60. package/models/Beacon.js +92 -78
  61. package/models/BeaconFilter.js +28 -12
  62. package/models/BearingFilter.js +46 -23
  63. package/models/BoundingBox.js +36 -20
  64. package/models/CalendarDateRangeFilter.js +34 -19
  65. package/models/Circle.js +33 -18
  66. package/models/Contract.js +37 -38
  67. package/models/Customer.js +31 -31
  68. package/models/CustomerLogin.js +9 -10
  69. package/models/DBEvent.js +13 -14
  70. package/models/DailyStats.js +28 -0
  71. package/models/DeviceRulesRequest.js +27 -28
  72. package/models/Fence.js +12 -13
  73. package/models/GeoFence.js +12 -14
  74. package/models/Geofeature.js +16 -18
  75. package/models/MessageAction.js +31 -16
  76. package/models/MonthlyStats.js +39 -0
  77. package/models/NotificationLogEntry.js +7 -8
  78. package/models/POILocation.js +6 -7
  79. package/models/POILookup.js +8 -9
  80. package/models/POIResult.js +7 -8
  81. package/models/PartnerCustomer.js +12 -13
  82. package/models/PartnerPasswordReset.js +8 -9
  83. package/models/PartnerUser.js +10 -11
  84. package/models/Partners.js +11 -12
  85. package/models/PercentageCrossedFilter.js +30 -15
  86. package/models/Polygon.js +34 -19
  87. package/models/Polyline.js +35 -19
  88. package/models/RuleRequestAggregation.js +14 -15
  89. package/models/SimpleCheckInZone.js +21 -21
  90. package/models/SingleUseToken.js +7 -8
  91. package/models/SpeedFilter.js +39 -19
  92. package/models/TestDevice.js +11 -12
  93. package/models/TestDeviceCluster.js +9 -10
  94. package/models/TestInstance.js +9 -10
  95. package/models/TestScenario.js +9 -10
  96. package/models/TimeOfDayRange.js +16 -16
  97. package/models/TimeOfDayRangeFilter.js +36 -18
  98. package/models/UrlAction.js +54 -0
  99. package/models/Zone.js +85 -273
  100. package/models/ZoneUIState.js +18 -18
  101. package/package-lock.json +3503 -0
  102. package/package.json +20 -8
  103. package/schemas/Point.js +10 -13
  104. package/__tests__/zone/checkActions.js +0 -64
  105. package/__tests__/zone/checkAppId.js +0 -41
  106. package/__tests__/zone/checkBeacon.js +0 -46
  107. package/__tests__/zone/checkBearingFitler.js +0 -48
  108. package/__tests__/zone/checkBoundingBox.js +0 -44
  109. package/__tests__/zone/checkCalendarDateRangeFilterFitler.js +0 -48
  110. package/__tests__/zone/checkCircle.js +0 -41
  111. package/__tests__/zone/checkMRT.js +0 -46
  112. package/__tests__/zone/checkPercentageCrossedFitler.js +0 -48
  113. package/__tests__/zone/checkPolygon.js +0 -78
  114. package/__tests__/zone/checkPolyline.js +0 -78
  115. package/__tests__/zone/checkSpeedFitler.js +0 -48
  116. package/__tests__/zone/checkTimeOfDayRangeFitler.js +0 -48
  117. package/models/URLAction.js +0 -34
@@ -0,0 +1,50 @@
1
+ let mongoose = require('mongoose')
2
+
3
+ mongoose.Promise = global.Promise
4
+
5
+ let ZoneModel = require('../../models/Zone').Zone(mongoose)
6
+ let testCase = require('mocha').describe
7
+ let assertions = require('mocha').it
8
+ let chai = require('chai')
9
+ let assert = chai.assert
10
+ let mocha = require('mocha')
11
+ let beforeEach = mocha.beforeEach
12
+
13
+ let zone
14
+
15
+ beforeEach(() => {
16
+ zone = JSON.parse(JSON.stringify(require('./zone.data.json')))
17
+ // remove actions as it's not tested
18
+ delete zone.actions
19
+ // remove all but 1 geofeatures as geofeatures are required
20
+ zone.geofeatures = zone.geofeatures.filter(x => x.type.match(/circle/i))
21
+ // remove customData
22
+ delete zone.customData
23
+ })
24
+
25
+ testCase('Zone - Filter', () => {
26
+ testCase('Valid Zone - Filter', () => {
27
+ assertions('should not throw an error when a valid filter is instantiated within a zone', (done) => {
28
+ let Zone = new ZoneModel(zone)
29
+ Zone.validate((err, res) => {
30
+ assert.notExists(res)
31
+ assert(err === null, 'err equals null')
32
+ done()
33
+ })
34
+ })
35
+ })
36
+
37
+ testCase('Invalid Zone - Filter', () => {
38
+ assertions('should throw an error when an invalid filter is instantiated within a zone', (done) => {
39
+ delete zone.filters[0].startDate
40
+ let Zone = new ZoneModel(zone)
41
+ Zone.validate((err, res) => {
42
+ assert.exists(err, 'err object should exist')
43
+ assert.isObject(err)
44
+ assert('filters.0.startDate' in err.errors)
45
+ assert.notNestedProperty(err, `errors.geofeatures`, 'error should have a url property')
46
+ done()
47
+ })
48
+ })
49
+ })
50
+ })
@@ -0,0 +1,74 @@
1
+ let mongoose = require('mongoose')
2
+
3
+ mongoose.Promise = global.Promise
4
+
5
+ let ZoneModel = require('../../models/Zone').Zone(mongoose)
6
+ let testCase = require('mocha').describe
7
+ let assertions = require('mocha').it
8
+ let chai = require('chai')
9
+ let assert = chai.assert
10
+ let mocha = require('mocha')
11
+ let beforeEach = mocha.beforeEach
12
+
13
+ let zone
14
+
15
+ beforeEach(() => {
16
+ zone = JSON.parse(JSON.stringify(require('./zone.data.json')))
17
+ // remove filters as it's not tested
18
+ delete zone.filters
19
+
20
+ // geofeatures are tested individually so we only need to try one in Zones' test
21
+ zone.geofeatures = zone.geofeatures.filter(x => x.type.match(/beacon/i))
22
+
23
+ // remove customData
24
+ delete zone.customData
25
+
26
+ // remove actions
27
+ delete zone.actions
28
+ })
29
+
30
+ testCase('Zone - Action', () => {
31
+ testCase('Valid Zone - Action', () => {
32
+ assertions('should not throw an error when a valid geofeature is instantiated within a zone', (done) => {
33
+ let Zone = new ZoneModel(zone)
34
+ Zone.validate((err, res) => {
35
+ assert.notExists(res)
36
+ assert(err === null, 'err equals null')
37
+ done()
38
+ })
39
+ })
40
+ })
41
+
42
+ testCase('Invalid Zone - Action', () => {
43
+ assertions('should throw an error when an invalid geofeature is instantiated within a zone', (done) => {
44
+ delete zone.geofeatures[0].name
45
+ let Zone = new ZoneModel(zone)
46
+ Zone.validate((err, res) => {
47
+ assert.exists(err, 'err object should exist')
48
+ assert.isObject(err)
49
+ assert('geofeatures.0.name' in err.errors)
50
+ done()
51
+ })
52
+ })
53
+ assertions('should throw an error when an invalid geofeature (complex validation) is instantiated within a zone', (done) => {
54
+ delete zone.geofeatures[0].minor
55
+ let Zone = new ZoneModel(zone)
56
+ Zone.validate((err, res) => {
57
+ assert.exists(err, 'err object should exist')
58
+ assert.isObject(err)
59
+ assert('geofeatures.0.beaconType' in err.errors)
60
+ done()
61
+ })
62
+ })
63
+ assertions('should throw an error when an no geofeature is instantiated within a zone', (done) => {
64
+ zone.geofeatures = []
65
+ let Zone = new ZoneModel(zone)
66
+ Zone.validate((err, res) => {
67
+ assert.exists(err, 'err object should exist')
68
+ assert.isObject(err)
69
+ assert('geofeatures' in err.errors)
70
+ done()
71
+ })
72
+ })
73
+ })
74
+ })
@@ -0,0 +1,98 @@
1
+ let mongoose = require('mongoose')
2
+
3
+ mongoose.Promise = global.Promise
4
+
5
+ let ZoneModel = require('../../models/Zone').Zone(mongoose)
6
+ let testCase = require('mocha').describe
7
+ let assertions = require('mocha').it
8
+ let chai = require('chai')
9
+ let assert = chai.assert
10
+ let mocha = require('mocha')
11
+ let beforeEach = mocha.beforeEach
12
+
13
+ let zone
14
+
15
+ beforeEach(() => {
16
+ zone = JSON.parse(JSON.stringify(require('./zone.data.json')))
17
+ })
18
+
19
+ testCase('Zone', () => {
20
+ testCase('Valid Zone ', () => {
21
+ assertions('should validate a valid zone ', (done) => {
22
+ let Zone = new ZoneModel(zone)
23
+ Zone.validate((err, res) => {
24
+ assert.notExists(res)
25
+ assert(err === null, 'err equals null')
26
+ done()
27
+ })
28
+ })
29
+ assertions('should instantiate a circle', (done) => {
30
+ zone.geofeatures = zone.geofeatures.filter(gf => gf.type.match(/^circle$/))
31
+ let Zone = new ZoneModel(zone)
32
+ Zone.validate((err, res) => {
33
+ assert.notExists(res)
34
+ assert(err === null, 'err equals null')
35
+ done()
36
+ })
37
+ })
38
+ assertions('should instantiate a bounding box', (done) => {
39
+ zone.geofeatures = zone.geofeatures.filter(gf => gf.type.match(/^boundingBox$/))
40
+ let Zone = new ZoneModel(zone)
41
+ Zone.validate((err, res) => {
42
+ assert.notExists(res)
43
+ assert(err === null, 'err equals null')
44
+ done()
45
+ })
46
+ })
47
+ assertions('should instantiate a polygon', (done) => {
48
+ zone.geofeatures = zone.geofeatures.filter(gf => gf.type.match(/^polygon$/))
49
+ let Zone = new ZoneModel(zone)
50
+ Zone.validate((err, res) => {
51
+ assert.notExists(res)
52
+ assert(err === null, 'err equals null')
53
+ done()
54
+ })
55
+ })
56
+ assertions('should instantiate a polyline', (done) => {
57
+ zone.geofeatures = zone.geofeatures.filter(gf => gf.type.match(/^polyline$/))
58
+ let Zone = new ZoneModel(zone)
59
+ Zone.validate((err, res) => {
60
+ assert.notExists(res)
61
+ assert(err === null, 'err equals null')
62
+ done()
63
+ })
64
+ })
65
+ })
66
+
67
+ testCase('Invalid Zone ', () => {
68
+ assertions('should throw an error when validating an invalid zone ', (done) => {
69
+ delete zone.name
70
+ let Zone = new ZoneModel(zone)
71
+ Zone.validate((err, res) => {
72
+ assert.exists(err, 'err object should exist')
73
+ assert.isObject(err)
74
+ done()
75
+ })
76
+ })
77
+ assertions('should throw an error when action is invalid', (done) => {
78
+ delete zone.actions[1].url
79
+ let Zone = new ZoneModel(zone)
80
+ Zone.validate((err, res) => {
81
+ assert.exists(err, 'err object should exist')
82
+ assert.isObject(err)
83
+ assert('actions.1.url' in err.errors, `errors should have a 'actions.1.url' property`)
84
+ done()
85
+ })
86
+ })
87
+ assertions('should throw an error when a filter is invalid', (done) => {
88
+ delete zone.filters[0].startDate
89
+ let Zone = new ZoneModel(zone)
90
+ Zone.validate((err, res) => {
91
+ assert.exists(err, 'err object should exist')
92
+ assert.isObject(err)
93
+ assert('filters.0.startDate' in err.errors, `errors should have a 'filters.0.startDate' property`)
94
+ done()
95
+ })
96
+ })
97
+ })
98
+ })
@@ -2,25 +2,24 @@
2
2
  * Copyright : Bluedot Innovations.
3
3
  */
4
4
 
5
- var mongoose = require('mongoose');
6
- var Enums = require('@bluedot-innovation/enums');
5
+ let mongoose = require('mongoose')
6
+ let Enums = require('@bluedot-innovation/enums')
7
7
 
8
- var AdminPortalUser = mongoose.model('AdminPortalUser', new mongoose.Schema(
8
+ let AdminPortalUser = mongoose.model('AdminPortalUser', new mongoose.Schema(
9
9
  {
10
10
  emailAddress: String,
11
11
  password: String,
12
12
  firstName: String,
13
13
  lastName: String,
14
- state: {type:String, default: Enums.StateEnum.active},
15
- "creationTime" : {type: Date, default: Date.now},
16
- "dataSource" : {type:String, select: false, default : 'AdminPortal'},
14
+ state: {type: String, default: Enums.StateEnum.active},
15
+ 'creationTime': {type: Date, default: Date.now},
16
+ 'dataSource': {type: String, select: false, default: 'AdminPortal'},
17
17
  adminId: String,
18
18
  secret: String
19
19
  },
20
20
  {
21
- collection : 'adminPortalUser'
22
- }
23
- )
24
- );
21
+ collection: 'adminPortalUser'
22
+ })
23
+ )
25
24
 
26
- module.exports = AdminPortalUser;
25
+ module.exports = AdminPortalUser
@@ -3,8 +3,9 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- var mongoose = require('mongoose');
7
- var AdminUser = mongoose.model('AdminUser', new mongoose.Schema({},
8
- { collection : 'AdminUser' }
9
- ));
10
- module.exports = AdminUser;
6
+ let mongoose = require('mongoose')
7
+ let AdminUser = mongoose.model('AdminUser', new mongoose.Schema({},
8
+ { collection: 'AdminUser' }
9
+ ))
10
+
11
+ module.exports = AdminUser
@@ -3,36 +3,37 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- var mongoose = require('mongoose');
7
- var Enums = require('@bluedot-innovation/enums');
8
- Schema = mongoose.Schema;
9
6
 
10
- var ApplicationSchema = new mongoose.Schema({
11
- _id : {type: String},
12
- _class : {type: String, default:"au.com.bluedot.application.model.client.Application"},
13
- state : {type: String, default : Enums.StateEnum.active, select: false},
14
- nextRuleUpdateInterval: {type: Number, select: false},
15
- nextRuleUpdateIntervalFormatted: {type:String, required: true},
16
- lastUpdateTime: {type: Date, select: false},
17
- creationTime: {type: Date, select: false},
18
- "administrator" : {type: String, select: false},
19
- enableDataAnonymisation: {type: Boolean, select: false},
20
- apiKey: String,
21
- dataSource: {type:String, select: false, default : 'openApi'},
22
- name: {type: String},
23
- packageName: {type: String},
24
- customerId : String,
25
- firebaseApiKey: String,
26
- lastPushSync: Date,
27
- webhook : {
28
- url: String,
29
- enabled: Boolean,
30
- params: {}
31
- },
32
- configurationParameters:{type: Schema.Types.Mixed, default: null}
7
+ let mongoose = require('mongoose')
8
+ let Enums = require('@bluedot-innovation/enums')
9
+ let Schema = mongoose.Schema
10
+
11
+ let ApplicationSchema = new mongoose.Schema({
12
+ _id: {type: String},
13
+ _class: {type: String, default: 'au.com.bluedot.application.model.client.Application'},
14
+ state: {type: String, default: Enums.StateEnum.active, select: false},
15
+ nextRuleUpdateInterval: {type: Number, select: false},
16
+ nextRuleUpdateIntervalFormatted: {type: String, required: true},
17
+ lastUpdateTime: {type: Date, select: false},
18
+ creationTime: {type: Date, select: false},
19
+ 'administrator': {type: String, select: false},
20
+ enableDataAnonymisation: {type: Boolean, select: false},
21
+ apiKey: String,
22
+ dataSource: {type: String, select: false, default: 'openApi'},
23
+ name: {type: String},
24
+ packageName: {type: String},
25
+ customerId: String,
26
+ firebaseApiKey: String,
27
+ lastPushSync: Date,
28
+ webhook: {
29
+ url: String,
30
+ enabled: Boolean,
31
+ params: {}
33
32
  },
34
- { collection : 'application' }
35
- );
36
- var Application = mongoose.model('Application', ApplicationSchema);
33
+ configurationParameters: {type: Schema.Types.Mixed, default: null}
34
+ },
35
+ {collection: 'application'})
36
+
37
+ let Application = mongoose.model('Application', ApplicationSchema)
37
38
 
38
- module.exports = Application;
39
+ module.exports = Application
package/models/Beacon.js CHANGED
@@ -1,93 +1,107 @@
1
- let mongoose = require('mongoose');
2
- let StateEnum = require('@bluedot-innovation/enums').StateEnum;
3
- let uuidv1 = require('uuid/v1');
4
- let Point = require('../schemas/Point');
1
+ let mongoose = require('mongoose')
2
+ let StateEnum = require('@bluedot-innovation/enums').StateEnum
3
+ let Point = require('../schemas/Point')
4
+ let uuidv4 = require('uuid/v4')
5
5
 
6
- let BeaconSchema = new mongoose.Schema({
7
- guid : { type: String, default: uuidv1 },
8
- type : { type: String },
9
- name : { type: String, required: [true, 'name is required. '] },
10
- description : { type: String, default: '' },
11
- creationTime : { type: Date, default: Date.now },
12
- lastUpdateTime : { type: Date, default: Date.now },
13
- state : { type: String, default : StateEnum.active, select: false },
14
- major : { type: Number },
15
- minor : { type: Number },
16
- txPower : { type: Number, default: 1 },
17
- macAddress : { type: String },
18
- proximityUUID : { type: String },
19
- beaconType : { type: String },
20
- location : { type: Point },
21
- proximity : { type: String, default: 'Far', validate: validateBeacons }
6
+ let schema = {
7
+ guid: {type: String, default: uuidv4},
8
+ name: {type: String, required: [true, 'name is required. ']},
9
+ longitude: {
10
+ type: Number,
11
+ required: true,
12
+ validate: [{validator: validateLongitude, msg: 'Longitude is required (insert format here)'}]
22
13
  },
23
- {
24
- _id : false,
25
- versionKey : false
26
- }
27
- );
14
+ latitude: {
15
+ type: Number,
16
+ required: true,
17
+ validate: [{validator: validateLatitude, msg: 'Latitude is required (insert format here)'}]
18
+ },
19
+ description: {type: String, default: ''},
20
+ lastUpdateTime: {type: Date},
21
+ state: {type: String, default: StateEnum.active},
22
+ major: {type: Number, validate: [{validator: validateMajorMinor, msg: 'Major needs to be within range(1-65535)'}]},
23
+ minor: {type: Number, validate: [{validator: validateMajorMinor, msg: 'Minor needs to be within range(1-65535)'}]},
24
+ txPower: {type: Number},
25
+ macAddress: {type: String},
26
+ proximityUUID: {type: String},
27
+ beaconType: {
28
+ type: String,
29
+ required: true,
30
+ validate: {
31
+ isAsync: true,
32
+ validator: validateBeaconType,
33
+ msg: 'Async validation. Not used'
34
+ }
35
+ },
36
+ location: {type: Point},
37
+ proximity: {type: String, default: 'Far'}
38
+ }
28
39
 
29
- function validateBeacons() {
30
- let beaconType = this.beaconType;
31
- let major = this.major;
32
- let minor = this.minor;
33
- let macAddress = this.macAddress;
34
- let proximityUUID = this.proximityUUID;
35
- //let proximity = this.proximity;
40
+ let BeaconSchema = new mongoose.Schema(schema)
36
41
 
37
- let errorList = '';
42
+ BeaconSchema.add({
43
+ type:
44
+ {type: String, required: true}
45
+ })
38
46
 
39
- if(!beaconType) {
40
- errorList = errorList + "Beacon should have a beaconType field. ";
41
- } else {
42
- if(beaconType == 'iOS' || beaconType == 'both') {
43
- if(!proximityUUID) {
44
- errorList = errorList + "Beacon should have a proximityUUID field. ";
45
- }
47
+ // mongoose validator helper plugin
48
+ BeaconSchema.post('validate', function (doc) {
49
+ console.debug('Beacon Schema post validate hook')
50
+ this.lastUpdateTime = Date.now()
51
+ Object.assign(this.errors || {}, this.errors || {}, this.customErrors)
52
+ })
46
53
 
47
- if(!proximityUUID) {
48
- errorList = errorList + "Beacon should have a proximityUUID field. ";
49
- } else {
50
- let proximityRegex = new RegExp("^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$");
51
- if(!proximityRegex.test(proximityUUID)) {
52
- errorList = errorList + proximityUUID + ' is not a valid ID.';
53
- }
54
- }
54
+ function validateMajorMinor (v) {
55
+ 'use strict'
56
+ return v >= 1 && v <= 65535
57
+ }
55
58
 
56
- if(!major) {
57
- errorList = errorList + "Beacon should have a major field. ";
58
- } else if (major < 0 || major > 65535) {
59
- errorList = errorList + "Beacon major should be within the range 0 to 65535. ";
60
- }
59
+ function validateLatitude (longitude) {
60
+ 'use strict'
61
+ let regex = new RegExp(/^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?)$/gi)
62
+ return regex.test(longitude)
63
+ }
61
64
 
62
- if(!minor) {
63
- errorList = errorList + "Beacon should have a minor field. ";
64
- } else if (minor < 0 || minor > 65535) {
65
- errorList = errorList + "Beacon minor should be within the range 0 to 65535. ";
66
- }
67
- }
65
+ function validateLongitude (latitude) {
66
+ 'use strict'
67
+ let regex = new RegExp(/^[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/gi)
68
+ return regex.test(latitude)
69
+ }
68
70
 
69
- if(beaconType == 'android' || beaconType == 'both') {
70
- if(!macAddress) {
71
- errorList = errorList + "Beacon should have macAddress field. ";
72
- } else {
73
- let macAddressRegex = new RegExp(/^([0-9a-f]{1,2}[\.:-]){5}([0-9a-f]{1,2})$/i);
74
- if(!macAddressRegex.test(macAddress)) {
75
- errorList = errorList + macAddress + ' is not a valid macAddress. ';
76
- }
77
- }
78
- }
79
- }
71
+ function validateBeaconType (v, cb) {
72
+ 'use strict'
73
+ let magicCallback = cb
74
+ const beaconType = v
75
+ const minor = this.minor
76
+ const major = this.major
77
+ const macAddress = this.macAddress
78
+ const txPower = this.txPower
80
79
 
81
- /*if(proximity != 'Far' && proximity != 'Near' || proximity != 'Immediate'){
82
- errorList = errorList + "";
83
- }*/
80
+ let androidRegex = new RegExp(/(android)/ig)
81
+ let iosRegex = new RegExp(/(ios)/ig)
82
+ let bothRegex = new RegExp(/(both)/ig)
84
83
 
85
- if(errorList != '') {
86
- console.log(errorList);
87
- throw new Error(errorList);
84
+ if (androidRegex.test(beaconType)) {
85
+ magicCallback((!!macAddress && !!txPower), 'Beacon type `Android` must have both mac address and tx power values')
86
+ } else if (iosRegex.test(beaconType)) {
87
+ magicCallback((!!minor && !!major), 'Beacon type `IOS` must have both minor and major values')
88
+ } else if (bothRegex.test(beaconType)) {
89
+ magicCallback((!!minor && !!major && !!txPower && !!macAddress), 'Beacon type `Both` must have all of minor, major, tx power, and mac address values')
90
+ } else {
91
+ magicCallback(true)
88
92
  }
89
93
  }
90
94
 
91
- let Beacon = mongoose.model('Beacon', BeaconSchema);
95
+ // optional mongoose
96
+ let model = (mongooseInstance) => {
97
+ let Beacon
98
+ if (mongooseInstance) {
99
+ Beacon = mongooseInstance.model('Beacon', BeaconSchema)
100
+ } else {
101
+ Beacon = mongoose.model('Beacon', BeaconSchema)
102
+ }
92
103
 
93
- module.exports = Beacon;
104
+ return Beacon
105
+ }
106
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
107
+ module.exports = { Beacon: model, Schema: BeaconSchema, beaconSchema: schema }
@@ -3,21 +3,37 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- var mongoose = require('mongoose');
7
- Schema = mongoose.Schema;
6
+ let mongoose = require('mongoose')
8
7
 
9
- var BeaconFilterSchema = new mongoose.Schema(
10
- {
11
- "_class" : {type:String, default : "au.com.bluedot.application.spring.filter.spatial.BeaconFilter"},
12
- "beacon" : {},
13
- "guid" : String,
14
- "type" : {type:String, default: "beacon"}
15
- },
8
+ let schema = {
9
+ '_class': {type: String, default: 'au.com.bluedot.application.spring.filter.spatial.BeaconFilter'},
10
+ 'beacon': {},
11
+ 'guid': String,
12
+ 'type': {type: String, default: 'beacon'}
13
+ }
14
+
15
+ let BeaconFilterSchema = new mongoose.Schema(
16
+ schema,
16
17
  {
17
18
  _id: false
18
19
  }
19
- );
20
+ )
20
21
 
21
- var BeaconFilter = mongoose.model('BeaconFilter', BeaconFilterSchema);
22
+ BeaconFilterSchema.add({
23
+ type:
24
+ {type: String, required: true}
25
+ })
26
+
27
+ // optional mongoose
28
+ let model = (mongooseInstance) => {
29
+ let BeaconFilter
30
+ if (mongooseInstance) {
31
+ BeaconFilter = mongooseInstance.model('BeaconFilter', BeaconFilterSchema)
32
+ } else {
33
+ BeaconFilter = mongoose.model('BeaconFilter', BeaconFilterSchema)
34
+ }
22
35
 
23
- module.exports = BeaconFilter;
36
+ return BeaconFilter
37
+ }
38
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
39
+ module.exports = { BeaconFilter: model, Schema: BeaconFilterSchema, beaconFilterSchema: schema }