@ngageoint/mage.service 6.3.0 → 6.4.0-beta.2
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.
- package/lib/adapters/observations/adapters.observations.dto.ecma404-json.d.ts.map +1 -1
- package/lib/adapters/observations/adapters.observations.dto.ecma404-json.js +2 -1
- package/lib/adapters/observations/adapters.observations.dto.ecma404-json.js.map +1 -1
- package/lib/api/observation.d.ts.map +1 -1
- package/lib/api/observation.js +61 -46
- package/lib/api/observation.js.map +1 -1
- package/lib/app.api/observations/app.api.observations.d.ts +1 -0
- package/lib/app.api/observations/app.api.observations.d.ts.map +1 -1
- package/lib/app.api/observations/app.api.observations.js.map +1 -1
- package/lib/app.impl/observations/app.impl.observations.js +32 -29
- package/lib/app.impl/observations/app.impl.observations.js.map +1 -1
- package/lib/authentication/ldap.d.ts.map +1 -1
- package/lib/authentication/ldap.js +3 -1
- package/lib/authentication/ldap.js.map +1 -1
- package/lib/dist-package.json +2 -1
- package/lib/entities/observations/entities.observations.d.ts +5 -0
- package/lib/entities/observations/entities.observations.d.ts.map +1 -1
- package/lib/entities/observations/entities.observations.js +3 -1
- package/lib/entities/observations/entities.observations.js.map +1 -1
- package/lib/models/event.d.ts.map +1 -1
- package/lib/models/event.js +2 -1
- package/lib/models/event.js.map +1 -1
- package/lib/models/observation.d.ts +1 -1
- package/lib/models/team.d.ts.map +1 -1
- package/lib/models/team.js +2 -1
- package/lib/models/team.js.map +1 -1
- package/lib/routes/imports.d.ts +8 -2
- package/lib/routes/imports.d.ts.map +1 -1
- package/lib/routes/imports.js +90 -32
- package/lib/routes/imports.js.map +1 -1
- package/lib/routes/logins.d.ts.map +1 -1
- package/lib/routes/logins.js +4 -0
- package/lib/routes/logins.js.map +1 -1
- package/lib/routes/observations.d.ts.map +1 -1
- package/lib/routes/observations.js +90 -65
- package/lib/routes/observations.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/utilities/transformKML.d.ts +8 -0
- package/lib/utilities/transformKML.d.ts.map +1 -0
- package/lib/utilities/transformKML.js +316 -0
- package/lib/utilities/transformKML.js.map +1 -0
- package/npm-shrinkwrap.json +13 -2
- package/package.json +2 -1
- package/lib/utilities/togeojson.d.ts +0 -2
- package/lib/utilities/togeojson.d.ts.map +0 -1
- package/lib/utilities/togeojson.js +0 -308
- package/lib/utilities/togeojson.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.observations.dto.ecma404-json.d.ts","sourceRoot":"","sources":["../../../src/adapters/observations/adapters.observations.dto.ecma404-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAA;AACnF,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAA;AASzD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"adapters.observations.dto.ecma404-json.d.ts","sourceRoot":"","sources":["../../../src/adapters/observations/adapters.observations.dto.ecma404-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAA;AACnF,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAA;AASzD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,iBAAiB,CA0C3F"}
|
|
@@ -51,7 +51,8 @@ function exoObservationModFromJson(json) {
|
|
|
51
51
|
id: json.id,
|
|
52
52
|
type: 'Feature',
|
|
53
53
|
geometry: json.geometry,
|
|
54
|
-
properties: Object.assign(Object.assign({}, properties), { timestamp: timestamp.toDate() })
|
|
54
|
+
properties: Object.assign(Object.assign({}, properties), { timestamp: timestamp.toDate() }),
|
|
55
|
+
noGeometry: !!json.noGeometry
|
|
55
56
|
};
|
|
56
57
|
if (bbox) {
|
|
57
58
|
mod.bbox = bbox;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.observations.dto.ecma404-json.js","sourceRoot":"","sources":["../../../src/adapters/observations/adapters.observations.dto.ecma404-json.ts"],"names":[],"mappings":";;;;;;AACA,oDAA2B;AAC3B,iEAA8E;AAK9E;;;;GAIG;AAEH;;;;;;;GAOG;AACH,SAAgB,yBAAyB,CAAC,IAAU;IAClD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC5D,OAAO,IAAA,6BAAY,EAAC,2CAA2C,CAAC,CAAA;KACjE;IACD,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE;QAC/B,OAAO,IAAA,6BAAY,EAAC,oCAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"adapters.observations.dto.ecma404-json.js","sourceRoot":"","sources":["../../../src/adapters/observations/adapters.observations.dto.ecma404-json.ts"],"names":[],"mappings":";;;;;;AACA,oDAA2B;AAC3B,iEAA8E;AAK9E;;;;GAIG;AAEH;;;;;;;GAOG;AACH,SAAgB,yBAAyB,CAAC,IAAU;IAClD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC5D,OAAO,IAAA,6BAAY,EAAC,2CAA2C,CAAC,CAAA;KACjE;IACD,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE;QAC/B,OAAO,IAAA,6BAAY,EAAC,oCAAoC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;KAClE;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACtB,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9C,OAAO,IAAA,6BAAY,EAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;KACxD;IACD,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAA,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE;QAChG,OAAO,IAAA,6BAAY,EAAC,6BAA6B,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;KACjE;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;QACtD,OAAO,IAAA,6BAAY,EAAC,kCAAkC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;KAClE;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;IAClC,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC9E,OAAO,IAAA,6BAAY,EAAC,2CAA2C,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;KACjF;IACD,IAAI,CAAC,UAAU,CAAC,SAAS,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,QAAQ,EAAE;QACrE,OAAO,IAAA,6BAAY,EAAC,yCAAyC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAA;KAC5F;IACD,MAAM,SAAS,GAAG,IAAA,gBAAM,EAAC,UAAU,CAAC,SAAS,EAAE,gBAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACrE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;QACxB,OAAO,IAAA,6BAAY,EAAC,sDAAsD,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAA;KACzG;IACD,MAAM,GAAG,GAAsB;QAC7B,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI,CAAC,QAA+B;QAC9C,UAAU,kCACL,UAAiB,KACpB,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,GAC9B;QACD,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU;KAC9B,CAAA;IACD,IAAI,IAAI,EAAE;QACR,GAAG,CAAC,IAAI,GAAG,IAAY,CAAA;KACxB;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AA1CD,8DA0CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../../src/api/observation.js"],"names":[],"mappings":";AASA,yEAIC;;IAJD,kDAIC;IAHC,YAAmB;IACnB,WAAiB;IACjB,eAAyB;IAM3B,
|
|
1
|
+
{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../../src/api/observation.js"],"names":[],"mappings":";AASA,yEAIC;;IAJD,kDAIC;IAHC,YAAmB;IACnB,WAAiB;IACjB,eAAyB;IAM3B,0CA8BC;IAED,+DAYC;IAED,8CAqJC;IAED,yCAEC;IAED,oDAWC;IAGD,iEAsEC;IAED,gEAEC;IAED,iEAEC;IAED,sEAWC;IAED,uDAEC;IAED,8DAaC;;;;;AAxUD,8CAA6C"}
|
package/lib/api/observation.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
const async = require(
|
|
2
|
+
const async = require("async"), log = require("winston"), ObservationEvents = require("./events/observation.js"), FieldFactory = require("./field"), ObservationModel = require("../models/observation"), Attachment = require("./attachment");
|
|
3
3
|
const fieldFactory = new FieldFactory();
|
|
4
4
|
function Observation(event, user, deviceId) {
|
|
5
5
|
this._event = event;
|
|
@@ -32,7 +32,7 @@ Observation.prototype.getAll = function (options, callback) {
|
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
Observation.prototype.getById = function (observationId, options, callback) {
|
|
35
|
-
if (typeof options ===
|
|
35
|
+
if (typeof options === "function") {
|
|
36
36
|
callback = options;
|
|
37
37
|
options = {};
|
|
38
38
|
}
|
|
@@ -40,30 +40,41 @@ Observation.prototype.getById = function (observationId, options, callback) {
|
|
|
40
40
|
};
|
|
41
41
|
Observation.prototype.validate = function (observation) {
|
|
42
42
|
const errors = {};
|
|
43
|
-
let message =
|
|
44
|
-
if (observation.type !==
|
|
45
|
-
errors.type = {
|
|
46
|
-
|
|
43
|
+
let message = "";
|
|
44
|
+
if (observation.type !== "Feature") {
|
|
45
|
+
errors.type = {
|
|
46
|
+
error: "required",
|
|
47
|
+
message: observation.type
|
|
48
|
+
? "type is required"
|
|
49
|
+
: 'type must equal "Feature"',
|
|
50
|
+
};
|
|
51
|
+
message += observation.type
|
|
52
|
+
? "\u2022 type is required\n"
|
|
53
|
+
: '\u2022 type must equal "Feature"\n';
|
|
47
54
|
}
|
|
48
55
|
// validate timestamp
|
|
49
56
|
const properties = observation.properties || {};
|
|
50
|
-
const timestampError = fieldFactory
|
|
51
|
-
|
|
57
|
+
const timestampError = fieldFactory
|
|
58
|
+
.createField({
|
|
59
|
+
type: "date",
|
|
52
60
|
required: true,
|
|
53
|
-
name:
|
|
54
|
-
title:
|
|
55
|
-
}, properties)
|
|
61
|
+
name: "timestamp",
|
|
62
|
+
title: "Date",
|
|
63
|
+
}, properties)
|
|
64
|
+
.validate();
|
|
56
65
|
if (timestampError) {
|
|
57
66
|
errors.timestamp = timestampError;
|
|
58
67
|
message += `\u2022 ${timestampError.message}\n`;
|
|
59
68
|
}
|
|
60
69
|
// validate geometry
|
|
61
|
-
const geometryError = fieldFactory
|
|
62
|
-
|
|
70
|
+
const geometryError = fieldFactory
|
|
71
|
+
.createField({
|
|
72
|
+
type: "geometry",
|
|
63
73
|
required: true,
|
|
64
|
-
name:
|
|
65
|
-
title:
|
|
66
|
-
}, observation)
|
|
74
|
+
name: "geometry",
|
|
75
|
+
title: "Location",
|
|
76
|
+
}, observation)
|
|
77
|
+
.validate();
|
|
67
78
|
if (geometryError) {
|
|
68
79
|
errors.geometry = geometryError;
|
|
69
80
|
message += `\u2022 ${geometryError.message}\n`;
|
|
@@ -75,32 +86,34 @@ Observation.prototype.validate = function (observation) {
|
|
|
75
86
|
}, {});
|
|
76
87
|
const formDefinitions = {};
|
|
77
88
|
// Validate total number of forms
|
|
78
|
-
if (this._event.minObservationForms != null &&
|
|
89
|
+
if (this._event.minObservationForms != null &&
|
|
90
|
+
formEntries.length < this._event.minObservationForms) {
|
|
79
91
|
errors.minObservationForms = new Error("Insufficient number of forms");
|
|
80
92
|
message += `\u2022 Total number of forms in observation must be at least ${this._event.minObservationForms}\n`;
|
|
81
93
|
}
|
|
82
|
-
if (this._event.maxObservationForms != null &&
|
|
94
|
+
if (this._event.maxObservationForms != null &&
|
|
95
|
+
formEntries.length > this._event.maxObservationForms) {
|
|
83
96
|
errors.maxObservationForms = new Error("Exceeded maximum number of forms");
|
|
84
97
|
message += `\u2022 Total number of forms in observation cannot be more than ${this._event.maxObservationForms}\n`;
|
|
85
98
|
}
|
|
86
99
|
// Validate forms min/max occurrences
|
|
87
100
|
const formError = {};
|
|
88
101
|
this._event.forms
|
|
89
|
-
.filter(form => !form.archived)
|
|
90
|
-
.forEach(formDefinition => {
|
|
102
|
+
.filter((form) => !form.archived)
|
|
103
|
+
.forEach((formDefinition) => {
|
|
91
104
|
formDefinitions[formDefinition._id] = formDefinition;
|
|
92
105
|
const count = formCount[formDefinition.id] || 0;
|
|
93
106
|
if (formDefinition.min && count < formDefinition.min) {
|
|
94
107
|
formError[formDefinition.id] = {
|
|
95
|
-
error:
|
|
96
|
-
message: `${formDefinition.name} form must be included in observation at least ${formDefinition.min} times
|
|
108
|
+
error: "min",
|
|
109
|
+
message: `${formDefinition.name} form must be included in observation at least ${formDefinition.min} times`,
|
|
97
110
|
};
|
|
98
111
|
message += `\u2022 ${formDefinition.name} form must be included in observation at least ${formDefinition.min} times\n`;
|
|
99
112
|
}
|
|
100
|
-
else if (formDefinition.max &&
|
|
113
|
+
else if (formDefinition.max && count > formDefinition.max) {
|
|
101
114
|
formError[formDefinition.id] = {
|
|
102
|
-
error:
|
|
103
|
-
message: `${formDefinition.name} form cannot be included in observation more than ${formDefinition.max} times
|
|
115
|
+
error: "max",
|
|
116
|
+
message: `${formDefinition.name} form cannot be included in observation more than ${formDefinition.max} times`,
|
|
104
117
|
};
|
|
105
118
|
message += `\u2022 ${formDefinition.name} form cannot be included in observation more than ${formDefinition.max} times\n`;
|
|
106
119
|
}
|
|
@@ -111,12 +124,12 @@ Observation.prototype.validate = function (observation) {
|
|
|
111
124
|
}
|
|
112
125
|
// Validate form fields
|
|
113
126
|
const formErrors = [];
|
|
114
|
-
formEntries.forEach(formEntry => {
|
|
115
|
-
let fieldsMessage =
|
|
127
|
+
formEntries.forEach((formEntry) => {
|
|
128
|
+
let fieldsMessage = "";
|
|
116
129
|
const fieldsError = {};
|
|
117
130
|
formDefinitions[formEntry.formId].fields
|
|
118
|
-
.filter(fieldDefinition => !fieldDefinition.archived)
|
|
119
|
-
.forEach(fieldDefinition => {
|
|
131
|
+
.filter((fieldDefinition) => !fieldDefinition.archived)
|
|
132
|
+
.forEach((fieldDefinition) => {
|
|
120
133
|
const field = fieldFactory.createField(fieldDefinition, formEntry, observation);
|
|
121
134
|
const fieldError = field.validate();
|
|
122
135
|
if (fieldError) {
|
|
@@ -134,8 +147,8 @@ Observation.prototype.validate = function (observation) {
|
|
|
134
147
|
errors.forms = formErrors;
|
|
135
148
|
}
|
|
136
149
|
if (Object.keys(errors).length) {
|
|
137
|
-
const err = new Error(
|
|
138
|
-
err.name =
|
|
150
|
+
const err = new Error("Invalid Observation");
|
|
151
|
+
err.name = "ValidationError";
|
|
139
152
|
err.status = 400;
|
|
140
153
|
err.message = message;
|
|
141
154
|
err.errors = errors;
|
|
@@ -170,24 +183,26 @@ Observation.prototype.update = function (observationId, observation, callback) {
|
|
|
170
183
|
EventEmitter.emit(ObservationEvents.events.update, updatedObservation.toObject({ event: this._event }), this._event, this._user);
|
|
171
184
|
// Remove any deleted attachments from file system
|
|
172
185
|
/*
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
186
|
+
TODO: this might not even work. observation form entries are not stored
|
|
187
|
+
with field entry keys for attachment fields, so finding attachments based
|
|
188
|
+
on matching form entry keys with form field names will not produce any
|
|
189
|
+
results.
|
|
190
|
+
*/
|
|
178
191
|
const { forms: formEntries = [] } = observation.properties || {};
|
|
179
|
-
formEntries.forEach(formEntry => {
|
|
180
|
-
const formDefinition = this._event.forms.find(form => form._id === formEntry.formId);
|
|
181
|
-
Object.keys(formEntry).forEach(fieldName => {
|
|
182
|
-
const fieldDefinition = formDefinition.fields.find(field => field.name === fieldName);
|
|
183
|
-
if (fieldDefinition && fieldDefinition.type ===
|
|
192
|
+
formEntries.forEach((formEntry) => {
|
|
193
|
+
const formDefinition = this._event.forms.find((form) => form._id === formEntry.formId);
|
|
194
|
+
Object.keys(formEntry).forEach((fieldName) => {
|
|
195
|
+
const fieldDefinition = formDefinition.fields.find((field) => field.name === fieldName);
|
|
196
|
+
if (fieldDefinition && fieldDefinition.type === "attachment") {
|
|
184
197
|
const attachmentsField = formEntry[fieldName] || [];
|
|
185
|
-
attachmentsField
|
|
186
|
-
|
|
198
|
+
attachmentsField
|
|
199
|
+
.filter((attachmentField) => attachmentField.action === "delete")
|
|
200
|
+
.forEach((attachmentField) => {
|
|
201
|
+
const attachment = observation.attachments.find((attachment) => attachment._id.toString() === attachmentField.id);
|
|
187
202
|
if (attachment) {
|
|
188
203
|
console.info(`deleting attachment ${attachment.id} for field ${fieldName} on observation ${observation.id}`);
|
|
189
|
-
new Attachment(this._event, observation).delete(attachment._id, err => {
|
|
190
|
-
log.warn(
|
|
204
|
+
new Attachment(this._event, observation).delete(attachment._id, (err) => {
|
|
205
|
+
log.warn("Error removing deleted attachment from file system", err);
|
|
191
206
|
});
|
|
192
207
|
}
|
|
193
208
|
});
|
|
@@ -213,7 +228,7 @@ Observation.prototype.removeImportant = function (observation, callback) {
|
|
|
213
228
|
Observation.prototype.addState = function (observationId, state, callback) {
|
|
214
229
|
ObservationModel.addState(this._event, observationId, state, (err, state) => {
|
|
215
230
|
if (!err) {
|
|
216
|
-
if (state.name ===
|
|
231
|
+
if (state.name === "archive") {
|
|
217
232
|
EventEmitter.emit(ObservationEvents.events.remove, observationId, this._event);
|
|
218
233
|
}
|
|
219
234
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observation.js","sourceRoot":"","sources":["../../src/api/observation.js"],"names":[],"mappings":";AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"observation.js","sourceRoot":"","sources":["../../src/api/observation.js"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,7 @@ export type ExoObservation = Omit<ObservationAttrs, 'attachments' | 'important'
|
|
|
59
59
|
important?: ExoObservationImportantFlag;
|
|
60
60
|
state?: ObservationState;
|
|
61
61
|
attachments: ExoAttachment[];
|
|
62
|
+
noGeometry?: boolean;
|
|
62
63
|
};
|
|
63
64
|
export type ExoAttachment = Omit<Attachment, 'thumbnails' | 'contentLocator'> & {
|
|
64
65
|
contentStored: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.api.observations.d.ts","sourceRoot":"","sources":["../../../src/app.api/observations/app.api.observations.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AACtH,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAwB,gCAAgC,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,aAAa,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,0BAA0B,EAA+C,MAAM,mDAAmD,CAAA;AAChX,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAA;AAEjE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAIlE,MAAM,WAAW,yBAAyB,CAAC,SAAS,GAAG,OAAO,CAAE,SAAQ,iBAAiB,CAAC,SAAS,CAAC;IAClG,SAAS,EAAE,SAAS,CAAA;IACpB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,qBAAqB,EAAE,gCAAgC,CAAA;CACxD;AACD,MAAM,WAAW,kBAAkB,CAAC,SAAS,GAAG,OAAO,CAAE,SAAQ,UAAU,CAAC,SAAS,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"app.api.observations.d.ts","sourceRoot":"","sources":["../../../src/app.api/observations/app.api.observations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.api.observations.js","sourceRoot":"","sources":["../../../src/app.api/observations/app.api.observations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,6FAAgX;
|
|
1
|
+
{"version":3,"file":"app.api.observations.js","sourceRoot":"","sources":["../../../src/app.api/observations/app.api.observations.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,14 +69,14 @@ function SaveObservation(permissionService, userRepo) {
|
|
|
69
69
|
return __awaiter(this, void 0, void 0, function* () {
|
|
70
70
|
const repo = req.context.observationRepository;
|
|
71
71
|
const mod = req.observation;
|
|
72
|
-
const
|
|
73
|
-
const denied =
|
|
72
|
+
const existingObservation = yield repo.findById(mod.id);
|
|
73
|
+
const denied = existingObservation ?
|
|
74
74
|
yield permissionService.ensureUpdateObservationPermission(req.context) :
|
|
75
75
|
yield permissionService.ensureCreateObservationPermission(req.context);
|
|
76
76
|
if (denied) {
|
|
77
77
|
return app_api_global_1.AppResponse.error(denied);
|
|
78
78
|
}
|
|
79
|
-
const obs = yield prepareObservationMod(mod,
|
|
79
|
+
const obs = yield prepareObservationMod(mod, existingObservation, req.context);
|
|
80
80
|
if (obs instanceof app_api_errors_1.MageError) {
|
|
81
81
|
return app_api_global_1.AppResponse.error(obs);
|
|
82
82
|
}
|
|
@@ -221,21 +221,21 @@ exports.registerDeleteRemovedAttachmentsHandler = registerDeleteRemovedAttachmen
|
|
|
221
221
|
* an `isPending` property. That should be reasonable to implement, but no
|
|
222
222
|
* time now, as usual.
|
|
223
223
|
*/
|
|
224
|
-
function prepareObservationMod(mod,
|
|
224
|
+
function prepareObservationMod(mod, observationToUpdate, context) {
|
|
225
225
|
return __awaiter(this, void 0, void 0, function* () {
|
|
226
226
|
const event = context.mageEvent;
|
|
227
227
|
const repo = context.observationRepository;
|
|
228
|
-
const modAttrs = baseObservationAttrsForMod(mod,
|
|
228
|
+
const modAttrs = baseObservationAttrsForMod(mod, observationToUpdate, context);
|
|
229
229
|
// first get new form entry ids so new attachments have a proper id to reference
|
|
230
230
|
const [removedFormEntries, newFormEntries] = mod.properties.forms.reduce(([removed, added], entryMod) => {
|
|
231
|
-
if (entryMod.id && (
|
|
231
|
+
if (entryMod.id && (observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.formEntryForId(entryMod.id))) {
|
|
232
232
|
removed.delete(entryMod.id);
|
|
233
233
|
}
|
|
234
234
|
else {
|
|
235
235
|
added.push(entryMod);
|
|
236
236
|
}
|
|
237
237
|
return [removed, added];
|
|
238
|
-
}, [new Map((
|
|
238
|
+
}, [new Map((observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.formEntries.map(x => [x.id, x])) || []), []]);
|
|
239
239
|
const newFormEntryIds = newFormEntries.length ? yield repo.nextFormEntryIds(newFormEntries.length) : [];
|
|
240
240
|
newFormEntries.forEach(x => x.id = newFormEntryIds.shift());
|
|
241
241
|
const attachmentExtraction = extractAttachmentModsFromFormEntries(mod, event);
|
|
@@ -243,12 +243,12 @@ function prepareObservationMod(mod, before, context) {
|
|
|
243
243
|
const attachmentMods = attachmentExtraction.attachmentMods;
|
|
244
244
|
const addCount = attachmentMods.reduce((count, x) => x.action === api.AttachmentModAction.Add ? count + 1 : count, 0);
|
|
245
245
|
const attachmentIds = addCount ? yield repo.nextAttachmentIds(addCount) : [];
|
|
246
|
-
const afterRemovedFormEntryAttachments =
|
|
246
|
+
const afterRemovedFormEntryAttachments = observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.attachments.reduce((obs, attachment) => {
|
|
247
247
|
if (removedFormEntries.has(attachment.observationFormId)) {
|
|
248
248
|
return (0, entities_observations_1.removeAttachment)(obs, attachment.id);
|
|
249
249
|
}
|
|
250
250
|
return obs;
|
|
251
|
-
},
|
|
251
|
+
}, observationToUpdate);
|
|
252
252
|
if (afterRemovedFormEntryAttachments) {
|
|
253
253
|
modAttrs.attachments = afterRemovedFormEntryAttachments.attachments;
|
|
254
254
|
}
|
|
@@ -259,17 +259,19 @@ function prepareObservationMod(mod, before, context) {
|
|
|
259
259
|
if (obs instanceof app_api_errors_1.MageError) {
|
|
260
260
|
return obs;
|
|
261
261
|
}
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
(0, entities_observations_1.removeAttachment)(obs, attachmentMod.id) :
|
|
266
|
-
null;
|
|
267
|
-
if (mod instanceof entities_observations_1.Observation) {
|
|
268
|
-
return mod;
|
|
262
|
+
let mod;
|
|
263
|
+
if (attachmentMod.action === api.AttachmentModAction.Add) {
|
|
264
|
+
mod = (0, entities_observations_1.addAttachment)(obs, attachmentIds.shift(), attachmentMod.fieldName, attachmentMod.formEntryId, attachmentCreateAttrsForMod(attachmentMod));
|
|
269
265
|
}
|
|
270
|
-
if (
|
|
266
|
+
else if (attachmentMod.action === api.AttachmentModAction.Delete) {
|
|
267
|
+
mod = (0, entities_observations_1.removeAttachment)(obs, attachmentMod.id);
|
|
268
|
+
}
|
|
269
|
+
else {
|
|
271
270
|
return (0, app_api_errors_1.invalidInput)(`invalid attachment action: ${attachmentMod.action}`);
|
|
272
271
|
}
|
|
272
|
+
if (mod instanceof entities_observations_1.Observation) {
|
|
273
|
+
return mod;
|
|
274
|
+
}
|
|
273
275
|
const message = `error adding attachment on observation ${obs.id}`;
|
|
274
276
|
return (0, app_api_errors_1.invalidInput)(`${message}: ${String(mod)}`);
|
|
275
277
|
}, afterFormEntriesRemoved);
|
|
@@ -281,32 +283,33 @@ function prepareObservationMod(mod, before, context) {
|
|
|
281
283
|
* existing observation. The result will not include form entries and
|
|
282
284
|
* attachments, which require separate processing to resolve IDs and actions.
|
|
283
285
|
* @param mod the modifications from an external client
|
|
284
|
-
* @param
|
|
286
|
+
* @param observationToUpdate the observation to update, or null if none exists
|
|
285
287
|
*/
|
|
286
|
-
function baseObservationAttrsForMod(mod,
|
|
288
|
+
function baseObservationAttrsForMod(mod, observationToUpdate, context) {
|
|
287
289
|
const attrs = {
|
|
288
290
|
id: mod.id,
|
|
289
291
|
eventId: context.mageEvent.id,
|
|
290
|
-
userId:
|
|
291
|
-
deviceId:
|
|
292
|
-
createdAt:
|
|
292
|
+
userId: observationToUpdate ? observationToUpdate.userId : context.userId,
|
|
293
|
+
deviceId: observationToUpdate ? observationToUpdate.deviceId : context.deviceId,
|
|
294
|
+
createdAt: observationToUpdate ? observationToUpdate.createdAt : new Date(),
|
|
293
295
|
lastModified: new Date(),
|
|
294
296
|
geometry: mod.geometry,
|
|
295
297
|
type: 'Feature',
|
|
296
|
-
states:
|
|
297
|
-
bbox: mod.bbox || (
|
|
298
|
-
favoriteUserIds: (
|
|
299
|
-
important:
|
|
298
|
+
states: observationToUpdate ? observationToUpdate.states : [],
|
|
299
|
+
bbox: mod.bbox || (observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.bbox),
|
|
300
|
+
favoriteUserIds: (observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.favoriteUserIds) || [],
|
|
301
|
+
important: observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.important,
|
|
300
302
|
properties: {
|
|
301
303
|
// TODO: should timestamp be optional on the mod object?
|
|
302
304
|
timestamp: mod.properties.timestamp,
|
|
303
305
|
forms: []
|
|
304
306
|
},
|
|
305
307
|
attachments: [],
|
|
308
|
+
noGeometry: !!mod.noGeometry,
|
|
306
309
|
};
|
|
307
|
-
assignFirstDefined('accuracy', attrs.properties, mod.properties,
|
|
308
|
-
assignFirstDefined('delta', attrs.properties, mod.properties,
|
|
309
|
-
assignFirstDefined('provider', attrs.properties, mod.properties,
|
|
310
|
+
assignFirstDefined('accuracy', attrs.properties, mod.properties, observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.properties);
|
|
311
|
+
assignFirstDefined('delta', attrs.properties, mod.properties, observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.properties);
|
|
312
|
+
assignFirstDefined('provider', attrs.properties, mod.properties, observationToUpdate === null || observationToUpdate === void 0 ? void 0 : observationToUpdate.properties);
|
|
310
313
|
return attrs;
|
|
311
314
|
}
|
|
312
315
|
function assignFirstDefined(key, target, ...sources) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.impl.observations.js","sourceRoot":"","sources":["../../../src/app.impl/observations/app.impl.observations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.impl.observations.js","sourceRoot":"","sources":["../../../src/app.impl/observations/app.impl.observations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldap.d.ts","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ldap.d.ts","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":"AA4FA,gDAoDC"}
|
|
@@ -15,7 +15,9 @@ function configure(strategy) {
|
|
|
15
15
|
groupSearchScope: strategy.settings.groupSearchScope,
|
|
16
16
|
bindProperty: strategy.settings.bindProperty,
|
|
17
17
|
groupDnProperty: strategy.settings.groupDnProperty
|
|
18
|
-
}
|
|
18
|
+
},
|
|
19
|
+
usernameField: 'username',
|
|
20
|
+
passwordField: 'password'
|
|
19
21
|
}, function (profile, done) {
|
|
20
22
|
const username = profile[strategy.settings.profile.id];
|
|
21
23
|
User.getUserByAuthenticationStrategy(strategy.type, username, function (err, user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ldap.js","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":";AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,EAC7C,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,EACxB,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAChC,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,EAChC,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,cAAc,EACzD,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,EACvB,eAAe,GAAG,OAAO,CAAC,sBAAsB,CAAC,EACjD,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEzD,SAAS,SAAS,CAAC,QAAQ;IACzB,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,KAAK,GAAG,iBAAiB,CAAC,CAAC;IAE9D,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,YAAY,CAAC;QAC3C,MAAM,EAAE;YACN,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG;YAC1B,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;YAChC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe;YAClD,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU;YACxC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,YAAY;YAC5C,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,WAAW;YAC1C,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe;YAClD,iBAAiB,EAAE,QAAQ,CAAC,QAAQ,CAAC,iBAAiB;YACtD,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,CAAC,gBAAgB;YACpD,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,YAAY;YAC5C,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe;SACnD;
|
|
1
|
+
{"version":3,"file":"ldap.js","sourceRoot":"","sources":["../../src/authentication/ldap.js"],"names":[],"mappings":"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"}
|
package/lib/dist-package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ngageoint/mage.service",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.4.0-beta.2",
|
|
4
4
|
"displayName": "MAGE Service",
|
|
5
5
|
"description": "MAGE is a geospatial situational awareness and data collection platform. The MAGE Service is the ReST service API that the MAGE client apps use to interact with MAGE data.",
|
|
6
6
|
"keywords": [
|
|
@@ -82,6 +82,7 @@
|
|
|
82
82
|
},
|
|
83
83
|
"devDependencies": {
|
|
84
84
|
"@fluffy-spoon/substitute": "1.208.0",
|
|
85
|
+
"@types/adm-zip": "0.5.7",
|
|
85
86
|
"@types/archiver": "5.3.4",
|
|
86
87
|
"@types/async": "3.2.24",
|
|
87
88
|
"@types/bson": "1.0.11",
|
|
@@ -27,6 +27,10 @@ export interface ObservationAttrs extends Feature<Geometry, ObservationFeaturePr
|
|
|
27
27
|
* a unique id
|
|
28
28
|
*/
|
|
29
29
|
states: readonly ObservationState[];
|
|
30
|
+
/**
|
|
31
|
+
* A boolean flag to indicate whether the observation has geometry.
|
|
32
|
+
*/
|
|
33
|
+
noGeometry?: boolean;
|
|
30
34
|
}
|
|
31
35
|
export interface ObservationFeatureProperties {
|
|
32
36
|
/**
|
|
@@ -213,6 +217,7 @@ export declare class Observation implements Readonly<ObservationAttrs> {
|
|
|
213
217
|
readonly properties: Readonly<ObservationFeatureProperties>;
|
|
214
218
|
readonly attachments: readonly Attachment[];
|
|
215
219
|
readonly pendingEvents: readonly PendingObservationDomainEvent[];
|
|
220
|
+
readonly noGeometry?: boolean;
|
|
216
221
|
constructor(...args: unknown[]);
|
|
217
222
|
get validation(): ObservationValidationResult;
|
|
218
223
|
/**
|