disco_app 0.14.4 → 0.17.0

data/app/services/disco_app/flow/create_action.rb

@@ -0,0 +1,35 @@
+require 'interactor'
+
+module DiscoApp
+  module Flow
+    class CreateAction
+
+      include Interactor
+
+      delegate :shop, :action_id, :action_run_id, :properties, to: :context
+      delegate :action, to: :context
+
+      def call
+        create_action
+        enqueue_process_action_job
+      end
+
+      private
+
+        def create_action
+          context.action = shop.flow_actions.create!(
+            action_id: action_id,
+            action_run_id: action_run_id,
+            properties: properties
+          )
+        rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
+          context.fail!
+        end
+
+        def enqueue_process_action_job
+          ProcessActionJob.perform_later(shop, action)
+        end
+
+    end
+  end
+end

data/app/services/disco_app/flow/create_trigger.rb

@@ -0,0 +1,34 @@
+require 'interactor'
+
+module DiscoApp
+  module Flow
+    class CreateTrigger
+
+      include Interactor
+
+      delegate :shop, :title, :resource_name, :resource_url, :properties, to: :context
+      delegate :trigger, to: :context
+
+      def call
+        create_trigger
+        enqueue_process_trigger_job
+      end
+
+      private
+
+        def create_trigger
+          context.trigger = shop.flow_triggers.create!(
+            title: title,
+            resource_name: resource_name,
+            resource_url: resource_url,
+            properties: properties
+          )
+        end
+
+        def enqueue_process_trigger_job
+          ProcessTriggerJob.perform_later(shop, trigger)
+        end
+
+    end
+  end
+end

data/app/services/disco_app/flow/process_action.rb

@@ -0,0 +1,50 @@
+require 'interactor'
+
+module DiscoApp
+  module Flow
+    class ProcessAction
+
+      include Interactor
+
+      delegate :action, to: :context
+      delegate :action_service_class, to: :context
+
+      def call
+        validate_action
+        find_action_service_class
+        execute_action_service_class
+      end
+
+      private
+
+        def validate_action
+          context.fail! unless action.pending?
+        end
+
+        def find_action_service_class
+          context.action_service_class =
+            action.action_id.classify.safe_constantize ||
+            %(Flow::Actions::#{action.action_id.to_s.classify}).safe_constantize
+
+          return unless action_service_class.nil?
+
+          update_action(false, ["Could not find service class for #{action.action_id}"])
+          context.fail!
+        end
+
+        def execute_action_service_class
+          result = action_service_class.call(shop: action.shop, properties: action.properties)
+          update_action(result.success?, result.errors)
+        end
+
+        def update_action(success, errors)
+          action.update!(
+            status: success ? Action.statuses[:succeeded] : Action.statuses[:failed],
+            processing_errors: success ? [] : errors,
+            processed_at: Time.current
+          )
+        end
+
+    end
+  end
+end

data/app/services/disco_app/flow/process_trigger.rb

@@ -0,0 +1,52 @@
+require 'interactor'
+
+module DiscoApp
+  module Flow
+    class ProcessTrigger
+
+      include Interactor
+
+      delegate :trigger, to: :context
+      delegate :api_success, :api_errors, to: :context
+
+      def call
+        validate_trigger
+        make_api_request
+        update_trigger
+        fail_if_errors_present
+      end
+
+      private
+
+        def validate_trigger
+          context.fail! unless trigger.pending?
+        end
+
+        def make_api_request
+          context.api_success, context.api_errors = api_client.create_flow_trigger(
+            trigger.title,
+            trigger.resource_name,
+            trigger.resource_url,
+            trigger.properties
+          )
+        end
+
+        def update_trigger
+          trigger.update!(
+            status: api_success ? Trigger.statuses[:succeeded] : Trigger.statuses[:failed],
+            processing_errors: api_success ? [] : api_errors,
+            processed_at: Time.current
+          )
+        end
+
+        def fail_if_errors_present
+          context.fail! unless api_success
+        end
+
+        def api_client
+          @api_client ||= DiscoApp::GraphqlClient.new(trigger.shop)
+        end
+
+    end
+  end
+end

data/app/services/disco_app/partner_app_service.rb

@@ -79,7 +79,7 @@ module DiscoApp
           form['create_form[application_url]'] = @app_url
 
           # Accept TOS
-          unless form['create_form[accepted]'].blank?
+          if form['create_form[accepted]'].present?
             form['create_form[accepted]'] = '1'
             form.hiddens.last.value = 1
           end

data/app/services/disco_app/proxy_service.rb

@@ -5,12 +5,12 @@ class DiscoApp::ProxyService
   def self.proxy_signature_is_valid?(query_string, secret)
     query_hash = Rack::Utils.parse_query(query_string)
     signature = query_hash.delete('signature').to_s
-    ActiveSupport::SecurityUtils.secure_compare(self.calculated_signature(query_hash, secret), signature)
+    ActiveSupport::SecurityUtils.secure_compare(calculated_signature(query_hash, secret), signature)
   end
 
   # Return the calculated signature for the given query hash and secret.
   def self.calculated_signature(query_hash, secret)
-    sorted_params = query_hash.collect{ |k, v| "#{k}=#{Array(v).join(',')}" }.sort.join
+    sorted_params = query_hash.map{ |k, v| "#{k}=#{Array(v).join(',')}" }.sort.join
     OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), secret, sorted_params)
   end
 

data/app/services/disco_app/request_validation_service.rb

@@ -3,12 +3,12 @@ class DiscoApp::RequestValidationService
   def self.hmac_valid?(query_string, secret)
     query_hash = Rack::Utils.parse_query(query_string)
     hmac = query_hash.delete('hmac').to_s
-    ActiveSupport::SecurityUtils.secure_compare(self.calculated_hmac(query_hash, secret), hmac)
+    ActiveSupport::SecurityUtils.secure_compare(calculated_hmac(query_hash, secret), hmac)
   end
 
   # Return the calculated hmac for the given query hash and secret.
   def self.calculated_hmac(query_hash, secret)
-    sorted_params = query_hash.collect{ |k, v| "#{k}=#{Array(v).join(',')}" }.sort.join('&')
+    sorted_params = query_hash.map{ |k, v| "#{k}=#{Array(v).join(',')}" }.sort.join('&')
     OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), secret, sorted_params)
   end
 

data/app/services/disco_app/subscription_service.rb

@@ -3,50 +3,78 @@ class DiscoApp::SubscriptionService
   # Subscribe the given shop to the given plan, optionally using the given plan
   # code and optionally tracking the subscription source.
   def self.subscribe(shop, plan, plan_code = nil, source_name = nil)
+    new(shop, plan, plan_code, source_name).subscribe
+  end
+
+  attr_reader :shop, :plan, :plan_code, :source_name
+
+  def initialize(shop, plan, plan_code = nil, source_name = nil)
+    @shop = shop
+    @plan = plan
+    @plan_code = plan_code
+    @source_name = source_name
+  end
+
+  def subscribe
+    cancel_existing_subscriptions
+
+    # Create the new subscription.
+    new_subscription = create_new_subscription
+
+    # Enqueue the subscription changed background job.
+    DiscoApp::SubscriptionChangedJob.perform_later(shop, new_subscription)
+
+    # Return the new subscription.
+    new_subscription
+  end
+
+  private
 
     # If a plan code was provided, fetch it for the given plan.
-    plan_code_instance = nil
-    if plan_code.present?
-      plan_code_instance = DiscoApp::PlanCode.available.find_by(plan: plan, code: plan_code)
+    def plan_code_instance
+      return if plan_code.blank?
+
+      @plan_code_instance ||= DiscoApp::PlanCode.available.find_by(plan: plan, code: plan_code)
     end
 
     # If a source name has been provided, fetch or create it
-    source_instance = nil
-    if source_name.present?
-      source_instance = DiscoApp::Source.find_or_create_by(source: source_name)
+    def source_instance
+      return if source_name.blank?
+
+      @source_instance ||= DiscoApp::Source.find_or_create_by(source: source_name)
     end
 
     # Cancel any existing current subscriptions.
-    shop.subscriptions.current.update_all(
-      status: DiscoApp::Subscription.statuses[:cancelled],
-      cancelled_at: Time.now
-    )
+    def cancel_existing_subscriptions
+      shop.subscriptions.current.update_all( # rubocop:disable Rails/SkipsModelValidations
+        status: DiscoApp::Subscription.statuses[:cancelled],
+        cancelled_at: Time.zone.now
+      )
+    end
 
     # Get the amount that should be charged for the subscription.
-    subscription_amount = plan_code_instance.present? ? plan_code_instance.amount : plan.amount
+    def subscription_amount
+      plan_code_instance.present? ? plan_code_instance.amount : plan.amount
+    end
 
     # Get the date the subscription trial should end.
-    subscription_trial_period_days = plan_code_instance.present? ? plan_code_instance.trial_period_days : plan.trial_period_days
-
-    # Create the new subscription.
-    new_subscription = DiscoApp::Subscription.create!(
-      shop: shop,
-      plan: plan,
-      plan_code: plan_code_instance,
-      status: DiscoApp::Subscription.statuses[plan.has_trial? ? :trial : :active],
-      subscription_type: plan.plan_type,
-      amount: subscription_amount,
-      trial_period_days: plan.has_trial? ? subscription_trial_period_days : nil,
-      trial_start_at: plan.has_trial? ? Time.now : nil,
-      trial_end_at: plan.has_trial? ? subscription_trial_period_days.days.from_now : nil,
-      source: source_instance
-    )
-
-    # Enqueue the subscription changed background job.
-    DiscoApp::SubscriptionChangedJob.perform_later(shop, new_subscription)
+    def subscription_trial_period_days
+      plan_code_instance.present? ? plan_code_instance.trial_period_days : plan.trial_period_days
+    end
 
-    # Return the new subscription.
-    new_subscription
-  end
+    def create_new_subscription
+      DiscoApp::Subscription.create!(
+        shop: shop,
+        plan: plan,
+        plan_code: plan_code_instance,
+        status: DiscoApp::Subscription.statuses[plan.has_trial? ? :trial : :active],
+        subscription_type: plan.plan_type,
+        amount: subscription_amount,
+        trial_period_days: plan.has_trial? ? subscription_trial_period_days : nil,
+        trial_start_at: plan.has_trial? ? Time.zone.now : nil,
+        trial_end_at: plan.has_trial? ? subscription_trial_period_days.days.from_now : nil,
+        source: source_instance
+      )
+    end
 
 end

data/app/services/disco_app/webhook_service.rb

@@ -2,28 +2,26 @@ class DiscoApp::WebhookService
 
   # Return true iff the provided hmac_to_verify matches that calculated from the
   # given data and secret.
-  def self.is_valid_hmac?(body, secret, hmac_to_verify)
-    ActiveSupport::SecurityUtils.secure_compare(self.calculated_hmac(body, secret), hmac_to_verify.to_s)
+  def self.valid_hmac?(body, secret, hmac_to_verify)
+    ActiveSupport::SecurityUtils.secure_compare(calculated_hmac(body, secret), hmac_to_verify.to_s)
   end
 
   # Calculate the HMAC for the given data and secret.
   def self.calculated_hmac(body, secret)
-    digest  = OpenSSL::Digest.new('sha256')
+    digest = OpenSSL::Digest.new('sha256')
     Base64.encode64(OpenSSL::HMAC.digest(digest, secret, body)).strip
   end
 
   # Try to find a job class for the given webhook topic.
   def self.find_job_class(topic)
+    # First try to find a top-level matching job class.
+    "#{topic}_job".tr('/', '_').classify.constantize
+  rescue NameError
+    # If that fails, try to find a DiscoApp:: prefixed job class.
     begin
-      # First try to find a top-level matching job class.
-      "#{topic}_job".gsub('/', '_').classify.constantize
+      %(DiscoApp::#{"#{topic}_job".tr('/', '_').classify}).constantize
     rescue NameError
-      # If that fails, try to find a DiscoApp:: prefixed job class.
-      begin
-        %Q{DiscoApp::#{"#{topic}_job".gsub('/', '_').classify}}.constantize
-      rescue NameError
-        nil
-      end
+      nil
     end
   end
 

data/config/routes.rb

@@ -1,7 +1,6 @@
 require 'sidekiq/web'
 
 DiscoApp::Engine.routes.draw do
-
   get 'ref', to: '/sessions#referral'
   get '/auth/failure', to: '/sessions#failure'
 
@@ -9,6 +8,12 @@ DiscoApp::Engine.routes.draw do
     post 'webhooks' => :process_webhook, as: :webhooks
   end
 
+  namespace :flow do
+    controller :actions do
+      post 'actions/:id' => :create_flow_action, as: :flow_actions
+    end
+  end
+
   resources :user_sessions, only: [:new, :create, :destroy]
   get 'auth/shopify_user/callback' => 'user_sessions#callback'
 
@@ -46,7 +51,7 @@ DiscoApp::Engine.routes.draw do
   end
 
   # Make the Sidekiq Web UI accessible using the same credentials as the admin.
-  if Rails.env.production?
+  if Rails.env.production? || Rails.env.staging?
     Sidekiq::Web.use Rack::Auth::Basic do |username, password|
       [
         ENV['ADMIN_APP_USERNAME'].present?,
@@ -64,5 +69,4 @@ DiscoApp::Engine.routes.draw do
       get 'frame' => :frame, as: :frame
     end
   end
-
 end

data/db/migrate/20150525000000_create_shops_if_not_existent.rb

@@ -6,105 +6,105 @@ class CreateShopsIfNotExistent < ActiveRecord::Migration[5.1]
   def change
     return if table_exists? :disco_app_shops
 
-    create_table "disco_app_app_settings", force: :cascade do |t|
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
+    create_table :disco_app_app_settings, force: :cascade do |t|
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
     end
 
-    create_table "disco_app_application_charges", force: :cascade do |t|
-      t.integer  "shop_id",          limit: 8
-      t.integer  "subscription_id",  limit: 8
-      t.integer  "status",                     default: 0
-      t.datetime "created_at",                             null: false
-      t.datetime "updated_at",                             null: false
-      t.integer  "shopify_id",       limit: 8
-      t.string   "confirmation_url"
+    create_table :disco_app_application_charges, force: :cascade do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shopify_id, limit: 8
+      t.string :confirmation_url
     end
 
-    create_table "disco_app_plan_codes", force: :cascade do |t|
-      t.integer  "plan_id",           limit: 8
-      t.string   "code"
-      t.integer  "trial_period_days"
-      t.integer  "amount"
-      t.datetime "created_at",                              null: false
-      t.datetime "updated_at",                              null: false
-      t.integer  "status",                      default: 0
+    create_table :disco_app_plan_codes, force: :cascade do |t|
+      t.integer :plan_id, limit: 8
+      t.string :code
+      t.integer :trial_period_days
+      t.integer :amount
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :status, default: 0
     end
 
-    create_table "disco_app_plans", force: :cascade do |t|
-      t.integer  "status",            default: 0
-      t.string   "name"
-      t.integer  "plan_type",         default: 0
-      t.integer  "trial_period_days"
-      t.datetime "created_at",                        null: false
-      t.datetime "updated_at",                        null: false
-      t.integer  "amount",            default: 0
-      t.string   "currency",          default: "USD"
-      t.integer  "interval",          default: 0
-      t.integer  "interval_count",    default: 1
+    create_table :disco_app_plans, force: :cascade do |t|
+      t.integer :status, default: 0
+      t.string :name
+      t.integer :plan_type, default: 0
+      t.integer :trial_period_days
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :amount, default: 0
+      t.string :currency, default: 'USD'
+      t.integer :interval, default: 0
+      t.integer :interval_count, default: 1
     end
 
-    create_table "disco_app_recurring_application_charges", force: :cascade do |t|
-      t.integer  "shop_id",          limit: 8
-      t.integer  "subscription_id",  limit: 8
-      t.integer  "status",                     default: 0
-      t.datetime "created_at",                             null: false
-      t.datetime "updated_at",                             null: false
-      t.integer  "shopify_id",       limit: 8
-      t.string   "confirmation_url"
+    create_table :disco_app_recurring_application_charges, force: :cascade do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shopify_id, limit: 8
+      t.string :confirmation_url
     end
 
-    create_table "disco_app_sessions", force: :cascade do |t|
-      t.string   "session_id", null: false
-      t.text     "data"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-      t.integer  "shop_id"
+    create_table :disco_app_sessions, force: :cascade do |t|
+      t.string :session_id, null: false
+      t.text :data
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shop_id
     end
 
-    add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true, using: :btree
-    add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at", using: :btree
+    add_index :disco_app_sessions, [:session_id], name: 'index_disco_app_sessions_on_session_id', unique: true, using: :btree
+    add_index :disco_app_sessions, [:updated_at], name: 'index_disco_app_sessions_on_updated_at', using: :btree
 
-    create_table "disco_app_shops", force: :cascade do |t|
-      t.string   "shopify_domain",              null: false
-      t.string   "shopify_token",               null: false
-      t.datetime "created_at",                  null: false
-      t.datetime "updated_at",                  null: false
-      t.integer  "status",         default: 0
-      t.string   "domain"
-      t.string   "plan_name"
-      t.string   "name"
-      t.jsonb    "data",           default: {}
+    create_table :disco_app_shops, force: :cascade do |t|
+      t.string :shopify_domain, null: false
+      t.string :shopify_token, null: false
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :status, default: 0
+      t.string :domain
+      t.string :plan_name
+      t.string :name
+      t.jsonb :data, default: {}
     end
 
-    add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
+    add_index :disco_app_shops, [:shopify_domain], name: 'index_disco_app_shops_on_shopify_domain', unique: true, using: :btree
 
-    create_table "disco_app_subscriptions", force: :cascade do |t|
-      t.integer  "shop_id"
-      t.integer  "plan_id"
-      t.integer  "status"
-      t.integer  "subscription_type"
-      t.datetime "created_at",                              null: false
-      t.datetime "updated_at",                              null: false
-      t.datetime "trial_start_at"
-      t.datetime "trial_end_at"
-      t.datetime "cancelled_at"
-      t.integer  "amount",                      default: 0
-      t.integer  "plan_code_id",      limit: 8
-      t.string   "source"
-      t.integer  "trial_period_days"
+    create_table :disco_app_subscriptions, force: :cascade do |t|
+      t.integer :shop_id
+      t.integer :plan_id
+      t.integer :status
+      t.integer :subscription_type
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.datetime :trial_start_at
+      t.datetime :trial_end_at
+      t.datetime :cancelled_at
+      t.integer :amount, default: 0
+      t.integer :plan_code_id, limit: 8
+      t.string :source
+      t.integer :trial_period_days
     end
 
-    add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id", using: :btree
-    add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id", using: :btree
+    add_index :disco_app_subscriptions, [:plan_id], name: 'index_disco_app_subscriptions_on_plan_id', using: :btree
+    add_index :disco_app_subscriptions, [:shop_id], name: 'index_disco_app_subscriptions_on_shop_id', using: :btree
 
-    add_foreign_key "disco_app_application_charges", "disco_app_shops", column: "shop_id"
-    add_foreign_key "disco_app_application_charges", "disco_app_subscriptions", column: "subscription_id"
-    add_foreign_key "disco_app_plan_codes", "disco_app_plans", column: "plan_id"
-    add_foreign_key "disco_app_recurring_application_charges", "disco_app_shops", column: "shop_id"
-    add_foreign_key "disco_app_recurring_application_charges", "disco_app_subscriptions", column: "subscription_id"
-    add_foreign_key "disco_app_sessions", "disco_app_shops", column: "shop_id", on_delete: :cascade
-    add_foreign_key "disco_app_subscriptions", "disco_app_plan_codes", column: "plan_code_id"
+    add_foreign_key :disco_app_application_charges, :disco_app_shops, column: :shop_id
+    add_foreign_key :disco_app_application_charges, :disco_app_subscriptions, column: :subscription_id
+    add_foreign_key :disco_app_plan_codes, :disco_app_plans, column: :plan_id
+    add_foreign_key :disco_app_recurring_application_charges, :disco_app_shops, column: :shop_id
+    add_foreign_key :disco_app_recurring_application_charges, :disco_app_subscriptions, column: :subscription_id
+    add_foreign_key :disco_app_sessions, :disco_app_shops, column: :shop_id, on_delete: :cascade
+    add_foreign_key :disco_app_subscriptions, :disco_app_plan_codes, column: :plan_code_id
   end
 
 end

data/db/migrate/20170315062548_create_disco_app_sources.rb

@@ -1,4 +1,5 @@
 class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
+
   def change
     create_table :disco_app_sources do |t|
       t.string :source, null: true
@@ -7,4 +8,5 @@ class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
     end
     add_index :disco_app_sources, :source
   end
+
 end

data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb

@@ -1,4 +1,5 @@
 class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
+
   def change
     add_column :disco_app_subscriptions, :source_id, :integer, limit: 8, index: true
     add_foreign_key :disco_app_subscriptions, :disco_app_sources, column: :source_id
@@ -9,6 +10,7 @@ class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
       end
     end
 
-    remove_column :disco_app_subscriptions, :source
+    remove_column :disco_app_subscriptions, :source, :string
   end
+
 end

data/db/migrate/20170327214540_create_disco_app_users.rb

@@ -1,13 +1,14 @@
 class CreateDiscoAppUsers < ActiveRecord::Migration[5.1]
+
   def change
     create_table :disco_app_users do |t|
       t.integer :shop_id, limit: 8
       t.string :first_name
       t.string :last_name
       t.string :email
-
       t.timestamps null: false
     end
     add_index :disco_app_users, :shop_id, unique: true
   end
+
 end

data/db/migrate/20170606160751_fix_disco_app_users_index.rb

@@ -1,6 +1,8 @@
 class FixDiscoAppUsersIndex < ActiveRecord::Migration[5.1]
+
   def change
     remove_index :disco_app_users, :shop_id
     add_index :disco_app_users, [:id, :shop_id], unique: true
   end
+
 end