From 17c7bd147ab89e282d723739a647d71eee834961 Mon Sep 17 00:00:00 2001 From: androozka Date: Wed, 18 Sep 2019 08:29:35 -0700 Subject: [PATCH] fixed views --- src/v2/support/views/validate.js | 91 ++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/src/v2/support/views/validate.js b/src/v2/support/views/validate.js index b4b6c79..38d91d5 100644 --- a/src/v2/support/views/validate.js +++ b/src/v2/support/views/validate.js @@ -6,22 +6,83 @@ const query = Joi.string().min(1); const data = Joi.object(); module.exports = { - list: options => Joi.validate(options, { ids }), - update_many: options => Joi.validate(options, { data: data.required() }), + list: options => + Joi.object({ + ids + }).validate(options), + + update_many: options => + Joi.object({ + data: data.required() + }).validate(options), + active: null, // no options + compact: null, // no options - show: options => Joi.validate(options, { id: id.required() }), - create: options => Joi.validate(options, { data: data.required() }), + + show: options => + Joi.object({ + id: id.required() + }).validate(options), + + create: options => + Joi.object({ + data: data.required() + }).validate(options), + update: options => - Joi.validate(options, { id: id.required(), data: data.required() }), - delete: options => Joi.validate(options, { id: id.required() }), - delete_many: options => Joi.validate(options, { data: data.required() }), - execute: options => Joi.validate(options, { id: id.required() }), - tickets: options => Joi.validate(options, { id: id.required() }), - count_many: options => Joi.validate(options, { ids: ids.required() }), - count: options => Joi.validate(options, { id: id.required() }), - export: options => Joi.validate(options, { id: id.required() }), - search: options => Joi.validate(options, { query: query.required() }), - preview: options => Joi.validate(options, { data: data.required() }), - preview_count: options => Joi.validate(options, { data: data.required() }) + Joi.object({ + id: id.required(), + data: data.required() + }).validate(options), + + delete: options => + Joi.object({ + id: id.required() + }).validate(options), + + delete_many: options => + Joi.object({ + data: data.required() + }).validate(options), + + execute: options => + Joi.object({ + id: id.required() + }).validate(options), + + tickets: options => + Joi.object({ + id: id.required() + }).validate(options), + + count_many: options => + Joi.object({ + ids: ids.required() + }).validate(options), + + count: options => + Joi.object({ + id: id.required() + }).validate(options), + + export: options => + Joi.object({ + id: id.required() + }).validate(options), + + search: options => + Joi.object({ + query: query.required() + }).validate(options), + + preview: options => + Joi.object({ + data: data.required() + }).validate(options), + + preview_count: options => + Joi.object({ + data: data.required() + }).validate(options) };