@bluedot-innovation/models 2.0.0-alpha.9 → 2.0.0-alpha1

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 (109) hide show
  1. package/Models.js +8 -8
  2. package/__tests__/zone/checkActions.js +64 -0
  3. package/__tests__/zone/checkAppId.js +41 -0
  4. package/__tests__/zone/checkBeacon.js +46 -0
  5. package/__tests__/zone/checkBearingFitler.js +48 -0
  6. package/__tests__/zone/checkBoundingBox.js +44 -0
  7. package/__tests__/zone/checkCalendarDateRangeFilterFitler.js +48 -0
  8. package/__tests__/zone/checkCircle.js +41 -0
  9. package/__tests__/zone/checkMRT.js +46 -0
  10. package/__tests__/zone/checkPercentageCrossedFitler.js +48 -0
  11. package/__tests__/zone/checkPolygon.js +78 -0
  12. package/__tests__/zone/checkPolyline.js +78 -0
  13. package/__tests__/zone/checkSpeedFitler.js +48 -0
  14. package/__tests__/zone/checkTimeOfDayRangeFitler.js +48 -0
  15. package/models/AdminPortalUser.js +11 -10
  16. package/models/AdminUser.js +5 -6
  17. package/models/Application.js +30 -31
  18. package/models/Beacon.js +78 -91
  19. package/models/BeaconFilter.js +12 -30
  20. package/models/BearingFilter.js +23 -45
  21. package/models/BoundingBox.js +20 -35
  22. package/models/CalendarDateRangeFilter.js +19 -33
  23. package/models/Circle.js +18 -32
  24. package/models/Contract.js +38 -37
  25. package/models/Customer.js +31 -31
  26. package/models/CustomerLogin.js +10 -9
  27. package/models/DBEvent.js +14 -13
  28. package/models/DeviceRulesRequest.js +28 -27
  29. package/models/Fence.js +13 -12
  30. package/models/GeoFence.js +14 -12
  31. package/models/Geofeature.js +18 -16
  32. package/models/MessageAction.js +16 -30
  33. package/models/NotificationLogEntry.js +8 -7
  34. package/models/POILocation.js +7 -6
  35. package/models/POILookup.js +9 -8
  36. package/models/POIResult.js +8 -7
  37. package/models/PartnerCustomer.js +13 -12
  38. package/models/PartnerPasswordReset.js +9 -8
  39. package/models/PartnerUser.js +11 -10
  40. package/models/Partners.js +12 -11
  41. package/models/PercentageCrossedFilter.js +15 -29
  42. package/models/Polygon.js +19 -33
  43. package/models/Polyline.js +19 -34
  44. package/models/RuleRequestAggregation.js +15 -14
  45. package/models/SimpleCheckInZone.js +21 -21
  46. package/models/SingleUseToken.js +8 -7
  47. package/models/SpeedFilter.js +19 -38
  48. package/models/TestDevice.js +12 -11
  49. package/models/TestDeviceCluster.js +10 -9
  50. package/models/TestInstance.js +10 -9
  51. package/models/TestScenario.js +10 -9
  52. package/models/TimeOfDayRange.js +16 -16
  53. package/models/TimeOfDayRangeFilter.js +18 -34
  54. package/models/URLAction.js +34 -0
  55. package/models/Zone.js +274 -84
  56. package/models/ZoneUIState.js +18 -18
  57. package/package.json +7 -20
  58. package/schemas/Point.js +13 -10
  59. package/.eslintrc.js +0 -6
  60. package/.gitlab-ci.yml +0 -43
  61. package/.nyc_output/.gitkeep +0 -0
  62. package/README.MD +0 -36
  63. package/__tests__/action/message/messageAction.data.json +0 -5
  64. package/__tests__/action/message/messageAction.rules.json +0 -3
  65. package/__tests__/action/message/messageAction.spec.js +0 -61
  66. package/__tests__/action/url/urlAction.data.json +0 -4
  67. package/__tests__/action/url/urlAction.rules.json +0 -3
  68. package/__tests__/action/url/urlAction.spec.js +0 -62
  69. package/__tests__/dailyStats/checkDailyStats.js +0 -30
  70. package/__tests__/filter/beacon/beaconFilter.data.json +0 -1
  71. package/__tests__/filter/beacon/beaconFilter.rules.json +0 -3
  72. package/__tests__/filter/beacon/beaconFilter.spec.js +0 -1
  73. package/__tests__/filter/bearing/bearingFilter.data.json +0 -5
  74. package/__tests__/filter/bearing/bearingFilter.rules.json +0 -3
  75. package/__tests__/filter/bearing/bearingFilter.spec.js +0 -95
  76. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.data.json +0 -5
  77. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.rules.json +0 -3
  78. package/__tests__/filter/calendarDateRange/calendarDateRangeFilter.spec.js +0 -62
  79. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.data.json +0 -5
  80. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.rules.json +0 -3
  81. package/__tests__/filter/percentageCrossed/percentageCrossedFilter.spec.js +0 -62
  82. package/__tests__/filter/speed/speedFilter.data.json +0 -5
  83. package/__tests__/filter/speed/speedFilter.rules.json +0 -3
  84. package/__tests__/filter/speed/speedFilter.spec.js +0 -73
  85. package/__tests__/filter/timeOfDayRange/timeOfDayRange.data.json +0 -5
  86. package/__tests__/filter/timeOfDayRange/timeOfDayRange.rules.json +0 -3
  87. package/__tests__/filter/timeOfDayRange/timeOfDayRange.spec.js +0 -73
  88. package/__tests__/geofeature/beacon/beacon.data.json +0 -12
  89. package/__tests__/geofeature/beacon/beacon.rules.json +0 -13
  90. package/__tests__/geofeature/beacon/beacon.spec.js +0 -95
  91. package/__tests__/geofeature/boundingBox/boundingBox.data.json +0 -12
  92. package/__tests__/geofeature/boundingBox/boundingBox.rules.json +0 -3
  93. package/__tests__/geofeature/boundingBox/boundingBox.spec.js +0 -61
  94. package/__tests__/geofeature/circle/circle.data.json +0 -9
  95. package/__tests__/geofeature/circle/circle.rules.json +0 -3
  96. package/__tests__/geofeature/circle/circle.spec.js +0 -62
  97. package/__tests__/geofeature/polygon/polygon.data.json +0 -46
  98. package/__tests__/geofeature/polygon/polygon.rules.json +0 -3
  99. package/__tests__/geofeature/polygon/polygon.spec.js +0 -61
  100. package/__tests__/geofeature/polyline/polyline.data.json +0 -46
  101. package/__tests__/geofeature/polyline/polyline.rules.json +0 -3
  102. package/__tests__/geofeature/polyline/polyline.spec.js +0 -61
  103. package/__tests__/zone/zone.action.spec.js +0 -50
  104. package/__tests__/zone/zone.data.json +0 -154
  105. package/__tests__/zone/zone.filter.spec.js +0 -50
  106. package/__tests__/zone/zone.geofeatures.spec.js +0 -74
  107. package/__tests__/zone/zone.spec.js +0 -98
  108. package/models/DailyStats.js +0 -28
  109. package/models/UrlAction.js +0 -51
@@ -3,20 +3,20 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- let mongoose = require('mongoose')
6
+ var mongoose = require('mongoose');
7
+ var SchemaTypes = mongoose.Schema.Types;
7
8
 
8
- let TimeOfDayRange = mongoose.model('TimeOfDayRange', mongoose.Schema({
9
- start: {
10
- '_class': {type: String, default: 'au.com.bluedot.schedule.model.value.TimeOfDay'},
11
- hour: Number,
12
- seconds: Number,
13
- minute: Number
14
- },
15
- interval: Number
16
- },
17
- {
18
- _id: false
19
- }
20
- ))
21
-
22
- module.exports = TimeOfDayRange
9
+ var TimeOfDayRange = mongoose.model('TimeOfDayRange', mongoose.Schema({
10
+ start: {
11
+ "_class": { type: String, default: "au.com.bluedot.schedule.model.value.TimeOfDay"},
12
+ hour: Number,
13
+ seconds: Number,
14
+ minute: Number
15
+ },
16
+ interval: Number
17
+ },
18
+ {
19
+ _id: false
20
+ }
21
+ ));
22
+ module.exports = TimeOfDayRange;
@@ -1,42 +1,26 @@
1
- let mongoose = require('mongoose')
2
- let uuidv4 = require('uuid/v4')
1
+ let mongoose = require('mongoose');
2
+ let uuidv1 = require('uuid/v1');
3
3
 
4
- let schema = {
5
- guid: {type: String, default: uuidv4},
6
- fromTime: {type: Number, required: [true, 'time is required. '], min: 0, max: 86400},
7
- toTime: {type: Number, required: true, min: 0, max: 86400, validate: validateTime}
8
- }
9
- let TimeOfDayRangeFilterSchema = new mongoose.Schema(
10
- schema,
4
+ let TimeOfDayRangeFilterSchema = new mongoose.Schema({
5
+ guid : { type: String, default: uuidv1 },
6
+ type : { type: String },
7
+ fromTime : { type: Number, required: [true, 'time is required. '], min: 0, max: 86400 },
8
+ toTime : { type: Number, required: [true, 'interval is required. '], min: 0, max: 86400, validate: validateTime }
9
+ },
11
10
  {
12
- _id: false,
13
- versionKey: false
14
- })
15
-
16
- TimeOfDayRangeFilterSchema.add({
17
- type:
18
- {type: String, required: true}
19
- })
11
+ _id : false,
12
+ versionKey : false
13
+ }
14
+ );
20
15
 
21
- function validateTime (toTime, cb) {
22
- let magicCallback = cb
23
- let fromTime = this.fromTime
16
+ function validateTime(toTime){
17
+ let fromTime = this.fromTime;
24
18
 
25
- if (fromTime === toTime) {
26
- return magicCallback(false, 'fromTime and toTime cannot be same')
19
+ if(fromTime == toTime) {
20
+ throw new Error("fromTime and toTime cannot be same. ");
27
21
  }
28
- return magicCallback(true)
29
22
  }
30
23
 
31
- // optional mongoose
32
- module.exports = (mongooseInstance) => {
33
- let TimeOfDayRangeFilter
34
- if (mongooseInstance) {
35
- TimeOfDayRangeFilter = mongooseInstance.model('TimeOfDayRangeFilterSchema', TimeOfDayRangeFilterSchema)
36
- } else {
37
- TimeOfDayRangeFilter = mongoose.model('TimeOfDayRangeFilterSchema', TimeOfDayRangeFilterSchema)
38
- }
24
+ let TimeOfDayRangeFilter = mongoose.model('TimeOfDayRangeFilter', TimeOfDayRangeFilterSchema);
39
25
 
40
- return TimeOfDayRangeFilter
41
- }
42
- module.exports.timeOfDayRangeFilterSchema = schema
26
+ module.exports = TimeOfDayRangeFilter;
@@ -0,0 +1,34 @@
1
+ let mongoose = require('mongoose');
2
+ let StateEnum = require('@bluedot-innovation/enums').StateEnum;
3
+ let uuidv1 = require('uuid/v1');
4
+
5
+ let URLActionSchema = new mongoose.Schema({
6
+ guid : { type: String, default: uuidv1 },
7
+ type : { type: String },
8
+ url : { type: String, required: [true, 'url is required. '],
9
+ validate : {
10
+ validator: validateURL
11
+ }
12
+ },
13
+ description : { type: String, default: '' },
14
+ creationTime : { type: Date, default: Date.now },
15
+ lastUpdateTime : { type: Date, default: Date.now },
16
+ state : { type: String, default : StateEnum.active, select: false }
17
+ },
18
+ {
19
+ _id: false,
20
+ __v: false
21
+ }
22
+ );
23
+
24
+ function validateURL(url){
25
+ let urlRegex = new RegExp("^(http[s]?:\\/\\/(www\\.)?|ftp:\\/\\/(www\\.)?|www\\.){1}([0-9A-Za-z-\\.@:%_\+~#=]+)+((\\.[a-zA-Z]{2,3})+)(/(.)*)?(\\?(.)*)?");
26
+ if(!urlRegex.test(url)) {
27
+ console.log(`{url} is not a valid URL. `);
28
+ throw new Error(url + " is not a valid URL. ");
29
+ }
30
+ }
31
+
32
+ let URLAction = mongoose.model('URLAction', URLActionSchema);
33
+
34
+ module.exports = URLAction;
package/models/Zone.js CHANGED
@@ -4,94 +4,284 @@
4
4
  * Owner :
5
5
  */
6
6
 
7
- let mongoose = require('mongoose')
8
- let Schema = mongoose.Schema
9
- let StateEnum = require('@bluedot-innovation/enums').StateEnum
10
- let messageActionSchema = require('./MessageAction').messageActionSchema
11
- let urlActionSchema = require('./UrlAction').urlActionSchema
12
- let circleSchema = require('./Circle').circleSchema
13
- let boundingBoxSchema = require('./BoundingBox').boundingBoxSchema
14
- let polylineSchema = require('./Polyline').polylineSchema
15
- let polygonSchema = require('./Polygon').polygonSchema
16
- let beaconSchema = require('./Beacon').beaconSchema
17
- let speedFilterSchema = require('./SpeedFilter').speedFilterSchema
18
- let bearingFilterSchema = require('./BearingFilter').bearingFilterSchema
19
- let timeOfDayRangeFilterSchema = require('./TimeOfDayRangeFilter').timeOfDayRangeFilterSchema
20
- let calendarDateRangeFilterSchema = require('./CalendarDateRangeFilter').calendarDateRangeSchema
21
- let percentageCrossedFilterSchema = require('./PercentageCrossedFilter').percentageCrossedFilterSchema
22
- let uuidv4 = require('uuid/v4')
23
- let patcher = require('mongoose-json-patch')
24
-
25
- // ////// //
26
- // Schema //
27
- // ////// //
28
-
29
- let actionSchema = new Schema({},
30
- { discriminatorKey: 'type', _id: false })
31
-
32
- let filterSchema = new Schema({},
33
- { discriminatorKey: 'type', _id: false })
34
-
35
- let geofeatureSchema = new Schema({},
36
- { discriminatorKey: 'type', _id: false })
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 uuidv1 = require('uuid/v1');
37
23
 
38
24
  let ZoneSchema = new Schema({
39
- _id: {type: String, default: uuidv4},
40
- name: {type: String, required: [true, 'name is required']},
41
- minimumRetriggerTime: {
42
- type: Number,
43
- required: [true, 'minimumRetriggerTime is required'],
44
- min: 60,
45
- max: 3599940,
46
- validate: {
47
- validator: Number.isInteger,
48
- message: '{VALUE} is not a number'
49
- }
50
- },
51
- filters: {
52
- type: [filterSchema]
53
- },
54
- actions: {
55
- type: [actionSchema]
25
+ _id : { type : String, default: uuidv1 },
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 }
56
57
  },
57
- geofeatures: {
58
- type: [geofeatureSchema],
59
- required: false
60
- },
61
- customData: [{type: Schema.Types.Mixed}],
62
- description: {type: String, default: ''},
63
- creationTime: {type: Date, default: Date.now},
64
- lastUpdateTime: {type: Date, default: Date.now},
65
- applicationId: {type: String, required: [true, 'applicationId is required']},
66
- state: {type: String, default: StateEnum.active, select: false}
67
- }, {collection: 'zone'})
68
-
69
- // TODO: Test patcher and include for other schemas if required
70
- ZoneSchema.plugin(patcher)
71
-
72
- ZoneSchema.path('actions').discriminator('url', new Schema(urlActionSchema))
73
- ZoneSchema.path('actions').discriminator('message', new Schema(messageActionSchema))
74
-
75
- ZoneSchema.path('filters').discriminator('bearing', new Schema(bearingFilterSchema))
76
- ZoneSchema.path('filters').discriminator('calendarDateRange', new Schema(calendarDateRangeFilterSchema))
77
- ZoneSchema.path('filters').discriminator('percentageCrossed', new Schema(percentageCrossedFilterSchema))
78
- ZoneSchema.path('filters').discriminator('speed', new Schema(speedFilterSchema))
79
- ZoneSchema.path('filters').discriminator('timeOfDayRange', new Schema(timeOfDayRangeFilterSchema))
80
-
81
- ZoneSchema.path('geofeatures').discriminator('circle', new Schema(circleSchema))
82
- ZoneSchema.path('geofeatures').discriminator('beacon', new Schema(beaconSchema))
83
- ZoneSchema.path('geofeatures').discriminator('polygon', new Schema(polygonSchema))
84
- ZoneSchema.path('geofeatures').discriminator('polyline', new Schema(polylineSchema))
85
- ZoneSchema.path('geofeatures').discriminator('boundingBox', new Schema(boundingBoxSchema))
86
-
87
- // optional mongoose
88
- module.exports = (mongooseInstance) => {
89
- let Zone
90
- if (mongooseInstance) {
91
- Zone = mongooseInstance.model('Zone', ZoneSchema)
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. ";
128
+
129
+ break;
130
+ }
131
+ }
132
+ });
133
+
134
+ if(errorList != '')
135
+ throw new Error(errorList);
136
+ }
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
+ }
174
+ }
175
+ });
176
+
177
+ if(errorList != '')
178
+ throw new Error(errorList);
179
+ }
180
+
181
+
182
+ function validateGeofeatures(features) {
183
+ if(features.length == 0) {
184
+ throw new Error("Geofeatures cannot be empty.");
92
185
  } else {
93
- Zone = mongoose.model('Zone', ZoneSchema)
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);
94
264
  }
265
+ }
266
+
267
+ function checkPoint(point, name1, name2){
268
+ let pointErrors = '';
95
269
 
96
- return Zone
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. ";
274
+ }
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. ";
280
+ }
281
+
282
+ return pointErrors;
97
283
  }
284
+
285
+ let Zone = mongoose.model('Zone', ZoneSchema);
286
+
287
+ module.exports = Zone;
@@ -3,23 +3,23 @@
3
3
  * Copyright : Bluedot Innovations.
4
4
  * Owner :
5
5
  */
6
- let mongoose = require('mongoose')
7
- let Schema = mongoose.Schema
8
- let StateEnum = require('@bluedot-innovation/enums').StateEnum
6
+ var mongoose = require('mongoose'),
7
+ Schema = mongoose.Schema;
8
+ var StateEnum = require('@bluedot-innovation/enums').StateEnum;
9
9
 
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
- )
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
+ );
23
23
 
24
- let ZoneUIState = mongoose.model('ZoneUIState', ZoneUIStateSchema)
25
- module.exports = ZoneUIState
24
+ var ZoneUIState = mongoose.model('ZoneUIState', ZoneUIStateSchema);
25
+ module.exports = ZoneUIState;
package/package.json CHANGED
@@ -1,37 +1,24 @@
1
1
  {
2
2
  "name": "@bluedot-innovation/models",
3
- "version": "2.0.0-alpha.9",
3
+ "version": "2.0.0-alpha1",
4
4
  "description": "",
5
5
  "main": "Models.js",
6
6
  "scripts": {
7
- "lint": "./node_modules/.bin/eslint -c .eslintrc.js ./models/*.js ./__tests__/**/**/*.js ./schemas/*.js",
8
- "test": "mocha __tests__/**/*.spec.js __tests__/**/**/*.spec.js",
9
- "test:coverage": "nyc mocha __tests__/**/*.spec.js __tests__/**/**/*.spec.js",
10
- "test:coverage-check": "nyc check-coverage --lines 90 --functions 90 --branches 70",
11
- "test:ci": "npm run lint && npm run test:coverage-check && npm test",
12
- "postversion": "git push --follow-tags"
7
+ "test": "mocha __tests__/*"
13
8
  },
14
9
  "author": "",
15
10
  "license": "UNLICENSED",
16
11
  "devDependencies": {
12
+ "assert": "^1.4.1",
17
13
  "chai": "^4.1.2",
18
14
  "describe": "*",
19
- "eslint": "^4.12.0",
20
- "eslint-config-standard": "^10.2.1",
21
- "eslint-plugin-import": "^2.8.0",
22
- "eslint-plugin-node": "^5.2.1",
23
- "eslint-plugin-promise": "^3.6.0",
24
- "eslint-plugin-standard": "^3.0.1",
25
- "mocha": "^4.0.1",
26
- "mockgoose": "^7.3.3",
27
- "nyc": "^11.3.0",
28
- "sinon": "^4.1.2"
15
+ "mocha": "1.8.x",
16
+ "should": "1.2.x",
17
+ "sinon": "^4.0.2"
29
18
  },
30
19
  "dependencies": {
31
20
  "@bluedot-innovation/enums": "*",
32
- "mongoose": "^4.13.6",
33
- "mongoose-error-helper": "0.0.2",
34
- "mongoose-json-patch": "^1.1.1",
21
+ "mongoose": "4.7.6",
35
22
  "uuid": "^3.1.0"
36
23
  }
37
24
  }
package/schemas/Point.js CHANGED
@@ -1,13 +1,16 @@
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
- })
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
+ );
12
13
 
13
- module.exports = PointSchema
14
+ //let Point = mongoose.model('Point', PointSchema);
15
+
16
+ module.exports = PointSchema;
package/.eslintrc.js DELETED
@@ -1,6 +0,0 @@
1
- module.exports = {
2
- "extends": "standard",
3
- "rules": {
4
- "indent": ["error", 4]
5
- }
6
- };