Merge branch 'develop' into chore/update-rails

app/models/integrations/app.rb

@@ -55,9 +55,11 @@ class Integrations::App
     when 'linear'
       GlobalConfigService.load('LINEAR_CLIENT_ID', nil).present?
     when 'shopify'
-      account.feature_enabled?('shopify_integration') && GlobalConfigService.load('SHOPIFY_CLIENT_ID', nil).present?
+      shopify_enabled?(account)
     when 'leadsquared'
       account.feature_enabled?('crm_integration')
+    when 'notion'
+      notion_enabled?(account)
     else
       true
     end
@@ -113,4 +115,14 @@ class Integrations::App
       all.detect { |app| app.id == params[:id] }
     end
   end
+
+  private
+
+  def shopify_enabled?(account)
+    account.feature_enabled?('shopify_integration') && GlobalConfigService.load('SHOPIFY_CLIENT_ID', nil).present?
+  end
+
+  def notion_enabled?(account)
+    account.feature_enabled?('notion_integration') && GlobalConfigService.load('NOTION_CLIENT_ID', nil).present?
+  end
 end

app/models/integrations/hook.rb

@@ -53,6 +53,10 @@ class Integrations::Hook < ApplicationRecord
     app_id == 'dialogflow'
   end
 
+  def notion?
+    app_id == 'notion'
+  end
+
   def disable
     update(status: 'disabled')
   end