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

added deleted status for /samples

Browse Source
This commit is contained in:
VLE2FE
2020-08-07 09:37:02 +02:00
parent 63d14acc3c
commit 4ce65ad7cc
7 changed files with 107 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,11 +168,10 @@ 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;
}
static query (data) {
static query (data, dev = false) {
if (data.filters && data.filters.length) {
const filterValidation = Joi.array().items(Joi.string()).validate(data.filters);
if (filterValidation.error) return filterValidation;
@ -216,8 +215,12 @@ export default class SampleValidate {
return {error: {details: [{message: 'Invalid JSON string for filter parameter'}]}, value: null}
}
}
const acceptedStatuses = ['validated', 'new'];
if (dev) { // dev and admin can also access deleted samples
acceptedStatuses.push('deleted')
}
return Joi.object({
status: Joi.string().valid('validated', 'new', 'all'),
status: Joi.array().items(Joi.string().valid(...acceptedStatuses)).default(['validated']),
'from-id': IdValidate.get(),
'to-page': Joi.number().integer(),
'page-size': Joi.number().integer().min(1),

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

@ -82,7 +82,6 @@ export default class UserValidate { // validate input for user
location: this.user.location,
devices: this.user.devices
}).validate(data, {stripUnknown: true});
console.log(data);
return error !== undefined? null : value;
}