Skip to content

Commit

Permalink
Merge pull request #295 from kentakag/add_request_to_validation_error
Browse files Browse the repository at this point in the history
add request to validation error
  • Loading branch information
ota42y authored Dec 19, 2020
2 parents 236214d + b658867 commit 5b5ec6a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions lib/committee/middleware/request_validation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ def handle(request)
rescue Committee::BadRequest, Committee::InvalidRequest
handle_exception($!, request.env)
raise if @raise
return @error_class.new(400, :bad_request, $!.message).render unless @ignore_error
return @error_class.new(400, :bad_request, $!.message, request).render unless @ignore_error
rescue Committee::NotFound => e
raise if @raise
return @error_class.new(404, :not_found, e.message).render unless @ignore_error
return @error_class.new(404, :not_found, e.message, request).render unless @ignore_error
rescue JSON::ParserError
handle_exception($!, request.env)
raise Committee::InvalidRequest if @raise
return @error_class.new(400, :bad_request, "Request body wasn't valid JSON.").render unless @ignore_error
return @error_class.new(400, :bad_request, "Request body wasn't valid JSON.", request).render unless @ignore_error
end

@app.call(request.env)
Expand Down
5 changes: 3 additions & 2 deletions lib/committee/validation_error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

module Committee
class ValidationError
attr_reader :id, :message, :status
attr_reader :id, :message, :status, :request

def initialize(status, id, message)
def initialize(status, id, message, request = nil)
@status = status
@id = id
@message = message
@request = request
end

def error_body
Expand Down

0 comments on commit 5b5ec6a

Please sign in to comment.