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

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 (130) hide show
  1. package/.eslintrc.js +6 -0
  2. package/.gitlab-ci.yml +43 -0
  3. package/.nyc_output/b3865a46e2cec635045d586cfc79e5c6.json +1 -0
  4. package/.nyc_output/d9020767349457a911ef2b431e357310.json +1 -0
  5. package/Models.js +48 -10
  6. package/README.MD +36 -0
  7. package/__tests__/account/account.data.json +12 -0
  8. package/__tests__/account/account.rules.js +8 -0
  9. package/__tests__/account/account.spec.js +83 -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 +74 -0
  16. package/__tests__/dailyStats/checkDailyStats.js +31 -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 +62 -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 +71 -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 +70 -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 +70 -0
  50. package/__tests__/monthlyStats/monthlyStats.data.json +29 -0
  51. package/__tests__/monthlyStats/monthlyStats.spec.js +68 -0
  52. package/__tests__/project/project.data.json +14 -0
  53. package/__tests__/project/project.rules.json +9 -0
  54. package/__tests__/project/project.spec.js +81 -0
  55. package/__tests__/ruleRequestAggregation/ruleRequestAggregation.data.json +8 -0
  56. package/__tests__/ruleRequestAggregation/ruleRequestAggregation.spec.js +69 -0
  57. package/__tests__/user/user.data.js +13 -0
  58. package/__tests__/user/user.rules.js +8 -0
  59. package/__tests__/user/user.spec.js +83 -0
  60. package/__tests__/zone/zone.action.spec.js +50 -0
  61. package/__tests__/zone/zone.data.json +156 -0
  62. package/__tests__/zone/zone.filter.spec.js +50 -0
  63. package/__tests__/zone/zone.geofeatures.spec.js +74 -0
  64. package/__tests__/zone/zone.spec.js +107 -0
  65. package/helpers.js +14 -0
  66. package/models/Account.js +49 -0
  67. package/models/AdminPortalUser.js +10 -11
  68. package/models/Beacon.js +92 -78
  69. package/models/BeaconFilter.js +28 -12
  70. package/models/BearingFilter.js +46 -23
  71. package/models/BoundingBox.js +37 -20
  72. package/models/CalendarDateRangeFilter.js +34 -19
  73. package/models/Circle.js +34 -18
  74. package/models/Contract.js +37 -38
  75. package/models/CustomerLogin.js +9 -10
  76. package/models/DBEvent.js +13 -14
  77. package/models/DailyStats.js +28 -0
  78. package/models/DeviceRulesRequest.js +27 -28
  79. package/models/Fence.js +12 -13
  80. package/models/GeoFence.js +12 -14
  81. package/models/Geofeature.js +16 -18
  82. package/models/MessageAction.js +31 -16
  83. package/models/MonthlyStats.js +44 -0
  84. package/models/NotificationLogEntry.js +7 -8
  85. package/models/POILocation.js +6 -7
  86. package/models/POILookup.js +8 -9
  87. package/models/POIResult.js +7 -8
  88. package/models/PartnerCustomer.js +12 -13
  89. package/models/PartnerPasswordReset.js +8 -9
  90. package/models/PartnerUser.js +10 -11
  91. package/models/Partners.js +11 -12
  92. package/models/PercentageCrossedFilter.js +30 -15
  93. package/models/Polygon.js +35 -19
  94. package/models/Polyline.js +35 -19
  95. package/models/Project.js +54 -0
  96. package/models/RuleRequestAggregation.js +33 -15
  97. package/models/SimpleCheckInZone.js +21 -21
  98. package/models/SingleUseToken.js +7 -8
  99. package/models/SpeedFilter.js +39 -19
  100. package/models/TestDevice.js +11 -12
  101. package/models/TestDeviceCluster.js +9 -10
  102. package/models/TestInstance.js +9 -10
  103. package/models/TestScenario.js +9 -10
  104. package/models/TimeOfDayRange.js +16 -16
  105. package/models/TimeOfDayRangeFilter.js +36 -18
  106. package/models/UrlAction.js +54 -0
  107. package/models/User.js +59 -0
  108. package/models/Zone.js +85 -273
  109. package/models/ZoneUIState.js +18 -18
  110. package/package.json +20 -8
  111. package/schemas/Point.js +10 -13
  112. package/schemas/Webhook.js +22 -0
  113. package/yarn.lock +2796 -0
  114. package/__tests__/zone/checkActions.js +0 -64
  115. package/__tests__/zone/checkAppId.js +0 -41
  116. package/__tests__/zone/checkBeacon.js +0 -46
  117. package/__tests__/zone/checkBearingFitler.js +0 -48
  118. package/__tests__/zone/checkBoundingBox.js +0 -44
  119. package/__tests__/zone/checkCalendarDateRangeFilterFitler.js +0 -48
  120. package/__tests__/zone/checkCircle.js +0 -41
  121. package/__tests__/zone/checkMRT.js +0 -46
  122. package/__tests__/zone/checkPercentageCrossedFitler.js +0 -48
  123. package/__tests__/zone/checkPolygon.js +0 -78
  124. package/__tests__/zone/checkPolyline.js +0 -78
  125. package/__tests__/zone/checkSpeedFitler.js +0 -48
  126. package/__tests__/zone/checkTimeOfDayRangeFitler.js +0 -48
  127. package/models/AdminUser.js +0 -10
  128. package/models/Application.js +0 -38
  129. package/models/Customer.js +0 -38
  130. package/models/URLAction.js +0 -34
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 = { Model: 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 = { Model: model, Schema: BeaconFilterSchema, beaconFilterSchema: schema }
@@ -1,36 +1,59 @@
1
- let mongoose = require('mongoose');
2
- let uuidv1 = require('uuid/v1');
3
-
4
- let BearingSchema = new mongoose.Schema({
5
- guid : { type: String, default: uuidv1 },
6
- type : { type: String, required: true, default: "bearingFilter" },
7
- fromAngle : { type: Number, required: [true, 'fromAngle is required. '], min: 0, max: 359 },
8
- toAngle : { type: Number, required: [true, 'fromAngle is required. '], min: 0, max: 359, validate: validateAngles }
9
- },
1
+ let mongoose = require('mongoose')
2
+ let uuidv4 = require('uuid/v4')
3
+
4
+ const schema = {
5
+ guid: {type: String, default: uuidv4},
6
+ fromAngle: {type: Number, required: [true, 'fromAngle is required. '], min: 0, max: 359},
7
+ toAngle: {type: Number, required: true, min: 0, max: 359, validate: {isAsync: true, validator: validateAngles, msg: 'default error message'}}
8
+ }
9
+
10
+ const BearingFilterSchema = new mongoose.Schema(
11
+ schema,
10
12
  {
11
- _id : false,
12
- versionKey : false
13
+ _id: false,
14
+ versionKey: false
15
+ })
16
+
17
+ BearingFilterSchema.add({
18
+ type:
19
+ {type: String, required: true}
20
+ })
21
+
22
+ function validateAngles (toAngle, cb) {
23
+ let magicCallback = cb
24
+ let fromAngle = this.fromAngle
25
+
26
+ if (!toAngle && toAngle !== 0) {
27
+ return magicCallback(false, 'toAngle is required')
13
28
  }
14
- );
15
29
 
16
- function validateAngles(toAngle){
17
- let fromAngle = this.fromAngle;
30
+ if (toAngle === fromAngle) {
31
+ return magicCallback(false, 'fromAngle and toAngle cannot be the same')
32
+ }
18
33
 
19
34
  if (fromAngle > toAngle) {
20
35
  if ((fromAngle - toAngle) <= 270) {
21
- throw new Error("From Angle and To Angle must best separated by at least 90 degrees in both directions. ");
36
+ return magicCallback(false, 'From Angle and To Angle must best separated by at least 90 degrees in both directions')
22
37
  }
23
- } else if (toAngle > fromAngle) {
38
+ }
39
+ if (toAngle > fromAngle) {
24
40
  if (((toAngle - fromAngle) < 90) || (((toAngle - fromAngle) > 270))) {
25
- throw new Error("From Angle and To Angle must best separated by at least 90 degrees in both directions. ");
41
+ return magicCallback(false, 'From Angle and To Angle must best separated by at least 90 degrees in both directions')
26
42
  }
27
- } else {
28
- throw new Error("fromAngle and toAngle cannot be same. ");
29
43
  }
30
-
44
+ magicCallback(true)
31
45
  }
32
46
 
47
+ // optional mongoose
48
+ let model = (mongooseInstance) => {
49
+ let BearingFilter
50
+ if (mongooseInstance) {
51
+ BearingFilter = mongooseInstance.model('BearingFilter', BearingFilterSchema)
52
+ } else {
53
+ BearingFilter = mongoose.model('BearingFilter', BearingFilterSchema)
54
+ }
33
55
 
34
- let Bearing = mongoose.model('Bearing', BearingSchema);
35
-
36
- module.exports = Bearing;
56
+ return BearingFilter
57
+ }
58
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
59
+ module.exports = { Model: model, Schema: BearingFilterSchema, bearingFilterSchema: schema }
@@ -1,24 +1,41 @@
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 uuidv4 = require('uuid/v4')
4
+ let Point = require('../schemas/Point')
5
5
 
6
- let BoundingBoxSchema = new mongoose.Schema({
7
- guid : { type: String, default: uuidv1 },
8
- type : { type: String, default: "MultiLineString" },
9
- name : { type: String, required: [true, 'name is required. '] },
10
- northEast : { type: Point, required: [true, 'northEast is required. '] },
11
- southWest : { type: Point, required: [true, 'southWest is required. '] },
12
- creationTime : { type: Date, default: Date.now },
13
- lastUpdateTime : { type: Date, default: Date.now },
14
- state : { type: String, default : StateEnum.active, select: false }
15
- },
6
+ const schema = {
7
+ guid: {type: String, default: uuidv4},
8
+ name: {type: String, required: [true, 'name is required. ']},
9
+ color: String,
10
+ northEast: {type: Point, required: [true, 'northEast is required. ']},
11
+ southWest: {type: Point, required: [true, 'southWest is required. ']},
12
+ creationTime: {type: Date, default: Date.now},
13
+ lastUpdateTime: {type: Date, default: Date.now},
14
+ state: {type: String, default: StateEnum.active, select: false}
15
+ }
16
+
17
+ const BoundingBoxSchema = new mongoose.Schema(
18
+ schema,
16
19
  {
17
- _id : false,
18
- versionKey : false
19
- }
20
- );
20
+ _id: false,
21
+ versionKey: false
22
+ })
21
23
 
22
- let BoundingBox = mongoose.model('BoundingBox', BoundingBoxSchema);
24
+ BoundingBoxSchema.add({
25
+ type:
26
+ {type: String, required: true}
27
+ })
28
+
29
+ // optional mongoose
30
+ let model = (mongooseInstance) => {
31
+ let BoundingBox
32
+ if (mongooseInstance) {
33
+ BoundingBox = mongooseInstance.model('BoundingBox', BoundingBoxSchema)
34
+ } else {
35
+ BoundingBox = mongoose.model('BoundingBox', BoundingBoxSchema)
36
+ }
23
37
 
24
- module.exports = BoundingBox;
38
+ return BoundingBox
39
+ }
40
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
41
+ module.exports = { Model: model, Schema: BoundingBoxSchema, boundingBoxSchema: schema }
@@ -1,27 +1,42 @@
1
- let mongoose = require('mongoose');
2
- let uuidv1 = require('uuid/v1');
1
+ let mongoose = require('mongoose')
2
+ let uuidv4 = require('uuid/v4')
3
3
 
4
- let DateFilterSchema = new mongoose.Schema({
5
- guid : { type: String, default: uuidv1 },
6
- type : { type: String, required: true, default: "dateFilter" },
7
- startDate : { type: Date, required: [true, 'startDate is required. '] },
8
- endDate : { type: Date, required: [true, 'endDate is required. '], validate: validateDateRange }
9
- },
4
+ let schema = {
5
+ guid: {type: String, default: uuidv4},
6
+ startDate: {type: Date, required: [true, 'startDate is required. ']},
7
+ endDate: {type: Date, required: [true, 'endDate is required. '], validate: validateDateRange}
8
+ }
9
+ let CalendarDateRangeFilterSchema = new mongoose.Schema(
10
+ schema,
10
11
  {
11
- _id : false,
12
- versionKey : false
13
- }
14
- );
12
+ _id: false,
13
+ versionKey: false
14
+ })
15
+
16
+ CalendarDateRangeFilterSchema.add({
17
+ type:
18
+ {type: String, required: true}
19
+ })
15
20
 
16
- function validateDateRange(endDate){
17
- let startDate = new Date(this.startDate);
18
- endDate = new Date(endDate);
21
+ function validateDateRange (endDate) {
22
+ let startDate = new Date(this.startDate)
23
+ endDate = new Date(endDate)
19
24
 
20
- if(endDate < startDate) {
21
- throw new Error("startDate has to be less than endDate. ");
25
+ if (endDate < startDate) {
26
+ throw new Error('startDate has to be less than endDate. ')
22
27
  }
23
28
  }
24
29
 
25
- let DateFilter = mongoose.model('DateFilter', DateFilterSchema);
30
+ // optional mongoose
31
+ let model = (mongooseInstance) => {
32
+ let CalendarDateRangeFilter
33
+ if (mongooseInstance) {
34
+ CalendarDateRangeFilter = mongooseInstance.model('CalendarDateRange', CalendarDateRangeFilterSchema)
35
+ } else {
36
+ CalendarDateRangeFilter = mongoose.model('CalendarDateRange', CalendarDateRangeFilterSchema)
37
+ }
26
38
 
27
- module.exports = DateFilter;
39
+ return CalendarDateRangeFilter
40
+ }
41
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
42
+ module.exports = { Model: model, Schema: CalendarDateRangeFilterSchema, calendarDateRangeFilterSchema: schema }
package/models/Circle.js CHANGED
@@ -1,25 +1,41 @@
1
- let mongoose = require('mongoose');
2
- let StateEnum = require('@bluedot-innovation/enums').StateEnum;
3
- let Point = require('../schemas/Point');
4
- let uuidv1 = require('uuid/v1');
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 schema = {
7
+ guid: {type: String, default: uuidv4},
8
+ name: {type: String, required: [true, 'name is required. ']},
9
+ color: String,
10
+ radius: {type: Number, required: [true, 'radius is required. '], min: 5},
11
+ center: {type: Point, required: [true, 'center is required. ']},
12
+ creationTime: {type: Date, default: Date.now},
13
+ lastUpdateTime: {type: Date, default: Date.now},
14
+ state: {type: String, default: StateEnum.active, select: false}
15
+ }
6
16
 
7
- let CircleSchema = new mongoose.Schema({
8
- guid : { type: String, default: uuidv1 },
9
- type : { type: String, default: "MultiLineString" },
10
- name : { type: String, required: [true, 'name is required. '] },
11
- radius : { type: Number, required: [true, 'radius is required. '], min: 5 },
12
- center : { type: Point, required: [true, 'center is required. '] },
13
- creationTime : { type: Date, default: Date.now },
14
- lastUpdateTime : { type: Date, default: Date.now },
15
- state : { type: String, default : StateEnum.active, select: false }
16
- },
17
+ let CircleSchema = new mongoose.Schema(
18
+ schema,
17
19
  {
18
20
  _id: false,
19
21
  __v: false
20
- }
21
- );
22
+ })
23
+
24
+ CircleSchema.add({
25
+ type:
26
+ {type: String, required: true}
27
+ })
22
28
 
23
- let Circle = mongoose.model('Circle', CircleSchema);
29
+ // optional mongoose
30
+ let model = (mongooseInstance) => {
31
+ let Circle
32
+ if (mongooseInstance) {
33
+ Circle = mongooseInstance.model('Circle', CircleSchema)
34
+ } else {
35
+ Circle = mongoose.model('Circle', CircleSchema)
36
+ }
24
37
 
25
- module.exports = Circle;
38
+ return Circle
39
+ }
40
+ // Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
41
+ module.exports = { Model: model, Schema: CircleSchema, circleSchema: schema }
@@ -3,43 +3,42 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- var mongoose = require('mongoose');
6
+ let mongoose = require('mongoose')
7
7
 
8
- var Contract = mongoose.model('Contract', new mongoose.Schema(
9
- {
10
- customerId: String,
11
- organisationName: String,
12
- addressLine1: String,
13
- addressLine2: String,
14
- addressCity: String,
15
- addressRegion: String,
16
- addressPostcode: String,
17
- addressCountry: String,
18
- billingFirstName: String,
19
- billingLastName: String,
20
- billingTaxNumber: String,
21
- billingEmail: String,
22
- tradingName: String,
23
- salesforceUrl: String,
24
- startDate : {type: Date, default: Date.now},
25
- endDate : {type: Date, default: Date.now},
26
- frequency : mongoose.Schema.Types.Number,
27
- monthEntries: [],
28
- currency: {type: String, default: "USD"},
29
- currencyRate: Number,
30
- template: String,
31
- addedBy: String,
32
- lastEditedBy: String,
33
- xeroContactId: String,
34
- state: String,
35
- creationTime : {type: Date, default: Date.now},
36
- lastUpdateTime : {type: Date, default: Date.now},
37
- dataSource : {type:String, select: false, default : 'adminPortal'}
38
- },
39
- {
40
- collection : 'contract'
41
- }
42
- )
43
- );
8
+ let Contract = mongoose.model('Contract', new mongoose.Schema(
9
+ {
10
+ customerId: String,
11
+ organisationName: String,
12
+ addressLine1: String,
13
+ addressLine2: String,
14
+ addressCity: String,
15
+ addressRegion: String,
16
+ addressPostcode: String,
17
+ addressCountry: String,
18
+ billingFirstName: String,
19
+ billingLastName: String,
20
+ billingTaxNumber: String,
21
+ billingEmail: String,
22
+ tradingName: String,
23
+ salesforceUrl: String,
24
+ startDate: {type: Date, default: Date.now},
25
+ endDate: {type: Date, default: Date.now},
26
+ frequency: mongoose.Schema.Types.Number,
27
+ monthEntries: [],
28
+ currency: {type: String, default: 'USD'},
29
+ currencyRate: Number,
30
+ template: String,
31
+ addedBy: String,
32
+ lastEditedBy: String,
33
+ xeroContactId: String,
34
+ state: String,
35
+ creationTime: {type: Date, default: Date.now},
36
+ lastUpdateTime: {type: Date, default: Date.now},
37
+ dataSource: {type: String, select: false, default: 'adminPortal'}
38
+ },
39
+ {
40
+ collection: 'contract'
41
+ })
42
+ )
44
43
 
45
- module.exports = Contract;
44
+ module.exports = Contract
@@ -2,8 +2,8 @@
2
2
  * Created by andrewstirling on 20/6/17.
3
3
  */
4
4
 
5
- var mongoose = require('mongoose');
6
- var StateEnum = require('@bluedot-innovation/enums').StateEnum;
5
+ var mongoose = require('mongoose')
6
+ var StateEnum = require('@bluedot-innovation/enums').StateEnum
7
7
 
8
8
  var CustomerLogin = mongoose.model('CustomerLogin', new mongoose.Schema(
9
9
  {
@@ -19,16 +19,15 @@ var CustomerLogin = mongoose.model('CustomerLogin', new mongoose.Schema(
19
19
  integrations: {},
20
20
  resetToken: String,
21
21
  lastLoginTime: Date,
22
- state: {type:String, default: StateEnum.active},
23
- creationTime : {type: Date, default: Date.now},
24
- lastUpdateTime : {type: Date, default: Date.now},
22
+ state: {type: String, default: StateEnum.active},
23
+ creationTime: {type: Date, default: Date.now},
24
+ lastUpdateTime: {type: Date, default: Date.now},
25
25
  createdBy: String,
26
26
  lastUpdatedBy: String
27
27
  },
28
28
  {
29
- collection : 'customerLogin'
30
- }
31
- )
32
- );
29
+ collection: 'customerLogin'
30
+ })
31
+ )
33
32
 
34
- module.exports = CustomerLogin;
33
+ module.exports = CustomerLogin
package/models/DBEvent.js CHANGED
@@ -3,19 +3,18 @@
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 DBEventSchema = new mongoose.Schema({
10
- _class : {type: String, default:"au.com.bluedot.application.spring.DBEvent"},
11
- customerId : String,
12
- customerEmail : String,
13
- actionName : String,
14
- referenceId: String,
15
- creationTime: {type: Date, select: false, default: Date.now},
16
- },
17
- { collection : 'dbevent' }
18
- );
19
- var DBEvent = mongoose.model('DBEvent', DBEventSchema);
8
+ let DBEventSchema = new mongoose.Schema({
9
+ _class: {type: String, default: 'au.com.bluedot.application.spring.DBEvent'},
10
+ customerId: String,
11
+ customerEmail: String,
12
+ actionName: String,
13
+ referenceId: String,
14
+ creationTime: {type: Date, select: false, default: Date.now}
15
+ },
16
+ {collection: 'dbevent'}
17
+ )
18
+ let DBEvent = mongoose.model('DBEvent', DBEventSchema)
20
19
 
21
- module.exports = DBEvent;
20
+ module.exports = DBEvent