Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose error messages from ServiceTemplate.orderable? #656

Merged
merged 12 commits into from
Sep 11, 2019
Merged

Expose error messages from ServiceTemplate.orderable? #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d2c94a9
Expose service_template.validate_order errors in API error message
fabiendupont Aug 21, 2019
3b953d7
Fix errors merge. Fix specs
fabiendupont Aug 21, 2019
bc8ac2e
Dissociate validate_order and orderable? methods
fabiendupont Aug 23, 2019
c717169
Revert methods default behavior and add an extra option to return errors
fabiendupont Aug 24, 2019
2d4e0b0
Remove unneeded stub
fabiendupont Aug 24, 2019
0d58d40
Remove unneeded instructions
fabiendupont Aug 24, 2019
dfb3c1d
Use SupportsFeatureMixin to validate_order
fabiendupont Aug 26, 2019
17e5f6f
Re-add test of api_request_allowed?
fabiendupont Aug 27, 2019
707c884
Address rubocop
fabiendupont Aug 27, 2019
3a7b6a3
Update test when ordering via API is not allowed
fabiendupont Aug 27, 2019
9c399df
Address rubocop
fabiendupont Aug 27, 2019
67c5ce9
Moving exception out of validate_order and remove method
fabiendupont Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/controllers/api/mixins/service_templates.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ module Mixins
module ServiceTemplates
def order_service_template(id, data, scheduled_time = nil)
service_template = resource_search(id, :service_templates, ServiceTemplate)
raise BadRequestError, "#{service_template_ident(service_template)} cannot be ordered" unless orderable?(service_template)
raise BadRequestError, "Service ordering via API is not allowed" unless api_request_allowed?
raise BadRequestError, "#{service_template_ident(service_template)} cannot be ordered - #{service_template.unsupported_reason(:order)}" unless service_template.supports_order?

request_result = service_template.order(User.current_user, (data || {}), order_request_options, scheduled_time)
errors = request_result[:errors]
if errors.present?
Expand All @@ -14,10 +16,6 @@ def order_service_template(id, data, scheduled_time = nil)

private

def orderable?(service_template)
api_request_allowed? && service_template.orderable?
end

def api_request_allowed?
return true if request_from_ui?
Settings.product.allow_api_service_ordering
Expand Down
9 changes: 5 additions & 4 deletions spec/requests/service_templates_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,8 @@
end

describe "Service Templates order" do
let(:service_template) { FactoryBot.create(:service_template, :with_provision_resource_action_and_dialog, :orderable) }
let(:service_template_catalog) { FactoryBot.create(:service_template_catalog) }
let(:service_template) { FactoryBot.create(:service_template, :with_provision_resource_action_and_dialog, :service_template_catalog => service_template_catalog, :display => true) }
let(:allow_api_service_ordering) { true }

before do
Expand Down Expand Up @@ -557,7 +558,7 @@
end

it "can order multiple service templates" do
service_template2 = FactoryBot.create(:service_template, :with_provision_resource_action_and_dialog, :orderable)
service_template2 = FactoryBot.create(:service_template, :with_provision_resource_action_and_dialog, :service_template_catalog => service_template_catalog, :display => true)
api_basic_authorize action_identifier(:service_templates, :order, :resource_actions, :post)

post(api_service_templates_url, :params => { :action => "order", :resources =>
Expand Down Expand Up @@ -606,7 +607,7 @@
expected = {
"error" => a_hash_including(
"kind" => "bad_request",
"message" => /cannot be ordered/
"message" => /cannot be ordered - Service template is not configured to be displayed/
)
}
expect(response).to have_http_status(:bad_request)
Expand Down Expand Up @@ -640,7 +641,7 @@
expected = {
"error" => a_hash_including(
"kind" => "bad_request",
"message" => /cannot be ordered/
"message" => "Service ordering via API is not allowed"
)
}
expect(response).to have_http_status(:bad_request)
Expand Down