Merge pull request #17748 from hsong-rh/add_internal_to_service_template

Add internal column to service template for transformation plan
(cherry picked from commit 2a66cb5)

https://bugzilla.redhat.com/show_bug.cgi?id=1610729

app/models/service_template.rb

@@ -38,6 +38,8 @@ class ServiceTemplate < ApplicationRecord
  include NewWithTypeStiMixin
  include TenancyMixin
  include ArchivedMixin
+ include ReservedMixin
+ reserve_attribute :internal, :boolean
  include_concern 'Filter'
 
  include ReservedMixin
@@ -80,6 +82,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").all.collect { |r| r.resource_id if r.reserved[:internal] }.compact) }
 
  def self.catalog_item_types
  ci_types = Set.new(Rbac.filtered(ExtManagementSystem.all).flat_map(&:supported_catalog_types))

app/models/service_template_transformation_plan.rb

@@ -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

spec/models/service_template_transformation_plan_spec.rb

@@ -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)