From 0861968e167dbbda60d645e555d4fd458b45b163 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Fri, 25 Sep 2020 10:56:04 -0700 Subject: [PATCH] Update templates --- app/views/api/v1/api/errors.json.rabl | 18 ++++++++++++++++++ app/views/api/v1/parties/base.json.rabl | 2 +- ...available.json.rabl => available.json.rabl} | 0 app/views/api/v1/users/create.json.rabl | 4 ++-- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 app/views/api/v1/api/errors.json.rabl rename app/views/api/v1/users/{email_available.json.rabl => available.json.rabl} (100%) diff --git a/app/views/api/v1/api/errors.json.rabl b/app/views/api/v1/api/errors.json.rabl new file mode 100644 index 0000000..78c87ff --- /dev/null +++ b/app/views/api/v1/api/errors.json.rabl @@ -0,0 +1,18 @@ +object false + +node :errors do + if @exception.respond_to?(:record) + errors = ValidationErrorsSerializer.new(@exception.record).serialize + end + + if @exception.respond_to?(:message) && @exception.respond_to?(:code) + errors = [ + { + message: @exception.message, + code: @exception.code + } + ] + end + + errors +end diff --git a/app/views/api/v1/parties/base.json.rabl b/app/views/api/v1/parties/base.json.rabl index 403e94a..15d5c59 100644 --- a/app/views/api/v1/parties/base.json.rabl +++ b/app/views/api/v1/parties/base.json.rabl @@ -1,6 +1,6 @@ object :party -attributes :id, :shortcode +attributes :id, :user_id, :shortcode node :grid do |p| partial('grid_weapons/base', :object => p.weapons) diff --git a/app/views/api/v1/users/email_available.json.rabl b/app/views/api/v1/users/available.json.rabl similarity index 100% rename from app/views/api/v1/users/email_available.json.rabl rename to app/views/api/v1/users/available.json.rabl diff --git a/app/views/api/v1/users/create.json.rabl b/app/views/api/v1/users/create.json.rabl index cdde710..cea7c27 100644 --- a/app/views/api/v1/users/create.json.rabl +++ b/app/views/api/v1/users/create.json.rabl @@ -1,7 +1,7 @@ object false -child(@user) { - attributes :id, :email, :username +node(:user) { + @presenter } unless @user.blank? node(:error) {