banana/definma-api
Archived
2
Fork 0
Code Releases Activity

updated sample restore and validate

Browse Source
This commit is contained in:
VLE2FE
2020-08-21 16:05:38 +02:00
parent 8d894fa27e
commit 3fbd6ccec3
5 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/routes/validate/measurement.ts
View File

@@ -11,6 +11,7 @@ export default class MeasurementValidate {
Joi.string().max(128),
Joi.number(),
Joi.boolean(),
Joi.array().items(Joi.array().items(Joi.number())), // for spectra
Joi.array()
)
.allow(null)

9
src/routes/validate/sample.ts
View File

@@ -192,9 +192,11 @@ export default class SampleValidate {
if (filterValidation.error) return filterValidation;
try {
for (let i in data.filters) {
// data.filters[i] = JSON.parse(decodeURIComponent(data.filters[i]));
data.filters[i] = JSON.parse(decodeURIComponent(data.filters[i]));
console.log(data.filters[i]);
try {
data.filters[i] = decodeURIComponent(data.filters[i]);
}
catch (ignore) {}
data.filters[i] = JSON.parse(data.filters[i]);
data.filters[i].values = data.filters[i].values.map(e => { // validate filter values
if (e === null) { // null values are always allowed
return null;
@@ -225,6 +227,7 @@ export default class SampleValidate {
validator = Joi.object(this.sample);
}
const {value, error} = validator.validate({[field]: e});
console.log(error);
if (error) throw error; // reject invalid values
return value[field];
});