[MNOE-406] Added logic to load delisted apps if already in dashboard

maestrano · Feb 1, 2018 · bac6619 · bac6619
1 parent 7058687
commit bac6619
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/api/app/views/mno_enterprise/jpi/v1/app_instances/_resource.json.jbuilder b/api/app/views/mno_enterprise/jpi/v1/app_instances/_resource.json.jbuilder
@@ -23,6 +23,7 @@ end
 #   json.connector_version app_instance.oauth_keys[:version]
 # end
 
+app_instance.without_tenant = true
 app_instance.app.tap do |a|
   json.app_id a.id
   json.app_name a.name

diff --git a/core/lib/mno_enterprise/concerns/models/app_instance.rb b/core/lib/mno_enterprise/concerns/models/app_instance.rb
@@ -42,6 +42,8 @@ module MnoEnterprise::Concerns::Models::AppInstance
     :owner_type, :terminated_at, :stopped_at, :billing_type, :autostop_at, :autostop_interval,
     :next_status, :soa_enabled, :oauth_company, :oauth_keys, :oauth_keys_valid, :free_trial_end_at, :per_user_licence, :active_licences_count
 
+    attr_accessor :without_tenant
+
     #==============================================================
     # Constants
     #==============================================================
@@ -52,7 +54,6 @@ module MnoEnterprise::Concerns::Models::AppInstance
     # Associations
     #==============================================================
     belongs_to :owner, class_name: 'MnoEnterprise::Organization'
-    belongs_to :app, class_name: 'MnoEnterprise::App'
 
     # Define connector_stack?, cloud_stack? etc. methods
     [:cube, :cloud, :connector].each do |stackname|
@@ -62,6 +63,10 @@ module MnoEnterprise::Concerns::Models::AppInstance
     end
 
     scope :active, -> { where('status.in' => ACTIVE_STATUSES) }
+
+    def app
+      MnoEnterprise::App.find(self.app_id, { unscoped: self.without_tenant })
+    end
   end
 
   #==================================================================