app_manager 1.2.6 → 1.3.1

data/app/controllers/app_manager/plans_controller.rb

@@ -1,210 +1,213 @@
 require_dependency "app_manager/application_controller"
 
 module AppManager
-	  class PlansController < ApplicationController
-		cache_response_for :plans
-		cache_response_for :index
-		cache_response_for :users
-		skip_before_action :verify_authenticity_token, :only => [:active_without_plan,:burst_cache,:fail_safe_backup]
-	    def index
-			render :json => {"features" => AppManager.configuration.plan_features || []}
-	    end
-
-	
-	    def plans
-	    	active_plan_id_or_name = shopify_plan = plan = nil
-	    	active_charge = nil
-			default_plan_id = nil
-			choose_later = false
-			trial_activated_at = nil
-			plan_obj = AppManager::Client.new
-			plans = []
-			if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
-				@shop = shop_data
-				if !@shop.nil?
-					active_plan_id_or_name = @shop[@plan_field] rescue nil
-					plans = plan_obj.get_plans(params[:shop_domain],active_plan_id_or_name)
-					if !@field_names.nil? && @field_names.has_key?('shopify_plan') && !@field_names.nil?
-					shopify_plan_field = AppManager.configuration.field_names['shopify_plan']
-					shopify_plan = @shop[shopify_plan_field] rescue nil
-					plan = plans && plans.any? && !active_plan_id_or_name.nil? ? (plans.find{|x| x["id"] == active_plan_id_or_name}.present? ? plans.find{|x| x["id"] == active_plan_id_or_name} : nil ) : nil
-				    
-				    @trial_activated_field = AppManager.configuration.field_names['trial_activated_at'] 
-					trial_activated_at = @shop[@trial_activated_field] rescue nil
-					active_charge = plan_obj.get_charge(params[:shop_domain])
-					if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at 
-					choose_later = true
-					end
-
-				    end
-				else
-					Rails.logger.info "APP MANAGER >>>>  Either model is defined wrong or config.plan_id_or_name_field is nil in initializer ==="	
-				end	
-			else
-    			 Rails.logger.info "APP MANAGER >>>>  Either params missing store_domain or config.plan_features is nil in initializer ==="	
-			end
-
-
-			plans = plan_obj.get_plans(params[:shop_domain]) if plans && plans.blank?
-			default_plan_data = plans.select{|x| x['choose_later_plan'] == true }
-			if default_plan_data.any?
-				if default_plan_data.select{|x| x['store_base_plan'] == true }.size > 0
-					shopify_plans = plans.select{|x| x['interval'] == 'EVERY_30_DAYS' }
-					shopify_plans.each do |shp|
-						if shp && shp["shopify_plans"].include?(shopify_plan) 
-							default_plan_id = shp["id"]
-							break
-						end
-					end
-				else
-					default_plan_id = default_plan_data.map{|e| e['id']}.first if default_plan_data.any? rescue nil
-				end
-			end
-
-			response = {
-				'plans' => plans,
-				'shopify_plan' => shopify_plan,
-				'plan' => plan,
-				'default_plan_id' => default_plan_id,
-                'choose_later' => choose_later,
-                'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false) 
-			}
-			render json: response
-	    end
-
-		def users
-			if model
-				
-				search = params[:search]
-				sort = params[:sort] || AppManager.configuration.field_names['created_at']
-				order = params[:order] || 'asc'
-				plans = params[:plans] || nil
-				plans = plans.values if !plans.nil?
-				shopify_plans = params[:shopify_plans] || nil
-				shopify_plans = shopify_plans.values if !shopify_plans.nil?
-				items_per_page = params[:itemsPerPage] || 25
-				@shopify_email = AppManager.configuration.field_names['shopify_email']
-				@shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
-				data = model
-				if params[:search]	
-				data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%")
-				data = data.where(@plan_field => plans) if !plans.nil?
-				data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
-				data = data.page(params[:page]).per(items_per_page)
-				else
-				data = model.where(@plan_field => plans) if !plans.nil?
-				data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
-				data = data.page(params[:page]).per(items_per_page)
-				end
-				users = {
-				"current_page" => data && data.current_page ? data.current_page : 0,
-				"data" => data ? data.collect{|st| @field_names.map{ |key, value| [key, "#{st[value]}"] }.to_h } : [],
-				"first_page_url" => "#{app_url}/api/app-manager/users?page=1",
-				"from" => data && data.total_pages ? 1 : 0,
-				"last_page" => data && data.total_pages ? data.total_pages : 0,
-				"last_page_url" => data && data.total_pages ? "#{app_url}/api/app-manager/users?page=#{data.total_pages}" : nil,
-				"links"=> '',
-				"next_page_url" => data && data.next_page ? "#{app_url}/api/app-manager/users?page=#{data.next_page}" : nil,
-				"path" => "#{app_url}/api/app-manager/users", 
-				"per_page" => 1,
-				"prev_page_url" => data && data.prev_page ? "#{app_url}/api/app-manager/users?page=#{data.prev_page}" : nil,
-				"to" => data && data.total_pages ? data.total_pages : 0,
-				"total" => data && data.total_pages ? data.total_pages : 0,
-				}
-				render json: users
-
-			else	
-				render json: nil
-			end	
-		end
-
-		def active_without_plan
-			if params[:shop_domain].present? && params[:plan_id].present? && model
-				@shop = shop_data
-				@trial_activated_field = AppManager.configuration.field_names['trial_activated_at'] 
-				if @shop.update(@plan_field => params[:plan_id],@trial_activated_field => DateTime.now)
-				begin
-							 plan_obj = AppManager::Client.new
-	    		 			 plan_data = plan_obj.get_plan(params[:plan_id],params[:shop_domain]) rescue nil
-            					AppManager::EventHandler.new('charge_created',{
-								"plan" => plan_data,
-								"charge" => nil,
-								"previous_charge" => nil,
-								"choose_later" => true,
-								"shopify_domain" => params[:shop_domain] 	
-								})
-            				rescue Exception => e
-            					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
-            				end
-				    render json: {'status' => true}
-				else
-					render json: {'status' => false,'error' => "#{@shop.errors.full_messages.to_sentence}"}, status: 422
-				end
-			else
-				render json: {'status' => false,'error' => 'Shop not found or missing shop'}, status: 422
-			end
-		end
-
-
-		def burst_cache
-	    	AppManager.clear_cache
-			head :ok	
-	    end
-
-
-	    def fail_safe_backup
-	    	params_permit
-	    	Thread.new do
-		    	@fs = AppManager::FailSafe.new
-		    	begin
-		    		@fs.sync_app_manager	
-		    	rescue Exception => e
-		    		Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
-		    	end
-
-		    	begin
-		    	@fs.save_api_data(params)
-		    	rescue Exception => e
-		    	Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
-		    	end
-		    	AppManager.clear_cache
-		    end
-	    	head :ok
-	    end
-
-
-
-        private
-
-        def params_permit
-	    	params.permit!
-	    end
-
-        def model
-        	@models = ActiveRecord::Base.connection.tables
-			@config_table = AppManager.configuration.shopify_table_name
-			@shopify_domain = AppManager.configuration.shopify_domain_field
-			@plan_field = AppManager.configuration.plan_id_or_name_field
-			@field_names = AppManager.configuration.field_names
-			@api_version = AppManager.configuration.shopify_api_version
-			if @models.include?(@config_table) && !@plan_field.nil?
-				return @config_table.classify.constantize
-			else
-				return nil
-			end
+  class PlansController < ApplicationController
+    cache_response_for :plans
+    cache_response_for :index
+    cache_response_for :users
+    skip_before_action :verify_authenticity_token, :only => [:active_without_plan, :burst_cache, :fail_safe_backup]
+
+    def index
+      render :json => {"features" => AppManager.configuration.plan_features || []}
+    end
+
+
+    def plans
+      active_plan_id_or_name = nil
+      shopify_plan = nil
+      plan = nil
+      active_charge = nil
+      default_plan_id = nil
+      choose_later = false
+      trial_activated_at = nil
+      plan_obj = AppManager::Client.new
+      plans = []
+      if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
+        @shop = shop_data
+        if !@shop.nil?
+          active_plan_id_or_name = @shop[@plan_field] rescue nil
+          plans = plan_obj.get_plans(params[:shop_domain], active_plan_id_or_name)
+          # render json: plans and return #use this to test plan failsafe api
+          if !@field_names.nil? && @field_names.has_key?('shopify_plan') && !@field_names.nil?
+            shopify_plan_field = AppManager.configuration.field_names['shopify_plan']
+            shopify_plan = @shop[shopify_plan_field] rescue nil
+            plan = plans && plans.any? && !active_plan_id_or_name.nil? ? (plans.find { |x| x["id"] == active_plan_id_or_name }.present? ? plans.find { |x| x["id"] == active_plan_id_or_name } : nil) : nil
+
+            @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
+            trial_activated_at = @shop[@trial_activated_field] rescue nil
+            active_charge = plan_obj.get_charge(params[:shop_domain])
+            if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at && !plan
+              choose_later = true
+            end
+
+          end
+        else
+          Rollbar.error("APP MANAGER >>>>  Either model is defined wrong or config.plan_id_or_name_field is nil in initializer ===")
+        end
+      else
+        Rollbar.error("APP MANAGER >>>>  Either params missing store_domain or config.plan_features is nil in initializer ===")
+      end
+
+
+      plans = plan_obj.get_plans(params[:shop_domain]) if plans && plans.blank?
+      default_plan_data = plans.select { |x| x['choose_later_plan'] == true }
+      if default_plan_data.any?
+        if default_plan_data.select { |x| x['store_base_plan'] == true }.size > 0
+          shopify_plans = plans.select { |x| x['interval'] == 'EVERY_30_DAYS' }
+          shopify_plans.each do |shp|
+            if shp && shp["shopify_plans"].include?(shopify_plan)
+              default_plan_id = shp["id"]
+              break
+            end
+          end
+        else
+          default_plan_id = default_plan_data.map { |e| e['id'] }.first if default_plan_data.any? rescue nil
+        end
+      end
+
+      response = {
+          'plans' => plans,
+          'shopify_plan' => shopify_plan,
+          'plan' => plan,
+          'default_plan_id' => default_plan_id,
+          'choose_later' => choose_later,
+          'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false) 
+      }
+      render json: response
+    end
+
+    def users
+      if model
+
+        search = params[:search]
+        sort = params[:sort] || AppManager.configuration.field_names['created_at']
+        order = params[:order] || 'asc'
+        plans = params[:plans] || nil
+        plans = plans.values if !plans.nil?
+        shopify_plans = params[:shopify_plans] || nil
+        shopify_plans = shopify_plans.values if !shopify_plans.nil?
+        items_per_page = params[:itemsPerPage] || 25
+        @shopify_email = AppManager.configuration.field_names['shopify_email']
+        @shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
+        data = model
+        if params[:search]
+          data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%")
+          data = data.where(@plan_field => plans) if !plans.nil?
+          data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
+          data = data.page(params[:page]).per(items_per_page)
+        else
+          data = model.where(@plan_field => plans) if !plans.nil?
+          data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
+          data = data.page(params[:page]).per(items_per_page)
+        end
+        users = {
+            "current_page" => data && data.current_page ? data.current_page : 0,
+            "data" => data ? data.collect { |st| @field_names.map { |key, value| [key, "#{st[value]}"] }.to_h } : [],
+            "first_page_url" => "#{app_url}/api/app-manager/users?page=1",
+            "from" => data && data.total_pages ? 1 : 0,
+            "last_page" => data && data.total_pages ? data.total_pages : 0,
+            "last_page_url" => data && data.total_pages ? "#{app_url}/api/app-manager/users?page=#{data.total_pages}" : nil,
+            "links" => '',
+            "next_page_url" => data && data.next_page ? "#{app_url}/api/app-manager/users?page=#{data.next_page}" : nil,
+            "path" => "#{app_url}/api/app-manager/users",
+            "per_page" => 1,
+            "prev_page_url" => data && data.prev_page ? "#{app_url}/api/app-manager/users?page=#{data.prev_page}" : nil,
+            "to" => data && data.total_pages ? data.total_pages : 0,
+            "total" => data && data.total_pages ? data.total_pages : 0,
+        }
+        render json: users
+
+      else
+        render json: nil
+      end
+    end
+
+    def active_without_plan
+      if params[:shop_domain].present? && params[:plan_id].present? && model
+        @shop = shop_data
+        @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
+        if @shop.update(@plan_field => params[:plan_id], @trial_activated_field => DateTime.now)
+          begin
+            plan_obj = AppManager::Client.new
+            plan_data = plan_obj.get_plan(params[:plan_id], params[:shop_domain]) rescue nil
+            AppManager::EventHandler.new('charge_created', {
+                "plan" => plan_data,
+                "charge" => nil,
+                "previous_charge" => nil,
+                "choose_later" => true,
+                "shopify_domain" => params[:shop_domain]
+            })
+          rescue Exception => e
+            Rollbar.error("APP MANAGER Error in Active without plan method #{e}")
+          end
+          render json: {'status' => true}
+        else
+          render json: {'status' => false, 'error' => "#{@shop.errors.full_messages.to_sentence}"}, status: 422
+        end
+      else
+        render json: {'status' => false, 'error' => 'Shop not found or missing shop'}, status: 422
+      end
+    end
+
+
+    def burst_cache
+      AppManager.clear_cache
+      head :ok
+    end
+
+
+    def fail_safe_backup
+      params_permit
+      Thread.new do
+        @fs = AppManager::FailSafe.new
+        begin
+          @fs.sync_app_manager
+        rescue Exception => e
+          Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
         end
 
-	    def shop_data
-			if model
-				return model.where(@shopify_domain => params[:shop_domain]).first rescue nil
-			else
-				return nil
-			end
-	    end
-
-	    def app_url
-	    	AppManager.configuration.app_url
-	    end
-
-	  end
-end
+        begin
+        @fs.save_api_data(params)
+          rescue Exception => e
+          Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+          end
+          AppManager.clear_cache
+      end
+      head :ok
+    end
+
+
+    private
+
+    def params_permit
+      params.permit!
+    end
+
+    def model
+      @models = ActiveRecord::Base.connection.tables
+      @config_table = AppManager.configuration.shopify_table_name
+      @shopify_domain = AppManager.configuration.shopify_domain_field
+      @plan_field = AppManager.configuration.plan_id_or_name_field
+      @field_names = AppManager.configuration.field_names
+      @api_version = AppManager.configuration.shopify_api_version
+      if @models.include?(@config_table) && !@plan_field.nil?
+        return @config_table.classify.constantize
+      else
+        return nil
+      end
+    end
+
+    def shop_data
+      if model
+        return model.where(@shopify_domain => params[:shop_domain]).first rescue nil
+      else
+        return nil
+      end
+    end
+
+    def app_url
+      AppManager.configuration.app_url
+    end
+
+  end
+end

data/app/model/app_manager/app.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class App < AppManagerRecord
+    self.table_name = "apps"
+  end
+end

data/app/model/app_manager/app_manager_record.rb

@@ -0,0 +1,7 @@
+module AppManager
+
+  class AppManagerRecord < ApplicationRecord
+    self.abstract_class = true
+    connects_to database: { writing: :app_manager }
+  end
+end

data/app/model/app_manager/app_structure.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class AppStructure < AppManagerRecord
+    self.table_name = "app_structures"
+  end
+end

data/app/model/app_manager/charge.rb

@@ -0,0 +1,6 @@
+module AppManager
+  class Charge < AppManagerRecord
+    self.inheritance_column = nil
+    self.table_name = "charges"
+  end
+end

data/app/model/app_manager/discount_plan.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class DiscountPlan < AppManagerRecord
+    self.table_name = "discount_plans"
+  end
+end

data/app/model/app_manager/extend_trial.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class ExtendTrial < AppManagerRecord
+    self.table_name = "extend_trials"
+  end
+end

data/app/model/app_manager/plan.rb

@@ -0,0 +1,6 @@
+module AppManager
+  class Plan < AppManagerRecord
+    self.inheritance_column = nil
+    self.table_name = "plans"
+  end
+end

data/app/model/app_manager/plan_user.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class PlanUser < AppManagerRecord
+    self.table_name = "plan_users"
+  end
+end

data/app_manager.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "rails",   '>= 5.2.0'
   spec.add_dependency "kaminari",   '>= 0.16.3'
-  spec.add_dependency "sqlite3", '~> 1.4.4'
+  # spec.add_dependency "sqlite3", '~> 1.3.0'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

data/lib/app_manager/client/connection.rb

@@ -23,7 +23,6 @@ module AppManager
       private
 
       def request(http_method, path, options)
-        begin
           if http_method.to_s == 'get'
           response = response_from_cache_for_api(http_method, path, options)
           else
@@ -38,15 +37,12 @@ module AppManager
             if response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')
               data = response.parsed_response
               data = parse_data(response.parsed_response)
-              # data = response_from_failsafe(path,options) 
+              # data = response_from_failsafe(path,options)
             else
               data = response_from_failsafe(path,options) 
             end
           end
-        rescue Exception => e
-           data = response_from_failsafe(path,options) 
-        end
-      end
+       end
 
       def response_from_cache_for_api(http_method, path, options)
         cache_key = "app-manager-cache/#{path}"
@@ -92,7 +88,9 @@ module AppManager
         when 'get-remaining-days' 
           return @fs.get_local_remaining_days(params,options) 
         when 'get-charge'
-          return @fs.get_local_charge(params,options)  
+          return @fs.get_local_charge(params,options)
+        when 'has-plan'
+          return @fs.get_local_has_plan(params, options)
         else
          return nil
         end

data/lib/app_manager/client/plans.rb

@@ -1,48 +1,48 @@
 module AppManager
-	class Client
-			module Plans
+  class Client
+    module Plans
 
-			  def get_plans(shop_domain,active_plan_id=nil)
-				  get("/plans?shop_domain=#{shop_domain}&active_plan_id=#{active_plan_id}")
-			  end
+      def get_plans(shop_domain, active_plan_id = nil)
+        get("/plans?shop_domain=#{shop_domain}&active_plan_id=#{active_plan_id}")
+      end
 
-			  def get_plan(plan_id,shop_domain=nil)
-				  get("/plan?plan_id=#{plan_id}&shop_domain=#{shop_domain}")
-			  end
+      def get_plan(plan_id, shop_domain = nil)
+        get("/plan?plan_id=#{plan_id}&shop_domain=#{shop_domain}")
+      end
 
-			  def store_charge(options = {})
-			  	  post("/store-charge", options)
-			  end
+      def store_charge(options = {})
+        post("/store-charge", options)
+      end
 
-			  def cancel_charge(shop_domain,plan_id)
-			  	  post("/cancel-charge", {shop_domain: shop_domain,plan_id: plan_id})
-			  end
+      def cancel_charge(shop_domain, plan_id)
+        post("/cancel-charge", {shop_domain: shop_domain, plan_id: plan_id})
+      end
 
-    		  def update_charge(shop_domain,plan_id)
-    		  	  post("/update-charge", {shop_domain: shop_domain,plan_id: plan_id})
-    		  end
+      def update_charge(shop_domain, plan_id)
+        post("/update-charge", {shop_domain: shop_domain, plan_id: plan_id})
+      end
 
-			  def sync_charge(options = {})
-			  	  post("/sync-charge", options)
-			  end
+      def sync_charge(options = {})
+        post("/sync-charge", options)
+      end
 
-			  def get_remaining_days(shop_domain,trial_activated_at=nil,plan_id=nil)
-			  	  get("/get-remaining-days?shop_domain=#{shop_domain}&trial_activated_at=#{trial_activated_at}&plan_id=#{plan_id}")
-			  end
+      def get_remaining_days(shop_domain, trial_activated_at = nil, plan_id = nil)
+        get("/get-remaining-days?shop_domain=#{shop_domain}&trial_activated_at=#{trial_activated_at}&plan_id=#{plan_id}")
+      end
 
-    		  def get_charge(shop_domain)
-			      get("/get-charge?shop_domain=#{shop_domain}")
-			  end
+      def get_charge(shop_domain)
+        get("/get-charge?shop_domain=#{shop_domain}")
+      end
 
-			  def get_status(options = {})
-				  get("/get-status", options)
-			  end
+      def get_status(options = {})
+        get("/get-status", options)
+      end
 
-			  def has_plan(shop_domain,plan_id,trial_activated_at,grandfathered)
-			  	  get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
-			  end
+      def has_plan(shop_domain, plan_id, trial_activated_at, grandfathered)
+        get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
+      end
 
 
-			end
-	end
+    end
+  end
 end