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

changed status and returned status for /samples

Browse Source
This commit is contained in:
VLE2FE
2020-08-06 18:50:50 +02:00
parent cc6fa48a44
commit 3ff29845d4
15 changed files with 182 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import IdValidate from './id';
import UserValidate from './user';
import MaterialValidate from './material';
import MeasurementValidate from './measurement';
import globals from '../../globals';
export default class SampleValidate {
private static sample = {
@ -49,7 +50,10 @@ export default class SampleValidate {
added: Joi.date()
.iso()
.min('1970-01-01T00:00:00.000Z')
.min('1970-01-01T00:00:00.000Z'),
status: Joi.string()
.valid(...globals.status)
};
private static sortKeys = [
@ -59,6 +63,7 @@ export default class SampleValidate {
'type',
'batch',
'added',
'status',
'material.name',
'material.supplier',
'material.group',
@ -137,7 +142,8 @@ export default class SampleValidate {
note_id: IdValidate.get().allow(null),
notes: this.sample.notes,
user_id: IdValidate.get(),
added: this.sample.added
added: this.sample.added,
status: this.sample.status
};
}
else if(param === 'details') {
@ -151,7 +157,8 @@ export default class SampleValidate {
material: MaterialValidate.outputV(),
measurements: Joi.array().items(MeasurementValidate.outputV()),
notes: this.sample.notes,
user: UserValidate.username()
user: UserValidate.username(),
status: this.sample.status
}
}
else {
@ -161,6 +168,7 @@ export default class SampleValidate {
joiObject[param] = Joi.any();
});
const {value, error} = Joi.object(joiObject).validate(data, {stripUnknown: true});
console.log(error);
return error !== undefined? null : value;
}