@bluedot-innovation/models 2.0.0-alpha.2 → 2.0.0-alpha.3

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 (101) hide show
  1. package/.eslintrc.js +6 -0
  2. package/.gitlab-ci.yml +40 -0
  3. package/.nyc_output/35cf8a0cc73b518d0684cad2d4dfc679.json +1 -0
  4. package/.nyc_output/bd25154d8c33e81a68c3281fc3007b9c.json +1 -0
  5. package/Models.js +8 -8
  6. package/README.MD +18 -0
  7. package/__tests__/action/message/messageAction.data.json +5 -0
  8. package/__tests__/action/message/messageAction.rules.json +3 -0
  9. package/__tests__/action/message/messageAction.spec.js +61 -0
  10. package/__tests__/action/url/urlAction.data.json +4 -0
  11. package/__tests__/action/url/urlAction.rules.json +3 -0
  12. package/__tests__/action/url/urlAction.spec.js +62 -0
  13. package/__tests__/dailyStats/checkDailyStats.js +30 -0
  14. package/__tests__/filter/bearing/bearingFilter.data.json +5 -0
  15. package/__tests__/filter/bearing/bearingFilter.rules.json +3 -0
  16. package/__tests__/filter/bearing/bearingFilter.spec.js +95 -0
  17. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.data.json +5 -0
  18. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.rules.json +3 -0
  19. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.spec.js +62 -0
  20. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.data.json +5 -0
  21. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.rules.json +3 -0
  22. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.spec.js +62 -0
  23. package/__tests__/filter/speed/speedFilter.data.json +5 -0
  24. package/__tests__/filter/speed/speedFilter.rules.json +3 -0
  25. package/__tests__/filter/speed/speedFilter.spec.js +73 -0
  26. package/__tests__/filter/timeOfDayRange/timeOfDayRange.data.json +5 -0
  27. package/__tests__/filter/timeOfDayRange/timeOfDayRange.rules.json +3 -0
  28. package/__tests__/filter/timeOfDayRange/timeOfDayRange.spec.js +73 -0
  29. package/__tests__/zone/beacon.spec.js +95 -0
  30. package/__tests__/zone/boundingBox.spec.js +61 -0
  31. package/__tests__/zone/circle.spec.js +71 -0
  32. package/__tests__/zone/data/beacon.data.json +12 -0
  33. package/__tests__/zone/data/boundingBox.data.json +12 -0
  34. package/__tests__/zone/data/polygon.data.json +46 -0
  35. package/__tests__/zone/data/polyline.data.json +46 -0
  36. package/__tests__/zone/data/zone-with-invalid-circle.json +34 -0
  37. package/__tests__/zone/data/zone.data.json +154 -0
  38. package/__tests__/zone/polygon.spec.js +61 -0
  39. package/__tests__/zone/polyline.spec.js +61 -0
  40. package/__tests__/zone/rules/beacon.rules.json +13 -0
  41. package/__tests__/zone/rules/boundingBox.rules.json +3 -0
  42. package/__tests__/zone/rules/circle.rules.json +3 -0
  43. package/__tests__/zone/rules/polygon.rules.json +3 -0
  44. package/__tests__/zone/rules/polyline.rules.json +3 -0
  45. package/__tests__/zone/zone.spec.js +101 -0
  46. package/models/AdminPortalUser.js +10 -11
  47. package/models/AdminUser.js +6 -5
  48. package/models/Application.js +31 -30
  49. package/models/Beacon.js +93 -78
  50. package/models/BeaconFilter.js +9 -10
  51. package/models/BearingFilter.js +38 -23
  52. package/models/BoundingBox.js +28 -20
  53. package/models/CalendarDateRangeFilter.js +28 -20
  54. package/models/Circle.js +28 -21
  55. package/models/Contract.js +37 -38
  56. package/models/Customer.js +31 -31
  57. package/models/CustomerLogin.js +9 -10
  58. package/models/DBEvent.js +13 -14
  59. package/models/DailyStats.js +28 -0
  60. package/models/DeviceRulesRequest.js +27 -28
  61. package/models/Fence.js +12 -13
  62. package/models/GeoFence.js +12 -14
  63. package/models/Geofeature.js +18 -18
  64. package/models/MessageAction.js +26 -18
  65. package/models/NotificationLogEntry.js +7 -8
  66. package/models/POILocation.js +6 -7
  67. package/models/POILookup.js +8 -9
  68. package/models/POIResult.js +7 -8
  69. package/models/PartnerCustomer.js +12 -13
  70. package/models/PartnerPasswordReset.js +8 -9
  71. package/models/PartnerUser.js +10 -11
  72. package/models/Partners.js +11 -12
  73. package/models/PercentageCrossedFilter.js +23 -15
  74. package/models/Polygon.js +26 -19
  75. package/models/Polyline.js +25 -19
  76. package/models/RuleRequestAggregation.js +14 -15
  77. package/models/SimpleCheckInZone.js +21 -21
  78. package/models/SingleUseToken.js +7 -8
  79. package/models/SpeedFilter.js +31 -19
  80. package/models/TestDevice.js +11 -12
  81. package/models/TestDeviceCluster.js +9 -10
  82. package/models/TestInstance.js +9 -10
  83. package/models/TestScenario.js +9 -10
  84. package/models/TimeOfDayRange.js +16 -16
  85. package/models/TimeOfDayRangeFilter.js +27 -18
  86. package/models/UrlAction.js +45 -0
  87. package/models/Zone.js +191 -266
  88. package/models/ZoneUIState.js +18 -18
  89. package/package.json +15 -6
  90. package/schemas/Point.js +10 -13
  91. package/__tests__/zone/checkActions.js +0 -62
  92. package/__tests__/zone/checkBearingFitler.js +0 -46
  93. package/__tests__/zone/checkBoundingBox.js +0 -42
  94. package/__tests__/zone/checkCalendarDateRangeFilterFitler.js +0 -46
  95. package/__tests__/zone/checkCircle.js +0 -39
  96. package/__tests__/zone/checkPercentageCrossedFitler.js +0 -46
  97. package/__tests__/zone/checkPolygon.js +0 -76
  98. package/__tests__/zone/checkPolyline.js +0 -76
  99. package/__tests__/zone/checkSpeedFitler.js +0 -46
  100. package/__tests__/zone/checkTimeOfDayRangeFitler.js +0 -46
  101. package/models/URLAction.js +0 -34
package/models/Zone.js CHANGED
@@ -4,284 +4,209 @@
4
4
  * Owner :
5
5
  */
6
6
 
7
- let mongoose = require('mongoose'),
8
- Schema = mongoose.Schema;
9
- let StateEnum = require('@bluedot-innovation/enums').StateEnum;
10
- let MessageAction = require('./MessageAction');
11
- let URLAction = require('./URLAction');
12
- let Circle = require('./Circle');
13
- let BoundingBox = require('./BoundingBox');
14
- let Polyline = require('./Polyline');
15
- let Polygon = require('./Polygon');
16
- let Beacon = require('./Beacon');
17
- let SpeedFilter = require('./SpeedFilter');
18
- let BearingFilter = require('./BearingFilter');
19
- let TimeOfDayRangeFilter = require('./TimeOfDayRangeFilter');
20
- let CalendarDateRangeFilter = require('./CalendarDateRangeFilter');
21
- let PercentageCrossedFilter = require('./PercentageCrossedFilter');
22
- let uuidv4 = require('uuid/v4');
23
-
24
- let ZoneSchema = new Schema({
25
- _id : { type : String, default: uuidv4 },
26
- name : { type : String, required: [true, 'name is required'] },
27
- minimumRetriggerTime : {
28
- type : Number,
29
- required : [ true, 'minimumRetriggerTime is required' ],
30
- min : 60,
31
- max : 3599940,
32
- validate : { validator : Number.isInteger,
33
- message : '{VALUE} is not a number'
34
- }
35
- },
36
- filter : { type : [],
37
- validate : {
38
- validator: validateFilters
39
- }
40
- },
41
- actions : { type : [],
42
- validate : {
43
- validator: validateActions
44
- }
45
- },
46
- geofeatures : { type : [],
47
- validate : {
48
- validator: validateGeofeatures
49
- }
50
- },
51
- customData : [{ type : Schema.Types.Mixed }],
52
- description : { type : String, default: '' },
53
- creationTime : { type : Date, default: Date.now },
54
- lastUpdateTime : { type : Date, default: Date.now },
55
- applicationId : { type : String, required: [true, 'applicationId is required'] },
56
- state : { type : String, default : StateEnum.active, select: false }
7
+ let mongoose = require('mongoose')
8
+ let Schema = mongoose.Schema
9
+ let StateEnum = require('@bluedot-innovation/enums').StateEnum
10
+ let MessageAction = require('./MessageAction')(mongoose)
11
+ let URLAction = require('./UrlAction')(mongoose)
12
+ let Circle = require('./Circle')(mongoose)
13
+ let BoundingBox = require('./BoundingBox')(mongoose)
14
+ let Polyline = require('./Polyline')(mongoose)
15
+ let Polygon = require('./Polygon')(mongoose)
16
+ let Beacon = require('./Beacon')(mongoose)
17
+ let SpeedFilter = require('./SpeedFilter')(mongoose)
18
+ let BearingFilter = require('./BearingFilter')(mongoose)
19
+ let TimeOfDayRangeFilter = require('./TimeOfDayRangeFilter')(mongoose)
20
+ let CalendarDateRangeFilter = require('./CalendarDateRangeFilter')(mongoose)
21
+ let PercentageCrossedFilter = require('./PercentageCrossedFilter')(mongoose)
22
+ let uuidv4 = require('uuid/v4')
23
+ const util = require('util')
24
+
25
+ // utility
26
+ const utilityFactory = {
27
+ mapping: {
28
+ circle: Circle,
29
+ beacon: Beacon,
30
+ boundingBox: BoundingBox,
31
+ polyline: Polyline,
32
+ polygon: Polygon,
33
+ message: MessageAction,
34
+ url: URLAction,
35
+ calendarDateRange: CalendarDateRangeFilter,
36
+ speedFilter: SpeedFilter,
37
+ bearingFilter: BearingFilter,
38
+ timeOfDayRangeFilter: TimeOfDayRangeFilter,
39
+ percentageCrossedFilter: PercentageCrossedFilter
57
40
  },
58
- { collection : 'zone' });
59
-
60
- function validateFilters(filters){
61
- let errorList = '';
62
-
63
- filters.forEach(filter => {
64
- switch(filter.type) {
65
- case 'speed': {
66
- let speedFilter = new SpeedFilter(filter);
67
- let speedFilterErrors = speedFilter.validateSync();
68
- if(speedFilterErrors) {
69
- for (let key of Object.keys(speedFilterErrors.errors)) {
70
- console.log(speedFilterErrors.errors[key].message);
71
- errorList = errorList + speedFilterErrors.errors[key].message;
72
- }
73
- }
74
-
75
- break;
76
- }
77
- case 'bearing': {
78
- let bearingFilter = new BearingFilter(filter);
79
- let bearingFilterErrors = bearingFilter.validateSync();
80
- if(bearingFilterErrors) {
81
- for (let key of Object.keys(bearingFilterErrors.errors)) {
82
- console.log(bearingFilterErrors.errors[key].message);
83
- errorList = errorList + bearingFilterErrors.errors[key].message;
84
- }
85
- }
86
-
87
- break;
88
- }
89
- case 'percentageCrossed': {
90
- let percentageCrossedFilter = new PercentageCrossedFilter(filter);
91
- let percentageCrossedFilterErrors = percentageCrossedFilter.validateSync();
92
- if(percentageCrossedFilterErrors) {
93
- for (let key of Object.keys(percentageCrossedFilterErrors.errors)) {
94
- console.log(percentageCrossedFilterErrors.errors[key].message);
95
- errorList = errorList + percentageCrossedFilterErrors.errors[key].message;
96
- }
97
- }
98
-
99
- break;
100
- }
101
- case 'timeOfDayRange': {
102
- let timeOfDayRangeFilter = new TimeOfDayRangeFilter(filter);
103
- let timeOfDayRangeFilterErrors = timeOfDayRangeFilter.validateSync();
104
- if(timeOfDayRangeFilterErrors) {
105
- for (let key of Object.keys(timeOfDayRangeFilterErrors.errors)) {
106
- console.log(timeOfDayRangeFilterErrors.errors[key].message);
107
- errorList = errorList + timeOfDayRangeFilterErrors.errors[key].message;
108
- }
109
- }
110
-
111
- break;
112
- }
113
- case 'calendarDateRange': {
114
- let calendarDateRangeFilter = new CalendarDateRangeFilter(filter);
115
- let calendarDateRangeFilterErrors = calendarDateRangeFilter.validateSync();
116
- if(calendarDateRangeFilterErrors) {
117
- for (let key of Object.keys(calendarDateRangeFilterErrors.errors)) {
118
- console.log(calendarDateRangeFilterErrors.errors[key].message);
119
- errorList = errorList + calendarDateRangeFilterErrors.errors[key].message;
120
- }
121
- }
122
-
123
- break;
124
- }
125
- default: {
126
- console.log("Please enter a valid filter type.");
127
- errorList = errorList + "Please enter a valid filter type. ";
41
+ create (feature) {
42
+ let Cls = this.mapping[feature.type]
43
+ return new Cls(feature)
44
+ }
45
+ }
128
46
 
129
- break;
130
- }
47
+ // todo Refactor fns: validate___Async & validate___
48
+ async function validateGeofeatureAsync (features) {
49
+ let errorList = {}
50
+ await Promise.all(features.map(async (feature) => {
51
+ let featureModel = utilityFactory.create(feature)
52
+ try {
53
+ await util.promisify(featureModel.validate)()
54
+ } catch (e) {
55
+ errorList[feature.type] = errorList[feature.type] || {}
56
+ Object.assign(errorList[feature.type], errorList[feature.type], e.errors)
131
57
  }
132
- });
133
-
134
- if(errorList != '')
135
- throw new Error(errorList);
58
+ }))
59
+ // if errors (object not empty)
60
+ if (Object.keys(errorList).length !== 0 && errorList.constructor === Object) {
61
+ this.customGeofeatureErrors = this.customGeofeatureErrors || {}
62
+ Object.assign(this.customGeofeatureErrors, this.customGeofeatureErrors || {}, errorList || {})
63
+ }
136
64
  }
137
-
138
-
139
- function validateActions(actions){
140
- let errorList = '';
141
-
142
- actions.forEach(action => {
143
- switch(action.type) {
144
- case 'message': {
145
- let messageAction = new MessageAction(action);
146
- let messageErrors = messageAction.validateSync();
147
- if(messageErrors) {
148
- for (let key of Object.keys(messageErrors.errors)) {
149
- console.log(messageErrors.errors[key].message);
150
- errorList = errorList + messageErrors.errors[key].message;
151
- }
152
- }
153
-
154
- break;
155
- }
156
- case 'url': {
157
- let urlAction = new URLAction(action);
158
- let urlErrors = urlAction.validateSync();
159
-
160
- if(urlErrors) {
161
- for (let key of Object.keys(urlErrors.errors)) {
162
- console.log(urlErrors.errors[key].message);
163
- errorList = errorList + urlErrors.errors[key].message;
164
- }
165
- }
166
-
167
- break;
168
- }
169
- default: {
170
- console.log("Please enter a valid action type.");
171
- errorList = errorList + "Please enter a valid action type. ";
172
- break;
173
- }
65
+ async function validateActionAsync (features) {
66
+ let errorList = {}
67
+ await Promise.all(features.map(async (feature) => {
68
+ let featureModel = utilityFactory.create(feature)
69
+ try {
70
+ await util.promisify(featureModel.validate)()
71
+ } catch (e) {
72
+ errorList[feature.type] = errorList[feature.type] || {}
73
+ Object.assign(errorList[feature.type], errorList[feature.type], e.errors)
174
74
  }
175
- });
176
-
177
- if(errorList != '')
178
- throw new Error(errorList);
75
+ }))
76
+ // if errors (object not empty)
77
+ if (Object.keys(errorList).length !== 0 && errorList.constructor === Object) {
78
+ this.customActionErrors = this.customActionErrors || {}
79
+ Object.assign(this.customActionErrors, this.customActionErrors || {}, errorList || {})
80
+ }
179
81
  }
180
-
181
-
182
- function validateGeofeatures(features) {
183
- if(features.length == 0) {
184
- throw new Error("Geofeatures cannot be empty.");
82
+ async function validateFilterAsync (features) {
83
+ let errorList = {}
84
+ await Promise.all(features.map(async (feature) => {
85
+ let featureModel = utilityFactory.create(feature)
86
+ try {
87
+ await util.promisify(featureModel.validate)()
88
+ } catch (e) {
89
+ errorList[feature.type] = errorList[feature.type] || {}
90
+ Object.assign(errorList[feature.type], errorList[feature.type], e.errors)
91
+ }
92
+ }))
93
+ // if errors (object not empty)
94
+ if (Object.keys(errorList).length !== 0 && errorList.constructor === Object) {
95
+ this.customFilterErrors = this.customFilterErrors || {}
96
+ Object.assign(this.customFilterErrors, this.customFilterErrors || {}, errorList || {})
97
+ }
98
+ }
99
+ async function validateGeofeatures (features, cb) {
100
+ // mongoose magic callback for async validation
101
+ let magicCallback = cb
102
+ try {
103
+ await validateGeofeatureAsync.call(this, features)
104
+ } catch (e) {
105
+ // todo handle error
106
+ console.error('ERROR', e)
107
+ }
108
+ if (!this.customGeofeatureErrors) {
109
+ magicCallback(true)
185
110
  } else {
186
- let errorList = '';
187
- features.forEach(geofeature => {
188
- switch(geofeature.type) {
189
- case 'circle': {
190
- let circle = new Circle(geofeature);
191
- let circleErrors = circle.validateSync();
192
-
193
- if(circleErrors) {
194
- for (let key of Object.keys(circleErrors.errors)) {
195
- console.log(circleErrors.errors[key].message);
196
- errorList = errorList + circleErrors.errors[key].message;
197
- }
198
- }
199
-
200
- break;
201
- }
202
- case 'boundingBox': {
203
- let boundingBox = new BoundingBox(geofeature);
204
- let boundingBoxErrors = boundingBox.validateSync();
205
-
206
- if(boundingBoxErrors) {
207
- for (let key of Object.keys(boundingBoxErrors.errors)) {
208
- console.log(boundingBoxErrors.errors[key].message);
209
- errorList = errorList + boundingBoxErrors.errors[key].message;
210
- }
211
- }
212
-
213
- break;
214
- }
215
- case 'polygon': {
216
- let polygon = new Polygon(geofeature);
217
- let polygonErrors = polygon.validateSync();
218
-
219
- if(polygonErrors) {
220
- for (let key of Object.keys(polygonErrors.errors)) {
221
- console.log(polygonErrors.errors[key].message);
222
- errorList = errorList + polygonErrors.errors[key].message;
223
- }
224
- }
225
-
226
- break;
227
- }
228
- case 'polyline': {
229
- let polyline = new Polyline(geofeature);
230
- let polylineErrors = polyline.validateSync();
231
-
232
- if(polylineErrors) {
233
- for (let key of Object.keys(polylineErrors.errors)) {
234
- console.log(polylineErrors.errors[key].message);
235
- errorList = errorList + polylineErrors.errors[key].message;
236
- }
237
- }
238
-
239
- break;
240
- }
241
- case 'beacon': {
242
-
243
- let beacon = new Beacon(geofeature);
244
- let beaconErrors = beacon.validateSync();
245
-
246
- if(beaconErrors) {
247
- for (let key of Object.keys(beaconErrors.errors)) {
248
- console.log(beaconErrors.errors[key].message);
249
- errorList = errorList + beaconErrors.errors[key].message;
250
- }
251
- }
252
-
253
- break;
254
- }
255
- default: {
256
- errorList = "Please enter a proper geofeature type. ";
257
- break;
258
- }
259
- }
260
- });
261
-
262
- if(errorList != '')
263
- throw new Error(errorList);
111
+ // callback false = has validation errors, true = no validation errors
112
+ return magicCallback(!(Object.keys(this.customGeofeatureErrors).length !== 0 && this.customGeofeatureErrors.constructor === Object))
264
113
  }
265
114
  }
266
-
267
- function checkPoint(point, name1, name2){
268
- let pointErrors = '';
269
-
270
- if(!point.latitude) {
271
- pointErrors = pointErrors + name1 + " " +name2 + " should have a latitude field. ";
272
- } else if(point.latitude < -90 || point.latitude > 90) {
273
- pointErrors = pointErrors + name1 + " " + name2 + " latitude should be within -90 and 90. ";
115
+ async function validateActions (features, cb) {
116
+ // mongoose magic callback for async validation
117
+ let magicCallback = cb
118
+ try {
119
+ await validateActionAsync.call(this, features)
120
+ } catch (e) {
121
+ // todo handle error
122
+ console.error('ERROR', e)
274
123
  }
275
-
276
- if(!point.longitude) {
277
- pointErrors = pointErrors + name1 + " " +name2 + " should have a longitude field. ";
278
- } else if(point.longitude < -180 || point.longitude > 180) {
279
- pointErrors = pointErrors + name1 + " " + name2 + " longitude should be within -180 and 180. ";
124
+ if (!this.customActionErrors) {
125
+ return magicCallback(true)
126
+ } else {
127
+ // callback false = has validation errors, true = no validation errors
128
+ magicCallback(!(Object.keys(this.customActionErrors).length !== 0 && this.customActionErrors.constructor === Object))
129
+ }
130
+ }
131
+ async function validateFilters (features, cb) {
132
+ // mongoose magic callback for async validation
133
+ let magicCallback = cb
134
+ try {
135
+ await validateFilterAsync.call(this, features)
136
+ } catch (e) {
137
+ // todo handle error
138
+ console.error('ERROR', e)
280
139
  }
140
+ if (!this.customFilterErrors) {
141
+ return magicCallback(true)
142
+ } else {
143
+ // callback false = has validation errors, true = no validation errors
144
+ magicCallback(!(Object.keys(this.customFilterErrors).length !== 0 && this.customFilterErrors.constructor === Object))
145
+ }
146
+ }
281
147
 
282
- return pointErrors;
148
+ function validateNullGeofeatures (features) {
149
+ return features.length !== 0
283
150
  }
284
151
 
285
- let Zone = mongoose.model('Zone', ZoneSchema);
152
+ // ////// //
153
+ // Schema //
154
+ // ////// //
155
+ let ZoneSchema = new Schema({
156
+ _id: {type: String, default: uuidv4},
157
+ name: {type: String, required: [true, 'name is required']},
158
+ minimumRetriggerTime: {
159
+ type: Number,
160
+ required: [true, 'minimumRetriggerTime is required'],
161
+ min: 60,
162
+ max: 3599940,
163
+ validate: {
164
+ validator: Number.isInteger,
165
+ message: '{VALUE} is not a number'
166
+ }
167
+ },
168
+ filters: {
169
+ type: [],
170
+ validate: {
171
+ validator: validateFilters, msg: 'Filter validation error'
172
+ }
173
+ },
174
+ actions: {
175
+ type: [],
176
+ validate: {
177
+ validator: validateActions, msg: 'Action validation error'
178
+ }
179
+ },
180
+ geofeatures: {
181
+ type: [],
182
+ validate: [
183
+ {validator: validateNullGeofeatures, msg: 'Geofeatures cannot be empty'},
184
+ {validator: validateGeofeatures, msg: 'Geofeature validation error'}
185
+ ]
186
+ },
187
+ customData: [{type: Schema.Types.Mixed}],
188
+ description: {type: String, default: ''},
189
+ creationTime: {type: Date, default: Date.now},
190
+ lastUpdateTime: {type: Date, default: Date.now},
191
+ applicationId: {type: String, required: [true, 'applicationId is required']},
192
+ state: {type: String, default: StateEnum.active, select: false}
193
+ },
194
+ {collection: 'zone'})
195
+
196
+ // mongoose validator helper plugin (assigns customErrors into this.errors[mongoose standard error object])
197
+ ZoneSchema.post('validate', function (doc) {
198
+ console.debug('Zone post validate hook')
199
+ Object.assign(this.errors || {}, this.errors || {}, this.customErrors, this.customGeofeatureErrors, this.customActionErrors, this.customFilterErrors)
200
+ })
201
+
202
+ // optional mongoose
203
+ module.exports = (mongooseInstance) => {
204
+ let Zone
205
+ if (mongooseInstance) {
206
+ Zone = mongooseInstance.model('Zone', ZoneSchema)
207
+ } else {
208
+ Zone = mongoose.model('Zone', ZoneSchema)
209
+ }
286
210
 
287
- module.exports = Zone;
211
+ return Zone
212
+ }
@@ -3,23 +3,23 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- var mongoose = require('mongoose'),
7
- Schema = mongoose.Schema;
8
- var StateEnum = require('@bluedot-innovation/enums').StateEnum;
6
+ let mongoose = require('mongoose')
7
+ let Schema = mongoose.Schema
8
+ let StateEnum = require('@bluedot-innovation/enums').StateEnum
9
9
 
10
- var ZoneUIStateSchema = new mongoose.Schema({
11
- _id : {type: String},
12
- signature : {type: String},
13
- center : Schema.Types.Mixed,
14
- dataSource: {type:String, select: false, default : 'openApi'},
15
- zoom : {type: Number, default : 4},
16
- lastUpdateTime : {type: Date, default: Date.now},
17
- creationTime : {type: Date, default: Date.now},
18
- state: {type: String, default : StateEnum.active, select: false},
19
- zoneId: String
20
- },
21
- { collection : 'zoneUIState' }
22
- );
10
+ let ZoneUIStateSchema = new mongoose.Schema({
11
+ _id: {type: String},
12
+ signature: {type: String},
13
+ center: Schema.Types.Mixed,
14
+ dataSource: {type: String, select: false, default: 'openApi'},
15
+ zoom: {type: Number, default: 4},
16
+ lastUpdateTime: {type: Date, default: Date.now},
17
+ creationTime: {type: Date, default: Date.now},
18
+ state: {type: String, default: StateEnum.active, select: false},
19
+ zoneId: String
20
+ },
21
+ {collection: 'zoneUIState'}
22
+ )
23
23
 
24
- var ZoneUIState = mongoose.model('ZoneUIState', ZoneUIStateSchema);
25
- module.exports = ZoneUIState;
24
+ let ZoneUIState = mongoose.model('ZoneUIState', ZoneUIStateSchema)
25
+ module.exports = ZoneUIState
package/package.json CHANGED
@@ -1,24 +1,33 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "2.0.0-alpha.2",
3
+ "version": "2.0.0-alpha.3",
4
4
  "description": "",
5
5
  "main": "Models.js",
6
6
  "scripts": {
7
- "test": "mocha __tests__/*"
7
+ "test": "nyc mocha __tests__/**/*.spec.js __tests__/**/**/*.spec.js",
8
+ "lint": "./node_modules/.bin/eslint -c .eslintrc.js ./models/*.js ./__tests__/**/**/*.js ./schemas/*.js",
9
+ "coverage": "nyc check-coverage --lines 90 --functions 90 --branches 70 "
8
10
  },
9
11
  "author": "",
10
12
  "license": "UNLICENSED",
11
13
  "devDependencies": {
12
- "assert": "^1.4.1",
13
14
  "chai": "^4.1.2",
14
15
  "describe": "*",
15
- "mocha": "1.8.x",
16
- "should": "1.2.x",
17
- "sinon": "^4.0.2"
16
+ "eslint": "^4.12.0",
17
+ "eslint-config-standard": "^10.2.1",
18
+ "eslint-plugin-import": "^2.8.0",
19
+ "eslint-plugin-node": "^5.2.1",
20
+ "eslint-plugin-promise": "^3.6.0",
21
+ "eslint-plugin-standard": "^3.0.1",
22
+ "mocha": "^4.0.1",
23
+ "mockgoose": "^7.3.3",
24
+ "nyc": "^11.3.0",
25
+ "sinon": "^4.1.2"
18
26
  },
19
27
  "dependencies": {
20
28
  "@bluedot-innovation/enums": "*",
21
29
  "mongoose": "4.7.6",
30
+ "mongoose-error-helper": "0.0.2",
22
31
  "uuid": "^3.1.0"
23
32
  }
24
33
  }
package/schemas/Point.js CHANGED
@@ -1,16 +1,13 @@
1
- let mongoose = require('mongoose');
1
+ let mongoose = require('mongoose')
2
2
 
3
3
  let PointSchema = new mongoose.Schema({
4
- 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 },
7
- },
8
- {
9
- _id: false,
10
- __v: false
11
- }
12
- );
4
+ 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}
7
+ },
8
+ {
9
+ _id: false,
10
+ __v: false
11
+ })
13
12
 
14
- //let Point = mongoose.model('Point', PointSchema);
15
-
16
- module.exports = PointSchema;
13
+ module.exports = PointSchema
@@ -1,62 +0,0 @@
1
- let assert = require('assert');
2
- let Zone = require('../../models/Zone');
3
-
4
- let zone = {
5
- "name": "TDD zone",
6
- "minimumRetriggerTime": "60",
7
- "checkout": true,
8
- "applicationId": 'c7058934-f1e6-4176-8730-a0bd28e8e0a9',
9
- "customData": [
10
- {
11
- "name1": "A Custom action1"
12
- },
13
- {
14
- "name2": "A Custom action2"
15
- }
16
- ],
17
- "actions": [
18
- {
19
- "type": "message",
20
- "message": "hello",
21
- "title": "hello"
22
- },
23
- {
24
- "type": "url",
25
- "url": "https://www.google.com"
26
- }
27
- ],
28
- "geofeatures": [{
29
- "type": "beacon",
30
- "name": "create beacon",
31
- "proximityUUID": "23a01af0-232a-4518-9c0e-323fb773f5ef",
32
- "location": {
33
- "latitude": -37.8159544565362,
34
- "longitude": 144.9723565578461
35
- },
36
- "beaconType": "both",
37
- "major": 12321,
38
- "minor": 56466,
39
- "txPower": -77,
40
- "macAddress": "01:17:c5:31:84:19"
41
- }]
42
- };
43
-
44
- describe('Creating Zone ', () => {
45
- it('validate MessageAction and URLAction', (done) => {
46
-
47
- let createZone = new Zone(zone);
48
- createZone.validate()
49
- .then((output) => {
50
- console.log("validate MessageAction and URLAction");
51
- assert(true);
52
- done();
53
- }).catch(err => {
54
- console.log("Errors found:");
55
- for( let key of Object.keys(err.errors) ) {
56
- console.log(err.errors[key].message);
57
- }
58
- assert(false);
59
- done(err);
60
- });
61
- });
62
- });