Archived
2

fixed validation to return measurements in /sample/{id}

This commit is contained in:
VLE2FE
2020-06-18 08:57:50 +02:00
parent 869a675840
commit ac72d8a975
6 changed files with 27 additions and 12 deletions

View File

@ -44,4 +44,13 @@ export default class MeasurementValidate {
}).validate(data, {stripUnknown: true});
return error !== undefined? null : value;
}
static outputV() { // return output validator
return Joi.object({
_id: IdValidate.get(),
sample_id: IdValidate.get(),
values: this.measurement.values,
measurement_template: IdValidate.get()
});
}
}

View File

@ -3,6 +3,7 @@ import Joi from '@hapi/joi';
import IdValidate from './id';
import UserValidate from './user';
import MaterialValidate from './material';
import MeasurementValidate from './measurement';
export default class SampleValidate {
private static sample = {
@ -108,6 +109,7 @@ export default class SampleValidate {
batch: this.sample.batch,
condition: this.sample.condition,
material: MaterialValidate.outputV(),
measurements: Joi.array().items(MeasurementValidate.outputV()),
notes: this.sample.notes,
user: UserValidate.username()
}