Skip to content

Commit

Permalink
Add internal attribute as reserved. (Commits for Gaprindashvili)
Browse files Browse the repository at this point in the history
  • Loading branch information
hsong-rh committed Jul 30, 2018
1 parent 2c65b66 commit ee21a01
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
3 changes: 3 additions & 0 deletions app/models/service_template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class ServiceTemplate < ApplicationRecord
include NewWithTypeStiMixin
include TenancyMixin
include ArchivedMixin
include ReservedMixin
reserve_attribute :internal, :boolean
include_concern 'Filter'

belongs_to :tenant
Expand Down Expand Up @@ -74,6 +76,7 @@ class ServiceTemplate < ApplicationRecord
scope :without_service_template_catalog_id, -> { where(:service_template_catalog_id => nil) }
scope :with_existent_service_template_catalog_id, -> { where.not(:service_template_catalog_id => nil) }
scope :displayed, -> { where(:display => true) }
scope :public_service_templates, -> { where.not(:id => Reserve.where(:resource_type => "ServiceTemplate").collect { |r| r.reserved[:internal] && r.resource_id }.compact) }

def self.catalog_item_types
ci_types = Set.new(Rbac.filtered(ExtManagementSystem.all).flat_map(&:supported_catalog_types))
Expand Down
2 changes: 2 additions & 0 deletions app/models/service_template_transformation_plan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ def request_type
"transformation_plan"
end

default_value_for :internal, true

def transformation_mapping
service_resources.find_by(:resource_type => 'TransformationMapping').resource
end
Expand Down
11 changes: 11 additions & 0 deletions spec/models/service_template_transformation_plan_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@
}
end

describe '.public_service_templates' do
it 'display public service templates' do
st1 = FactoryGirl.create(:service_template_transformation_plan)
st2 = FactoryGirl.create(:service_template)

expect(st1.internal?).to be_truthy
expect(st2.internal?).to be_falsey
expect(ServiceTemplate.public_service_templates).to match_array([st2])
end
end

describe '.create_catalog_item' do
it 'creates and returns a transformation plan' do
service_template = described_class.create_catalog_item(catalog_item_options)
Expand Down

0 comments on commit ee21a01

Please sign in to comment.