@ngageoint/mage.service 6.6.1 → 6.6.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 (139) hide show
  1. package/lib/adapters/base/adapters.base.db.mongoose.d.ts +7 -7
  2. package/lib/adapters/base/adapters.base.db.mongoose.d.ts.map +1 -1
  3. package/lib/adapters/base/adapters.base.db.mongoose.js +5 -3
  4. package/lib/adapters/base/adapters.base.db.mongoose.js.map +1 -1
  5. package/lib/adapters/events/adapters.events.db.mongoose.d.ts +23 -1
  6. package/lib/adapters/events/adapters.events.db.mongoose.d.ts.map +1 -1
  7. package/lib/adapters/events/adapters.events.db.mongoose.js.map +1 -1
  8. package/lib/adapters/feeds/adapters.feeds.db.mongoose.d.ts +48 -6
  9. package/lib/adapters/feeds/adapters.feeds.db.mongoose.d.ts.map +1 -1
  10. package/lib/adapters/feeds/adapters.feeds.db.mongoose.js +3 -3
  11. package/lib/adapters/feeds/adapters.feeds.db.mongoose.js.map +1 -1
  12. package/lib/adapters/icons/adapters.icons.db.mongoose.d.ts +11 -1
  13. package/lib/adapters/icons/adapters.icons.db.mongoose.d.ts.map +1 -1
  14. package/lib/adapters/icons/adapters.icons.db.mongoose.js +1 -1
  15. package/lib/adapters/icons/adapters.icons.db.mongoose.js.map +1 -1
  16. package/lib/adapters/settings/adapters.settings.db.mongoose.d.ts +9 -1
  17. package/lib/adapters/settings/adapters.settings.db.mongoose.d.ts.map +1 -1
  18. package/lib/adapters/systemInfo/adapters.systemInfo.service.js.map +1 -1
  19. package/lib/adapters/users/adapters.users.db.mongoose.d.ts +9 -1
  20. package/lib/adapters/users/adapters.users.db.mongoose.d.ts.map +1 -1
  21. package/lib/api/event.js +1 -1
  22. package/lib/api/event.js.map +1 -1
  23. package/lib/api/icon.d.ts.map +1 -1
  24. package/lib/api/icon.js +3 -5
  25. package/lib/api/icon.js.map +1 -1
  26. package/lib/api/layer.d.ts +30 -17
  27. package/lib/api/layer.d.ts.map +1 -1
  28. package/lib/app.impl/systemInfo/app.impl.systemInfo.d.ts.map +1 -1
  29. package/lib/app.impl/systemInfo/app.impl.systemInfo.js +3 -1
  30. package/lib/app.impl/systemInfo/app.impl.systemInfo.js.map +1 -1
  31. package/lib/dist-package.json +8 -8
  32. package/lib/export/exporter.d.ts.map +1 -1
  33. package/lib/export/exporter.js.map +1 -1
  34. package/lib/export/geopackage.js +2 -1
  35. package/lib/export/geopackage.js.map +1 -1
  36. package/lib/migrations/005-create-osm-layer.js +2 -2
  37. package/lib/migrations/005-create-osm-layer.js.map +1 -1
  38. package/lib/migrations/006-event-teams.d.ts.map +1 -1
  39. package/lib/migrations/006-event-teams.js +1 -3
  40. package/lib/migrations/006-event-teams.js.map +1 -1
  41. package/lib/migrations/007-user-icon.js +1 -1
  42. package/lib/migrations/007-user-icon.js.map +1 -1
  43. package/lib/migrations/009-create-manager-role.js +2 -2
  44. package/lib/migrations/009-create-manager-role.js.map +1 -1
  45. package/lib/migrations/010-add-user-device-manager-role.js +3 -3
  46. package/lib/migrations/010-add-user-device-manager-role.js.map +1 -1
  47. package/lib/migrations/011-multiple-forms.js +12 -12
  48. package/lib/migrations/011-multiple-forms.js.map +1 -1
  49. package/lib/migrations/012-user-role-remove-delete.d.ts.map +1 -1
  50. package/lib/migrations/012-user-role-remove-delete.js +2 -6
  51. package/lib/migrations/012-user-role-remove-delete.js.map +1 -1
  52. package/lib/migrations/013-ensure-event-indexes.js +1 -1
  53. package/lib/migrations/013-ensure-event-indexes.js.map +1 -1
  54. package/lib/migrations/014-add-role-update-permission.d.ts.map +1 -1
  55. package/lib/migrations/014-add-role-update-permission.js +2 -6
  56. package/lib/migrations/014-add-role-update-permission.js.map +1 -1
  57. package/lib/migrations/015-manager-role-add-user-create.d.ts.map +1 -1
  58. package/lib/migrations/015-manager-role-add-user-create.js +2 -6
  59. package/lib/migrations/015-manager-role-add-user-create.js.map +1 -1
  60. package/lib/migrations/016-set-feed-primary-secondary.js +4 -4
  61. package/lib/migrations/016-set-feed-primary-secondary.js.map +1 -1
  62. package/lib/migrations/018-feeds-admin-permissions.d.ts.map +1 -1
  63. package/lib/migrations/018-feeds-admin-permissions.js +2 -2
  64. package/lib/migrations/018-feeds-admin-permissions.js.map +1 -1
  65. package/lib/migrations/022-copy-auth-from-config-to-db.js +1 -1
  66. package/lib/migrations/022-copy-auth-from-config-to-db.js.map +1 -1
  67. package/lib/migrations/029-attachment-form-field.js +7 -7
  68. package/lib/migrations/029-attachment-form-field.js.map +1 -1
  69. package/lib/migrations/030-add-read-system-info-permissions.d.ts.map +1 -1
  70. package/lib/migrations/030-add-read-system-info-permissions.js +2 -6
  71. package/lib/migrations/030-add-read-system-info-permissions.js.map +1 -1
  72. package/lib/migrations/030-map-search-settings.js +4 -4
  73. package/lib/migrations/030-map-search-settings.js.map +1 -1
  74. package/lib/models/authentication.d.ts +259 -51
  75. package/lib/models/authentication.d.ts.map +1 -1
  76. package/lib/models/authentication.js +2 -2
  77. package/lib/models/authentication.js.map +1 -1
  78. package/lib/models/authenticationconfiguration.d.ts +192 -89
  79. package/lib/models/authenticationconfiguration.d.ts.map +1 -1
  80. package/lib/models/authenticationconfiguration.js +1 -1
  81. package/lib/models/cappedLocation.d.ts +70 -13
  82. package/lib/models/cappedLocation.d.ts.map +1 -1
  83. package/lib/models/cappedLocation.js +3 -7
  84. package/lib/models/cappedLocation.js.map +1 -1
  85. package/lib/models/device.d.ts +113 -66
  86. package/lib/models/device.d.ts.map +1 -1
  87. package/lib/models/device.js +2 -2
  88. package/lib/models/device.js.map +1 -1
  89. package/lib/models/event.d.ts.map +1 -1
  90. package/lib/models/event.js +45 -94
  91. package/lib/models/event.js.map +1 -1
  92. package/lib/models/export.d.ts.map +1 -1
  93. package/lib/models/export.js +2 -2
  94. package/lib/models/export.js.map +1 -1
  95. package/lib/models/icon.d.ts.map +1 -1
  96. package/lib/models/icon.js +4 -12
  97. package/lib/models/icon.js.map +1 -1
  98. package/lib/models/layer.d.ts +66 -21
  99. package/lib/models/layer.d.ts.map +1 -1
  100. package/lib/models/layer.js +3 -3
  101. package/lib/models/layer.js.map +1 -1
  102. package/lib/models/location.d.ts.map +1 -1
  103. package/lib/models/location.js +2 -6
  104. package/lib/models/location.js.map +1 -1
  105. package/lib/models/login.d.ts.map +1 -1
  106. package/lib/models/login.js +6 -12
  107. package/lib/models/login.js.map +1 -1
  108. package/lib/models/observation.d.ts.map +1 -1
  109. package/lib/models/observation.js +27 -31
  110. package/lib/models/observation.js.map +1 -1
  111. package/lib/models/role.d.ts.map +1 -1
  112. package/lib/models/role.js +7 -20
  113. package/lib/models/role.js.map +1 -1
  114. package/lib/models/setting.d.ts.map +1 -1
  115. package/lib/models/team.d.ts.map +1 -1
  116. package/lib/models/team.js +27 -43
  117. package/lib/models/team.js.map +1 -1
  118. package/lib/models/token.d.ts.map +1 -1
  119. package/lib/models/token.js +27 -20
  120. package/lib/models/token.js.map +1 -1
  121. package/lib/models/user.d.ts.map +1 -1
  122. package/lib/models/user.js +23 -49
  123. package/lib/models/user.js.map +1 -1
  124. package/lib/routes/exports.d.ts.map +1 -1
  125. package/lib/routes/exports.js +2 -1
  126. package/lib/routes/exports.js.map +1 -1
  127. package/lib/routes/observations.d.ts.map +1 -1
  128. package/lib/routes/observations.js +1 -1
  129. package/lib/routes/observations.js.map +1 -1
  130. package/lib/routes/users.d.ts.map +1 -1
  131. package/lib/routes/users.js +104 -49
  132. package/lib/routes/users.js.map +1 -1
  133. package/lib/tsconfig.tsbuildinfo +1 -1
  134. package/lib/utilities/filterParser.js +2 -2
  135. package/lib/utilities/filterParser.js.map +1 -1
  136. package/lib/utilities/paging.js +1 -1
  137. package/lib/utilities/paging.js.map +1 -1
  138. package/npm-shrinkwrap.json +729 -252
  139. package/package.json +8 -8
@@ -15,119 +15,166 @@
15
15
  /// <reference types="mongoose/types/populate" />
16
16
  /// <reference types="mongoose/types/query" />
17
17
  /// <reference types="mongoose/types/schemaoptions" />
18
- /// <reference types="mongoose/types/schematypes" />
19
18
  /// <reference types="mongoose/types/session" />
20
19
  /// <reference types="mongoose/types/types" />
21
20
  /// <reference types="mongoose/types/utility" />
22
21
  /// <reference types="mongoose/types/validation" />
23
22
  /// <reference types="mongoose/types/virtuals" />
23
+ /// <reference types="mongoose/types/schematypes" />
24
24
  /// <reference types="mongoose/types/inferschematype" />
25
+ /// <reference types="mongoose/types/inferrawdoctype" />
25
26
  export { Device as Model };
26
- export function getDeviceById(id: any, options: any): Promise<(mongoose.Document<unknown, any, {
27
+ export function getDeviceById(id: any, options: any): Promise<(mongoose.Document<unknown, {}, {
27
28
  uid: string;
28
29
  registered: boolean;
29
- description?: string | undefined;
30
- userId?: mongoose.Types.ObjectId | undefined;
31
- userAgent?: string | undefined;
32
- appVersion?: string | undefined;
33
- }> & Omit<{
30
+ description?: string | null | undefined;
31
+ userId?: mongoose.Types.ObjectId | null | undefined;
32
+ userAgent?: string | null | undefined;
33
+ appVersion?: string | null | undefined;
34
+ }, {}, {
35
+ versionKey: false;
36
+ }> & {
34
37
  uid: string;
35
38
  registered: boolean;
36
- description?: string | undefined;
37
- userId?: mongoose.Types.ObjectId | undefined;
38
- userAgent?: string | undefined;
39
- appVersion?: string | undefined;
39
+ description?: string | null | undefined;
40
+ userId?: mongoose.Types.ObjectId | null | undefined;
41
+ userAgent?: string | null | undefined;
42
+ appVersion?: string | null | undefined;
40
43
  } & {
41
44
  _id: mongoose.Types.ObjectId;
42
- }, never>) | null>;
45
+ }) | null>;
43
46
  export function getDeviceByUid(uid: any, { expand }?: {
44
47
  expand?: {} | undefined;
45
- }): Promise<(mongoose.Document<unknown, any, {
48
+ }): Promise<(mongoose.Document<unknown, {}, {
46
49
  uid: string;
47
50
  registered: boolean;
48
- description?: string | undefined;
49
- userId?: mongoose.Types.ObjectId | undefined;
50
- userAgent?: string | undefined;
51
- appVersion?: string | undefined;
52
- }> & Omit<{
51
+ description?: string | null | undefined;
52
+ userId?: mongoose.Types.ObjectId | null | undefined;
53
+ userAgent?: string | null | undefined;
54
+ appVersion?: string | null | undefined;
55
+ }, {}, {
56
+ versionKey: false;
57
+ }> & {
53
58
  uid: string;
54
59
  registered: boolean;
55
- description?: string | undefined;
56
- userId?: mongoose.Types.ObjectId | undefined;
57
- userAgent?: string | undefined;
58
- appVersion?: string | undefined;
60
+ description?: string | null | undefined;
61
+ userId?: mongoose.Types.ObjectId | null | undefined;
62
+ userAgent?: string | null | undefined;
63
+ appVersion?: string | null | undefined;
59
64
  } & {
60
65
  _id: mongoose.Types.ObjectId;
61
- }, never>) | null>;
66
+ }) | null>;
62
67
  export function getDevices(options?: {}): Promise<any>;
63
68
  export function count(options: any): Promise<number>;
64
- export function createDevice(device: any): Promise<(mongoose.Document<unknown, any, {
69
+ export function createDevice(device: any): Promise<(mongoose.Document<unknown, {}, {
65
70
  uid: string;
66
71
  registered: boolean;
67
- description?: string | undefined;
68
- userId?: mongoose.Types.ObjectId | undefined;
69
- userAgent?: string | undefined;
70
- appVersion?: string | undefined;
71
- }> & Omit<{
72
+ description?: string | null | undefined;
73
+ userId?: mongoose.Types.ObjectId | null | undefined;
74
+ userAgent?: string | null | undefined;
75
+ appVersion?: string | null | undefined;
76
+ }, {}, {
77
+ versionKey: false;
78
+ }> & {
72
79
  uid: string;
73
80
  registered: boolean;
74
- description?: string | undefined;
75
- userId?: mongoose.Types.ObjectId | undefined;
76
- userAgent?: string | undefined;
77
- appVersion?: string | undefined;
81
+ description?: string | null | undefined;
82
+ userId?: mongoose.Types.ObjectId | null | undefined;
83
+ userAgent?: string | null | undefined;
84
+ appVersion?: string | null | undefined;
78
85
  } & {
79
86
  _id: mongoose.Types.ObjectId;
80
- }, never>) | null>;
81
- export function updateDevice(id: any, update: any): Promise<(mongoose.Document<unknown, any, {
87
+ }) | null>;
88
+ export function updateDevice(id: any, update: any): Promise<(mongoose.Document<unknown, {}, {
82
89
  uid: string;
83
90
  registered: boolean;
84
- description?: string | undefined;
85
- userId?: mongoose.Types.ObjectId | undefined;
86
- userAgent?: string | undefined;
87
- appVersion?: string | undefined;
88
- }> & Omit<{
91
+ description?: string | null | undefined;
92
+ userId?: mongoose.Types.ObjectId | null | undefined;
93
+ userAgent?: string | null | undefined;
94
+ appVersion?: string | null | undefined;
95
+ }, {}, {
96
+ versionKey: false;
97
+ }> & {
89
98
  uid: string;
90
99
  registered: boolean;
91
- description?: string | undefined;
92
- userId?: mongoose.Types.ObjectId | undefined;
93
- userAgent?: string | undefined;
94
- appVersion?: string | undefined;
100
+ description?: string | null | undefined;
101
+ userId?: mongoose.Types.ObjectId | null | undefined;
102
+ userAgent?: string | null | undefined;
103
+ appVersion?: string | null | undefined;
95
104
  } & {
96
105
  _id: mongoose.Types.ObjectId;
97
- }, never>) | null>;
98
- export function deleteDevice(id: any): Promise<(mongoose.Document<unknown, any, {
106
+ }) | null>;
107
+ export function deleteDevice(id: any): Promise<(mongoose.Document<unknown, {}, {
99
108
  uid: string;
100
109
  registered: boolean;
101
- description?: string | undefined;
102
- userId?: mongoose.Types.ObjectId | undefined;
103
- userAgent?: string | undefined;
104
- appVersion?: string | undefined;
105
- }> & Omit<{
110
+ description?: string | null | undefined;
111
+ userId?: mongoose.Types.ObjectId | null | undefined;
112
+ userAgent?: string | null | undefined;
113
+ appVersion?: string | null | undefined;
114
+ }, {}, {
115
+ versionKey: false;
116
+ }> & {
106
117
  uid: string;
107
118
  registered: boolean;
108
- description?: string | undefined;
109
- userId?: mongoose.Types.ObjectId | undefined;
110
- userAgent?: string | undefined;
111
- appVersion?: string | undefined;
119
+ description?: string | null | undefined;
120
+ userId?: mongoose.Types.ObjectId | null | undefined;
121
+ userAgent?: string | null | undefined;
122
+ appVersion?: string | null | undefined;
112
123
  } & {
113
124
  _id: mongoose.Types.ObjectId;
114
- }, never>) | null>;
125
+ }) | null>;
115
126
  declare const Device: mongoose.Model<{
116
127
  uid: string;
117
128
  registered: boolean;
118
- description?: string | undefined;
119
- userId?: mongoose.Types.ObjectId | undefined;
120
- userAgent?: string | undefined;
121
- appVersion?: string | undefined;
122
- }, {}, {}, {}, mongoose.Schema<any, mongoose.Model<any, any, any, any, any>, {}, {}, {}, {}, mongoose.ResolveSchemaOptions<{
129
+ description?: string | null | undefined;
130
+ userId?: mongoose.Types.ObjectId | null | undefined;
131
+ userAgent?: string | null | undefined;
132
+ appVersion?: string | null | undefined;
133
+ }, {}, {}, {}, mongoose.Document<unknown, {}, {
134
+ uid: string;
135
+ registered: boolean;
136
+ description?: string | null | undefined;
137
+ userId?: mongoose.Types.ObjectId | null | undefined;
138
+ userAgent?: string | null | undefined;
139
+ appVersion?: string | null | undefined;
140
+ }, {}, {
141
+ versionKey: false;
142
+ }> & {
143
+ uid: string;
144
+ registered: boolean;
145
+ description?: string | null | undefined;
146
+ userId?: mongoose.Types.ObjectId | null | undefined;
147
+ userAgent?: string | null | undefined;
148
+ appVersion?: string | null | undefined;
149
+ } & {
150
+ _id: mongoose.Types.ObjectId;
151
+ }, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
152
+ versionKey: false;
153
+ }, {
154
+ uid: string;
155
+ registered: boolean;
156
+ description?: string | null | undefined;
157
+ userId?: mongoose.Types.ObjectId | null | undefined;
158
+ userAgent?: string | null | undefined;
159
+ appVersion?: string | null | undefined;
160
+ }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
161
+ uid: string;
162
+ registered: boolean;
163
+ description?: string | null | undefined;
164
+ userId?: mongoose.Types.ObjectId | null | undefined;
165
+ userAgent?: string | null | undefined;
166
+ appVersion?: string | null | undefined;
167
+ }>, {}, mongoose.MergeType<mongoose.DefaultSchemaOptions, {
123
168
  versionKey: false;
124
- }>, {
169
+ }>> & mongoose.FlatRecord<{
125
170
  uid: string;
126
171
  registered: boolean;
127
- description?: string | undefined;
128
- userId?: mongoose.Types.ObjectId | undefined;
129
- userAgent?: string | undefined;
130
- appVersion?: string | undefined;
172
+ description?: string | null | undefined;
173
+ userId?: mongoose.Types.ObjectId | null | undefined;
174
+ userAgent?: string | null | undefined;
175
+ appVersion?: string | null | undefined;
176
+ }> & {
177
+ _id: mongoose.Types.ObjectId;
131
178
  }>>;
132
179
  import mongoose = require("mongoose");
133
180
  //# sourceMappingURL=device.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/models/device.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA0FwB;;;;;;;;;;;;;;;;mBAUvB;AAEwB;;;;;;;;;;;;;;;;;;mBAQxB;AAEoB,uDAmEpB;AAEe,qDAOf;AAoDsB;;;;;;;;;;;;;;;;mBAatB;AAEsB;;;;;;;;;;;;;;;;mBAGtB;AAEsB;;;;;;;;;;;;;;;;mBAEtB;AA/KD;;;;;;;;;;;;;;;;IAAsD"}
1
+ {"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/models/device.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AA0FwB;;;;;;;;;;;;;;;;;;WAUvB;AAEwB;;;;;;;;;;;;;;;;;;;;WAQxB;AAEoB,uDAmEpB;AAEe,qDAOf;AAoDsB;;;;;;;;;;;;;;;;;;WAatB;AAEsB;;;;;;;;;;;;;;;;;;WAGtB;AAEsB;;;;;;;;;;;;;;;;;;WAEtB;AA/KD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAsD"}
@@ -171,7 +171,7 @@ exports.count = function (options) {
171
171
  options = options || {};
172
172
  var filter = options.filter || {};
173
173
  var conditions = createQueryConditions(filter);
174
- return Device.count(conditions).exec();
174
+ return Device.countDocuments(conditions).exec();
175
175
  };
176
176
  function createQueryConditions(filter) {
177
177
  const conditions = FilterParser.parse(filter);
@@ -194,7 +194,7 @@ function queryUsersAndDevicesThenPage(options, conditions) {
194
194
  registered = conditions.registered;
195
195
  delete conditions.registered;
196
196
  }
197
- const count = yield User.Model.count(conditions);
197
+ const count = yield User.Model.countDocuments(conditions);
198
198
  return User.Model.find(conditions, "_id").populate({ path: 'authenticationId', populate: { path: 'authenticationConfigurationId' } }).exec().then(data => {
199
199
  const ids = [];
200
200
  for (let i = 0; i < data.length; i++) {
@@ -1 +1 @@
1
- {"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/models/device.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/models/device.js"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/models/event.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AA6SgB,yDAoBf;AAEmB,qEA2GnB;AAEiB,oEAqCjB;AAwBgB,mEAuChB;AAEgB,+EA0BhB;AAEiB,sEAoBjB;AAEoB,uEAoBpB;AAEoB;;;;;;UAwDpB;AAEuB;;;;;;UAwDvB;AAEyB;;;;;;;;UAuCzB;AAE4B;;;;;;UAqC5B;AAEiB,oEAkBjB;AAEoB,sEAgBpB;AAEkB,sEAUlB;AAEqB,yEAUrB;AAE+B,uEAO/B;AAE8B,qEAO9B;AAEyB,0FA0BzB;AAG2B,kFAc3B;AAE+B,sEAO/B;AAEgB,wDAIhB;AAEkB,4DAuBlB;AAEkB,0EA0BlB;AAnuBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAmD;AAuBnD,oFAsBC"}
1
+ {"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/models/event.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAuSgB,yDAqBf;AAEmB,qEA6GnB;AAEiB,oEAyCjB;AAwBgB,mEAuChB;AAEgB,+EAwBhB;AAEiB,sEAoBjB;AAEoB,uEAkBpB;AAEoB;;;;;;;;UAwDpB;AAEuB;;;;;;;;UAwDvB;AAEyB;;;;;;;;;;;;UAuCzB;AAE4B;;;;;;;;UAqC5B;AAEiB,oEAqBjB;AAEoB,sEAiBpB;AAEkB,sEAWlB;AAEqB,yEAWrB;AAE+B,uEAQ/B;AAE8B,qEAQ9B;AAEyB,0FA0BzB;AAG2B,kFAc3B;AAE+B,sEAU/B;AAEgB,wDAKhB;AAEkB,4DAwBlB;AAEkB,0EA2BlB;AA9uBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAmD;AAuBnD,oFAgBC"}
@@ -151,10 +151,10 @@ EventSchema.pre('init', function (event) {
151
151
  });
152
152
  }
153
153
  });
154
- EventSchema.pre('remove', function (next) {
154
+ EventSchema.pre('deleteOne', { document: true, query: false }, function (next) {
155
155
  dropObservationCollection(this, next);
156
156
  });
157
- EventSchema.post('remove', function (event) {
157
+ EventSchema.post('deleteOne', { document: true, query: false }, function (event) {
158
158
  if (event.populated('teamIds')) {
159
159
  event.depopulate('teamIds');
160
160
  }
@@ -247,24 +247,18 @@ function convertProjection(field, keys, projection) {
247
247
  }
248
248
  // TODO look at filtering this in query, not after
249
249
  function filterEventsByUserId(events, userId, callback) {
250
- Event.populate(events, 'teamIds', function (err, events) {
251
- if (err)
252
- return callback(err);
250
+ Event.populate(events, 'teamIds').then(events => {
253
251
  const filteredEvents = events.filter(function (event) {
254
- // Check if user has read access to the event based on
255
- // being on a team that is in the event
256
252
  if (event.teamIds.some(function (team) { return team.userIds.indexOf(userId) !== -1; })) {
257
253
  return true;
258
254
  }
259
- // Check if user has read access to the event based on
260
- // being in the events access control list
261
255
  if (event.acl[userId] && rolesWithPermission('read').some(function (role) { return role === event.acl[userId]; })) {
262
256
  return true;
263
257
  }
264
258
  return false;
265
259
  });
266
260
  callback(null, filteredEvents);
267
- });
261
+ }, err => callback(err));
268
262
  }
269
263
  exports.count = function (options, callback) {
270
264
  if (typeof options === 'function') {
@@ -281,9 +275,7 @@ exports.count = function (options, callback) {
281
275
  });
282
276
  conditions['$or'] = accesses;
283
277
  }
284
- Event.countDocuments(conditions, function (err, count) {
285
- callback(err, count);
286
- });
278
+ Event.countDocuments(conditions).then(count => callback(null, count), err => callback(err));
287
279
  };
288
280
  exports.getEvents = function (options, callback) {
289
281
  return __awaiter(this, void 0, void 0, function* () {
@@ -376,18 +368,14 @@ exports.getEvents = function (options, callback) {
376
368
  if (options.limit != null) {
377
369
  findQuery = findQuery.limit(options.limit).skip(options.start * options.limit || 0);
378
370
  }
379
- findQuery.exec((err, events) => {
380
- if (err)
381
- return callback(err);
371
+ findQuery.exec().then(events => {
382
372
  if (options.populate) {
383
- Event.populate(events, [{ path: 'teamIds' }, { path: 'layerIds' }], function (err, events) {
384
- callback(err, events, totalCount);
385
- });
373
+ Event.populate(events, [{ path: 'teamIds' }, { path: 'layerIds' }]).then(events => callback(null, events, totalCount), err => callback(err));
386
374
  }
387
375
  else {
388
376
  callback(null, events, totalCount);
389
377
  }
390
- });
378
+ }, err => callback(err));
391
379
  });
392
380
  };
393
381
  exports.getById = function (id, options, callback) {
@@ -395,9 +383,9 @@ exports.getById = function (id, options, callback) {
395
383
  callback = options;
396
384
  options = {};
397
385
  }
398
- Event.findById(id, function (err, event) {
399
- if (err || !event)
400
- return callback(err);
386
+ Event.findById(id).then(event => {
387
+ if (!event)
388
+ return callback(null);
401
389
  const filters = [];
402
390
  // First filter out events user my not have access to
403
391
  if (options.access && options.access.userId) {
@@ -414,9 +402,7 @@ exports.getById = function (id, options, callback) {
414
402
  if (err)
415
403
  return callback(err);
416
404
  if (options.populate) {
417
- event.populate([{ path: 'teamIds' }, { path: 'layerIds' }], function (err, events) {
418
- callback(err, events);
419
- });
405
+ event.populate([{ path: 'teamIds' }, { path: 'layerIds' }]).then(events => callback(null, events), err => callback(err));
420
406
  }
421
407
  else {
422
408
  event.depopulate('teamIds');
@@ -424,7 +410,7 @@ exports.getById = function (id, options, callback) {
424
410
  callback(null, event);
425
411
  }
426
412
  });
427
- });
413
+ }, err => callback(err));
428
414
  };
429
415
  // TODO probably should live in event api
430
416
  exports.filterEventsByUserId = filterEventsByUserId;
@@ -457,18 +443,16 @@ exports.create = function (event, user, callback) {
457
443
  event.collectionName = 'observations' + id;
458
444
  event.acl = {};
459
445
  event.acl[user._id.toString()] = 'OWNER';
460
- Event.create(event, function (err, newEvent) {
461
- if (err)
462
- return done(err);
446
+ Event.create(event).then(newEvent => {
463
447
  createObservationCollection(newEvent);
464
448
  done(null, newEvent);
465
- });
449
+ }, err => done(err));
466
450
  },
467
451
  function (event, done) {
468
452
  Team.createTeamForEvent(event, user, function (err) {
469
453
  if (err) {
470
454
  // could not create the team for this event, remove the event and error out
471
- event.remove(function () {
455
+ event.deleteOne().then(function () {
472
456
  done(err);
473
457
  });
474
458
  }
@@ -499,12 +483,7 @@ exports.update = function (id, event, options, callback) {
499
483
  form._id = form.id;
500
484
  });
501
485
  }
502
- Event.findByIdAndUpdate(id, update, { new: true, runValidators: true }, function (err, updatedEvent) {
503
- if (err) {
504
- return callback(err);
505
- }
506
- callback(err, updatedEvent);
507
- });
486
+ Event.findByIdAndUpdate(id, update, { new: true, runValidators: true }).then(updatedEvent => callback(null, updatedEvent), err => callback(err));
508
487
  };
509
488
  exports.addForm = function (eventId, form, callback) {
510
489
  Counter.getNext('form')
@@ -513,35 +492,29 @@ exports.addForm = function (eventId, form, callback) {
513
492
  const update = {
514
493
  $push: { forms: form }
515
494
  };
516
- Event.findByIdAndUpdate(eventId, update, { new: true, runValidators: true }, function (err, event) {
517
- if (err)
518
- return callback(err);
495
+ Event.findByIdAndUpdate(eventId, update, { new: true, runValidators: true }).then(event => {
519
496
  const forms = event.forms.filter(function (f) {
520
497
  return f._id === form._id;
521
498
  });
522
- callback(err, event, forms.length ? forms[0] : null);
523
- });
499
+ callback(null, event, forms.length ? forms[0] : null);
500
+ }, err => callback(err));
524
501
  })
525
502
  .catch(err => callback(err));
526
503
  };
527
504
  exports.updateForm = function (event, form, callback) {
528
- new Form(form).validate(function (err) {
529
- if (err)
530
- return callback(err);
505
+ new Form(form).validate().then(() => {
531
506
  const update = {
532
507
  $set: {
533
508
  'forms.$': form
534
509
  }
535
510
  };
536
- Event.findOneAndUpdate({ 'forms._id': form._id }, update, { new: true, runValidators: true }, function (err, event) {
537
- if (err)
538
- return callback(err);
511
+ Event.findOneAndUpdate({ 'forms._id': form._id }, update, { new: true, runValidators: true }).then(event => {
539
512
  const forms = event.forms.filter(function (f) {
540
513
  return f._id === form._id;
541
514
  });
542
- callback(err, event, forms.length ? forms[0] : null);
543
- });
544
- });
515
+ callback(null, event, forms.length ? forms[0] : null);
516
+ }, err => callback(err));
517
+ }).catch(err => callback(err));
545
518
  };
546
519
  exports.getMembers = function (eventId, options) {
547
520
  return __awaiter(this, void 0, void 0, function* () {
@@ -736,7 +709,7 @@ exports.addTeam = function (event, team, callback) {
736
709
  teamIds: new mongoose.Types.ObjectId(team.id)
737
710
  }
738
711
  };
739
- Event.findByIdAndUpdate(event._id, update, done);
712
+ Event.findByIdAndUpdate(event._id, update).then(result => done(null, result), err => done(err));
740
713
  }
741
714
  ], function (err, results) {
742
715
  callback(err, results[1]);
@@ -753,9 +726,7 @@ exports.removeTeam = function (event, team, callback) {
753
726
  teamIds: { $in: [new mongoose.Types.ObjectId(team.id)] }
754
727
  }
755
728
  };
756
- Event.findByIdAndUpdate(event._id, update, function (err, event) {
757
- callback(err, event);
758
- });
729
+ Event.findByIdAndUpdate(event._id, update).then(event => callback(null, event), err => callback(err));
759
730
  };
760
731
  exports.addLayer = function (event, layer, callback) {
761
732
  const update = {
@@ -763,9 +734,7 @@ exports.addLayer = function (event, layer, callback) {
763
734
  layerIds: layer.id
764
735
  }
765
736
  };
766
- Event.findByIdAndUpdate(event._id, update, function (err, event) {
767
- callback(err, event);
768
- });
737
+ Event.findByIdAndUpdate(event._id, update).then(event => callback(null, event), err => callback(err));
769
738
  };
770
739
  exports.removeLayer = function (event, layer, callback) {
771
740
  const update = {
@@ -773,25 +742,19 @@ exports.removeLayer = function (event, layer, callback) {
773
742
  layerIds: { $in: [layer.id] }
774
743
  }
775
744
  };
776
- Event.findByIdAndUpdate(event._id, update, function (err, event) {
777
- callback(err, event);
778
- });
745
+ Event.findByIdAndUpdate(event._id, update).then(event => callback(null, event), err => callback(err));
779
746
  };
780
747
  exports.removeLayerFromEvents = function (layer, callback) {
781
748
  const update = {
782
749
  $pull: { layerIds: layer._id }
783
750
  };
784
- Event.updateMany({}, update, function (err) {
785
- callback(err);
786
- });
751
+ Event.updateMany({}, update).then(() => callback(null), err => callback(err));
787
752
  };
788
753
  exports.removeTeamFromEvents = function (team, callback) {
789
754
  const update = {
790
755
  $pull: { teamIds: team._id }
791
756
  };
792
- Event.updateMany({}, update, function (err) {
793
- callback(err);
794
- });
757
+ Event.updateMany({}, update).then(() => callback(null), err => callback(err));
795
758
  };
796
759
  exports.updateUserInAcl = function (eventId, userId, role, callback) {
797
760
  // validate userId
@@ -808,40 +771,32 @@ exports.updateUserInAcl = function (eventId, userId, role, callback) {
808
771
  }
809
772
  const update = {};
810
773
  update['acl.' + userId] = role;
811
- Event.findOneAndUpdate({ _id: eventId }, update, { new: true, runValidators: true }, function (err, event) {
812
- if (err)
813
- return callback(err);
814
- // The team that belongs to this event should have the same acl as the event
774
+ Event.findOneAndUpdate({ _id: eventId }, update, { new: true, runValidators: true }).then(event => {
815
775
  Team.updateUserInAclForEventTeam(eventId, userId, role, function (err) {
816
776
  callback(err, event);
817
777
  });
818
- });
778
+ }, err => callback(err));
819
779
  };
820
780
  exports.removeUserFromAcl = function (eventId, userId, callback) {
821
781
  const update = {
822
782
  $unset: {}
823
783
  };
824
784
  update.$unset['acl.' + userId] = true;
825
- Event.findByIdAndUpdate(eventId, update, { new: true, runValidators: true }, function (err, event) {
826
- if (err)
827
- return callback(err);
828
- // The team that belongs to this event should have the same acl as the event
785
+ Event.findByIdAndUpdate(eventId, update, { new: true, runValidators: true }).then(event => {
829
786
  Team.removeUserFromAclForEventTeam(eventId, userId, function (err) {
830
787
  callback(err, event);
831
788
  });
832
- });
789
+ }, err => callback(err));
833
790
  };
834
791
  exports.removeUserFromAllAcls = function (user, callback) {
835
792
  const update = {
836
793
  $unset: {}
837
794
  };
838
795
  update.$unset['acl.' + user._id.toString()] = true;
839
- Event.updateMany({}, update, { new: true }, callback);
796
+ Event.updateMany({}, update, { new: true }).then(() => callback(null), err => callback(err));
840
797
  };
841
798
  exports.remove = function (event, callback) {
842
- event.remove(function (err) {
843
- return callback(err);
844
- });
799
+ event.deleteOne().then(() => callback(null), err => callback(err));
845
800
  };
846
801
  exports.getUsers = function (eventId, callback) {
847
802
  const populate = {
@@ -850,19 +805,17 @@ exports.getUsers = function (eventId, callback) {
850
805
  path: 'userIds'
851
806
  }
852
807
  };
853
- Event.findById(eventId).populate(populate).exec(function (err, event) {
854
- if (err)
855
- return callback(err);
808
+ Event.findById(eventId).populate(populate).exec().then(event => {
856
809
  if (!event) {
857
- err = new Error("Event does not exist");
810
+ const err = new Error("Event does not exist");
858
811
  err.status = 404;
859
812
  return callback(err);
860
813
  }
861
814
  const users = event.teamIds.reduce(function (users, team) {
862
815
  return users.concat(team.userIds);
863
816
  }, []);
864
- callback(err, users);
865
- });
817
+ callback(null, users);
818
+ }, err => callback(err));
866
819
  };
867
820
  exports.getTeams = function (eventId, options, callback) {
868
821
  const projection = {
@@ -876,15 +829,13 @@ exports.getTeams = function (eventId, options, callback) {
876
829
  path: 'userIds',
877
830
  };
878
831
  }
879
- Event.findById(eventId, projection).populate(populate).exec(function (err, event) {
880
- if (err)
881
- return callback(err);
832
+ Event.findById(eventId, projection).populate(populate).exec().then(event => {
882
833
  if (!event) {
883
- err = new Error("Event does not exist");
834
+ const err = new Error("Event does not exist");
884
835
  err.status = 404;
885
836
  return callback(err);
886
837
  }
887
- callback(err, event.teamIds);
888
- });
838
+ callback(null, event.teamIds);
839
+ }, err => callback(err));
889
840
  };
890
841
  //# sourceMappingURL=event.js.map