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.

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

Add archive/unarchive actions to ServiceTemplate #389

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions app/controllers/api/service_templates_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,22 @@ def order_resource(_type, id, data)
order_service_template(id, data)
end

def archive_resource(type, id, _data)
service_template = resource_search(id, type, collection_class(type))
service_template.archive!
action_result(true, "Archived Service Template")
rescue => err
action_result(false, "Could not archive Service Template - #{err}")
end

def unarchive_resource(type, id, _data)
service_template = resource_search(id, type, collection_class(type))
service_template.unarchive!
action_result(true, "Unarchived Service Template")
rescue => err
action_result(false, "Could not unarchive Service Template - #{err}")
end

private

def set_additional_attributes
Expand Down
8 changes: 8 additions & 0 deletions config/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2775,6 +2775,10 @@
:identifier: atomic_catalogitem_new
- :name: order
:identifier: svc_catalog_provision
- :name: archive
:identifier: svc_catalog_archive
- :name: unarchive
:identifier: svc_catalog_unarchive
:subcollection_actions:
:post:
- :name: edit
Expand Down Expand Up @@ -2802,6 +2806,10 @@
:identifier: svc_catalog_provision
:options:
- :validate_action
- :name: archive
:identifier: svc_catalog_archive
- :name: unarchive
:identifier: svc_catalog_unarchive
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the other failures might be because svc_catalog_archive and svc_catalog_unarchive are not mid_product_feature.yml

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this was actually related to #389 (comment) since I had ManageIQ/manageiq#17518 applied locally when testing and this still failed.

:delete:
- :name: delete
:identifier: catalogitem_delete
Expand Down
118 changes: 118 additions & 0 deletions spec/requests/service_templates_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -548,4 +548,122 @@
end
end
end

describe "Service Templates archive" do
let(:service_template) { FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog) }

it "is forbidden without appropriate role" do
api_basic_authorize

post(api_service_template_url(nil, service_template), :params => { :action => "archive" })

expect(response).to have_http_status(:forbidden)
end

it "can be archived as a resource action" do
api_basic_authorize action_identifier(:service_templates, :archive, :resource_actions, :post)

post(api_service_template_url(nil, service_template), :params => { :action => "archive" })

expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include("message" => "Archived Service Template")
end

it "can be archived as an action on the collection" do
api_basic_authorize action_identifier(:service_templates, :archive, :resource_actions, :post)

post(api_service_templates_url, :params => { :action => "archive", :resources => [{:href => api_service_template_url(nil, service_template)}] })

expected = {
"results" => [a_hash_including("message" => "Archived Service Template")]
}
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include(expected)
end

it "shows the action" do
api_basic_authorize(action_identifier(:service_templates, :archive, :resource_actions, :post),
action_identifier(:service_templates, :read, :resource_actions, :get))

get(api_service_template_url(nil, service_template))

actions = response.parsed_body["actions"].collect { |action| action["name"] }
expect(actions).to include("archive")
end

it "can archive multiple service templates" do
service_template2 = FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog)
api_basic_authorize action_identifier(:service_templates, :archive, :resource_actions, :post)

post(api_service_templates_url, :params => { :action => "archive", :resources =>
[{:href => api_service_template_url(nil, service_template)},
{:href => api_service_template_url(nil, service_template2)}]})

expected = {
"results" => [a_hash_including("message" => "Archived Service Template"),
a_hash_including("message" => "Archived Service Template")]
}
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include(expected)
end
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we also need another set of the above tests for unarchive.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


describe "Service Templates unarchive" do
let(:service_template) { FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog) }

it "is forbidden without appropriate role" do
api_basic_authorize

post(api_service_template_url(nil, service_template), :params => { :action => "unarchive" })

expect(response).to have_http_status(:forbidden)
end

it "can be unarchived as a resource action" do
api_basic_authorize action_identifier(:service_templates, :unarchive, :resource_actions, :post)

post(api_service_template_url(nil, service_template), :params => { :action => "unarchive" })

expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include("message" => "Unarchived Service Template")
end

it "can be unarchived as an action on the collection" do
api_basic_authorize action_identifier(:service_templates, :unarchive, :resource_actions, :post)

post(api_service_templates_url, :params => { :action => "unarchive", :resources => [{:href => api_service_template_url(nil, service_template)}] })

expected = {
"results" => [a_hash_including("message" => "Unarchived Service Template")]
}
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include(expected)
end

it "shows the action" do
api_basic_authorize(action_identifier(:service_templates, :unarchive, :resource_actions, :post),
action_identifier(:service_templates, :read, :resource_actions, :get))

get(api_service_template_url(nil, service_template))

actions = response.parsed_body["actions"].collect { |action| action["name"] }
expect(actions).to include("unarchive")
end

it "can unarchive multiple service templates" do
service_template2 = FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog)
api_basic_authorize action_identifier(:service_templates, :unarchive, :resource_actions, :post)

post(api_service_templates_url, :params => { :action => "unarchive", :resources =>
[{:href => api_service_template_url(nil, service_template)},
{:href => api_service_template_url(nil, service_template2)}]})

expected = {
"results" => [a_hash_including("message" => "Unarchived Service Template"),
a_hash_including("message" => "Unarchived Service Template")]
}
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include(expected)
end
end
end