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

small material changes for easier UI implementation

Browse Source
This commit is contained in:
VLE2FE
2020-08-31 13:47:12 +02:00
parent 36ca627d1b
commit b59b3ea9ea
4 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/routes/validate/material.ts
View File

@ -20,7 +20,10 @@ export default class MaterialValidate { // validate input for material
.items(
Joi.string()
.max(64)
)
),
status: Joi.string()
.valid(...Object.values(globals.status))
};
static input (data, param) { // validate input, set param to 'new' to make all attributes required
@ -47,18 +50,22 @@ export default class MaterialValidate { // validate input for material
}
}
static output (data) { // validate output and strip unwanted properties, returns null if not valid
static output (data, status = false) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
data.group = data.group_id.name;
data.supplier = data.supplier_id.name;
const {value, error} = Joi.object({
const validate: any = {
_id: IdValidate.get(),
name: this.material.name,
supplier: this.material.supplier,
group: this.material.group,
properties: this.material.properties,
numbers: this.material.numbers
}).validate(data, {stripUnknown: true});
};
if (status) {
validate.status = this.material.status;
}
const {value, error} = Joi.object(validate).validate(data, {stripUnknown: true});
return error !== undefined? null : value;
}
@ -83,9 +90,13 @@ export default class MaterialValidate { // validate input for material
});
}
static query (data) {
static query (data, dev = false) {
const acceptedStatuses = [globals.status.val, globals.status.new];
if (dev) { // dev and admin can also access deleted samples
acceptedStatuses.push(globals.status.del)
}
return Joi.object({
status: Joi.string().valid(globals.status.val, globals.status.new, 'all')
status: Joi.array().items(Joi.string().valid(...acceptedStatuses)).default([globals.status.val])
}).validate(data);
}
}