app_manager 1.2.6 → 1.3.1

data/lib/app_manager/graphql_helper.rb

@@ -33,7 +33,7 @@ module AppManager
             response = ActiveSupport::JSON.decode(response.read_body) rescue nil
             return response
         else
-            Rails.logger.info "=== params missing from any of these api_key, api_version, shopify_domain, shopify_token ==="  
+          Rollbar.error("=== params missing from any of these api_key, api_version, shopify_domain, shopify_token ===")
             return []  
         end
     end

data/lib/app_manager/model.rb

@@ -2,270 +2,258 @@ module AppManager
   module Model
     extend ActiveSupport::Concern
 
-     @@remaining_cache_key = "get_remaining_days_key"
-     @@get_charge_key = "get_charge_key"
-
     def has_plan_old
-        if !self[AppManager.configuration.plan_id_or_name_field]
-            return false;
-        end 
-        if self[AppManager.configuration.field_names['grandfathered']]
-            return true;
-        end
-        plan_id = self[AppManager.configuration.plan_id_or_name_field]
-        if !plan_id
-            Rails.logger.info "Plan id found nil or not set"
-            return false;
-        end
-        remaining_days = fetch_static_remaining_days
-        if remaining_days > 0
-            return true
-        end
-        # plan_obj = AppManager::Client.new
-        # shop_domain = self[AppManager.configuration.shopify_domain_field]
-        # active_charge = plan_obj.get_charge(shop_domain) rescue nil
-        active_charge = fetch_static_get_charge
-        return active_charge && active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
+      if !self[AppManager.configuration.plan_id_or_name_field]
+        return false;
+      end
+      if self[AppManager.configuration.field_names['grandfathered']]
+        return true;
+      end
+      plan_id = self[AppManager.configuration.plan_id_or_name_field]
+      if !plan_id
+        return false;
+      end
+      remaining_days = fetch_static_remaining_days
+      if remaining_days.to_i > 0
+        return true
+      end
+      # plan_obj = AppManager::Client.new
+      # shop_domain = self[AppManager.configuration.shopify_domain_field]
+      # active_charge = plan_obj.get_charge(shop_domain) rescue nil
+      active_charge = fetch_static_get_charge
+      return active_charge && active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
     end
 
     def has_plan
-        plan_id = self[AppManager.configuration.plan_id_or_name_field]
-        if !plan_id
-            return false;
-        end
-        grandfathered = self[AppManager.configuration.field_names['grandfathered']] 
-        grandfathered = grandfathered ? 1 : 0
-        shop_domain = self[AppManager.configuration.shopify_domain_field]
-        trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
-        trial_activated_at_val = self[trial_activated_at_field]
-        plan_obj = AppManager::Client.new
-        response = plan_obj.has_plan(shop_domain,plan_id,trial_activated_at_val,grandfathered)
-        return (response && response['has_plan']) || false
+      plan_id = self[AppManager.configuration.plan_id_or_name_field]
+      if !plan_id
+        return false;
+      end
+      grandfathered = self[AppManager.configuration.field_names['grandfathered']]
+      grandfathered = grandfathered ? 1 : 0
+      shop_domain = self[AppManager.configuration.shopify_domain_field] rescue nil
+      trial_activated_at_val = self[AppManager.configuration.field_names['trial_activated_at']] rescue nil
+      plan_obj = AppManager::Client.new
+      response = plan_obj.has_plan(shop_domain, plan_id, trial_activated_at_val, grandfathered)
+      return (response && response['has_plan']) || false
     end
 
 
     def plan_features
-    	plan_id = self[AppManager.configuration.plan_id_or_name_field]
-    	if !plan_id
-            Rails.logger.info "Plan id found nil or not set in DB"
-    		return []
-    	end
-		plan_obj = AppManager::Client.new
-		plans = plan_obj.get_plan(plan_id)
-		if plans && plans['features'].blank?
-			return []
-		end
-    	features_by_plan = plans['features'].map { |h| h.slice('value', 'feature_id') }
-		all_features = AppManager.configuration.plan_features
-        feature_plan_ids = features_by_plan.map{|c| c['feature_id']}
-        pf = all_features.select{|x| feature_plan_ids.include?(x['uuid'])}.each{|g| g["value"] = features_by_plan.find{|e| e['feature_id'] == g['uuid']}['value'] } 
-        return pf
+      plan_id = self[AppManager.configuration.plan_id_or_name_field]
+      if !plan_id
+        return []
+      end
+      plan_obj = AppManager::Client.new
+      plans = plan_obj.get_plan(plan_id)
+      if plans && plans['features'].blank?
+        return []
+      end
+      features_by_plan = plans['features'].map { |h| h.slice('value', 'feature_id') }
+      all_features = AppManager.configuration.plan_features
+      feature_plan_ids = features_by_plan.map { |c| c['feature_id'] }
+      pf = all_features.select { |x| feature_plan_ids.include?(x['uuid']) }.each { |g| g["value"] = features_by_plan.find { |e| e['feature_id'] == g['uuid'] }['value'] }
+      return pf
     end
 
 
-
     def has_feature(slug)
-    	self.plan_features.any? && self.plan_features.select{|x| x['slug'].to_s == slug }.size > 0 ? true : false
+      self.plan_features.any? && self.plan_features.select { |x| x['slug'].to_s == slug }.size > 0 ? true : false
     end
 
 
     def get_feature(slug)
-        plan_features = self.plan_features
-        features = plan_features.select{|x| x['slug'].to_s == slug }
-    	if features.any? 
-            feature = features.first
-            return casted_value(feature['value'],feature['value_type'])
-        else
-            nil
-        end
+      plan_features = self.plan_features
+      features = plan_features.select { |x| x['slug'].to_s == slug }
+      if features.any?
+        feature = features.first
+        return casted_value(feature['value'], feature['value_type'])
+      else
+        nil
+      end
     end
 
     def get_remaining_days
-            shop_domain = self[AppManager.configuration.shopify_domain_field]
-            trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
-            trial_activated_at_val = self[trial_activated_at_field]
-            plan_field = AppManager.configuration.field_names['plan_id']
-            plan_id = self[plan_field]
-            plan_obj = AppManager::Client.new
-            res = plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id)
-            return (res && !res.nil?) ? res : 0
+      begin
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
+        trial_activated_at_val = self[trial_activated_at_field]
+        plan_field = AppManager.configuration.field_names['plan_id']
+        plan_id = self[plan_field]
+        plan_obj = AppManager::Client.new
+        res = plan_obj.get_remaining_days(shop_domain, trial_activated_at_val, plan_id)
+        return (res && !res.nil?) ? res : 0
+      rescue Exception => e
+        Rollbar.error("APP MANAGER Get Remaining Days Failed #{e}")
+      end
     end
 
 
-    def get_plan(plan_id=nil)
-        req_plan_id = nil
-        if !plan_id.nil? 
-            req_plan_id = plan_id
+    def get_plan(plan_id = nil)
+      req_plan_id = nil
+      if !plan_id.nil?
+        req_plan_id = plan_id
+      else
+        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        if shop_plan_id && !shop_plan_id.nil?
+          req_plan_id = shop_plan_id
         else
-            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
-            if shop_plan_id && !shop_plan_id.nil?
-              req_plan_id = shop_plan_id
-            else
-              Rails.logger.info "Invalid params, must have charge_id,shop && plan"
-              return {}
-            end
+          Rollbar.error("Invalid params, must have charge_id,shop && plan")
+          return {}
         end
-        plan_obj = AppManager::Client.new if req_plan_id
-        return req_plan_id ? plan_obj.get_plan(req_plan_id) : {}
+      end
+      plan_obj = AppManager::Client.new if req_plan_id
+      return req_plan_id ? plan_obj.get_plan(req_plan_id) : {}
     end
 
     def get_charge
-        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
-        found_free_plan = false
-        if shop_plan_id && !shop_plan_id.nil?
-            plan_obj = AppManager::Client.new 
-            plan = plan_obj.get_plan(shop_plan_id) rescue nil
-            if plan && plan['price'] == 0 && plan['public'] == true
-                found_free_plan = true
-                return nil
-            end
+      shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+      found_free_plan = false
+      if shop_plan_id && !shop_plan_id.nil?
+        plan_obj = AppManager::Client.new
+        plan = plan_obj.get_plan(shop_plan_id) rescue nil
+        if plan && plan['price'] == 0 && plan['public'] == true
+          found_free_plan = true
+          return nil
         end
-        if !found_free_plan
-            begin
-                shop_domain = self[AppManager.configuration.shopify_domain_field]
-                plan_obj = AppManager::Client.new
-              return  plan_obj.get_charge(shop_domain) 
-            rescue Exception => e
-              Rails.logger.info "#{e.inspect}" 
-              return nil
-            end
+      end
+      if !found_free_plan
+        begin
+          shop_domain = self[AppManager.configuration.shopify_domain_field]
+          plan_obj = AppManager::Client.new
+          return plan_obj.get_charge(shop_domain)
+        rescue Exception => e
+          return nil
         end
+      end
     end
 
     def get_all_plans
-        begin
-            shop_domain = self[AppManager.configuration.shopify_domain_field]
-            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
-            active_plan_id = shop_plan_id && shop_plan_id.nil? ? nil : shop_plan_id
-            plan_obj = AppManager::Client.new
-            return plan_obj.get_plans(shop_domain,active_plan_id)
-        rescue Exception => e
-            Rails.logger.info "#{e.inspect}" 
-            return []
-        end
+      begin
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        active_plan_id = shop_plan_id && shop_plan_id.nil? ? nil : shop_plan_id
+        plan_obj = AppManager::Client.new
+        return plan_obj.get_plans(shop_domain, active_plan_id)
+      rescue Exception => e
+        return []
+      end
     end
 
     def cancel_charge
-        begin
-            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
-            shop_domain = self[AppManager.configuration.shopify_domain_field]
-            if shop_plan_id && shop_domain
-                plan_obj = AppManager::Client.new
-                plan_obj.cancel_charge(shop_domain,shop_plan_id)
-            end
-        rescue Exception => e
-            return "#{e.inspect}" 
-        end     
+      begin
+        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        if shop_plan_id && shop_domain
+          plan_obj = AppManager::Client.new
+          plan_obj.cancel_charge(shop_domain, shop_plan_id)
+        end
+      rescue Exception => e
+        return "#{e.inspect}"
+      end
     end
 
-    def set_default_plan(plan_id=nil)
-        begin
-            if plan_id.nil?
-                shop_domain = self[AppManager.configuration.shopify_domain_field]
-                plan_obj = AppManager::Client.new
-                plans = plan_obj.get_plans(shop_domain)
-                free_plans = plans.select{|x| x['price'] == 0 && x['public'] == true}
-                if free_plans.any?
-                    self.plan_id = free_plans.first["id"]
-                    self.save
-                else
-                    raise Error, "Free Plan is not available"
-                end
-            else
-                self.plan_id = plan_id
-                self.save
-            end
-        rescue Exception => e
-            return "#{e.inspect}" 
+    def set_default_plan(plan_id = nil)
+      begin
+        if plan_id.nil?
+          shop_domain = self[AppManager.configuration.shopify_domain_field]
+          plan_obj = AppManager::Client.new
+          plans = plan_obj.get_plans(shop_domain)
+          free_plans = plans.select { |x| x['price'] == 0 && x['public'] == true }
+          if free_plans.any?
+            self.plan_id = free_plans.first["id"]
+            self.save
+          else
+            raise Error, "Free Plan is not available"
+          end
+        else
+          self.plan_id = plan_id
+          self.save
         end
+      rescue Exception => e
+        return "#{e.inspect}"
+      end
     end
 
 
-
-
-    def get_plans_by_features(feature_slugs,params="false")
-        if feature_slugs.any?
-            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
-            plan_data = []
-            shop_domain = self[AppManager.configuration.shopify_domain_field]
-            plan_obj = AppManager::Client.new
-            plans = plan_obj.get_plans(shop_domain)
-            plans = plans.select{|x| x['interval'] == 'EVERY_30_DAYS'  && x['public'] == true}
-            plans.each do |plan|
-                next if (params && !params.nil? && params == "exclude_current_plan" && !shop_plan_id.nil? && plan["id"] == shop_plan_id)
-                if plan && (plan['features'] && plan['features'].any?) && (plan['features'].values && plan['features'].values.any?) && (plan['features'].values.collect{|c| c['slug']} && plan['features'].values.collect{|c| c['slug']}.any?)
-                 plan_feature_slugs = plan['features'].values.collect{|c| c['slug']}.sort
-                 if (feature_slugs & plan_feature_slugs).any? && ((feature_slugs & plan_feature_slugs).sort == feature_slugs.sort)
-                        plan_data.push(plan)      
-                 end
-                end
+    def get_plans_by_features(feature_slugs, params = "false")
+      if feature_slugs.any?
+        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        plan_data = []
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        plan_obj = AppManager::Client.new
+        plans = plan_obj.get_plans(shop_domain)
+        plans = plans.select { |x| x['interval'] == 'EVERY_30_DAYS' && x['public'] == true }
+        plans.each do |plan|
+          next if (params && !params.nil? && params == "exclude_current_plan" && !shop_plan_id.nil? && plan["id"] == shop_plan_id)
+          if plan && (plan['features'] && plan['features'].any?) && (plan['features'].values && plan['features'].values.any?) && (plan['features'].values.collect { |c| c['slug'] } && plan['features'].values.collect { |c| c['slug'] }.any?)
+            plan_feature_slugs = plan['features'].values.collect { |c| c['slug'] }.sort
+            if (feature_slugs & plan_feature_slugs).any? && ((feature_slugs & plan_feature_slugs).sort == feature_slugs.sort)
+              plan_data.push(plan)
             end
-            return plan_data
-        else
-            return []
+          end
         end
+        return plan_data
+      else
+        return []
+      end
     end
 
 
-
     def fetch_static_remaining_days
-        @remaining_cache_key = "app-manager-cache/#{self.shopify_domain}-remaining_days"
-        if fetch_cached_static_remaining_days(@remaining_cache_key).present?
-          return fetch_cached_static_remaining_days(@remaining_cache_key)
-        end
-        remaining_days = self.get_remaining_days
-        Rails.cache.write(@remaining_cache_key, remaining_days, expires_in: AppManager.configuration.expires_in)
-        return remaining_days
+      @remaining_cache_key = "app-manager-cache/#{self.shopify_domain}-remaining_days"
+      if fetch_cached_static_remaining_days(@remaining_cache_key).present?
+        return fetch_cached_static_remaining_days(@remaining_cache_key)
       end
+      remaining_days = self.get_remaining_days
+      Rails.cache.write(@remaining_cache_key, remaining_days, expires_in: AppManager.configuration.expires_in)
+      return remaining_days
+    end
 
-      def fetch_cached_static_remaining_days(cache_key)
-        if Rails.cache.read(cache_key).present?
-          return Rails.cache.read(cache_key) 
-        end
+    def fetch_cached_static_remaining_days(cache_key)
+      if Rails.cache.read(cache_key).present?
+        return Rails.cache.read(cache_key)
       end
-
+    end
 
 
     def fetch_static_get_charge
-        @get_charge_key = "app-manager-cache/#{self.shopify_domain}-get_charge"
-        if fetch_cached_static_get_charge(@get_charge_key).present?
-          return fetch_cached_static_get_charge(@get_charge_key)
-        end
-        charge = self.get_charge
-        Rails.cache.write(@get_charge_key, charge, expires_in: AppManager.configuration.expires_in)
-        return charge
+      @get_charge_key = "app-manager-cache/#{self.shopify_domain}-get_charge"
+      if fetch_cached_static_get_charge(@get_charge_key).present?
+        return fetch_cached_static_get_charge(@get_charge_key)
+      end
+      charge = self.get_charge
+      Rails.cache.write(@get_charge_key, charge, expires_in: AppManager.configuration.expires_in)
+      return charge
     end
 
     def fetch_cached_static_get_charge(cache_key)
-        if Rails.cache.read(cache_key).present?
-          return Rails.cache.read(cache_key) 
-        end
+      if Rails.cache.read(cache_key).present?
+        return Rails.cache.read(cache_key)
+      end
     end
 
 
     private
-    
-    def casted_value(value,value_type)
-        case value_type
-        when "integer"
+
+    def casted_value(value, value_type)
+      case value_type
+      when "integer"
         value.to_i
-        when "boolean"
-            case value
-            when true, 'true', 1, '1'
-            return true
-            when false, 'false', 0, '0'
-            return false
-            end
-        when "string"
+      when "boolean"
+        case value
+        when true, 'true', 1, '1'
+          return true
+        when false, 'false', 0, '0'
+          return false
+        end
+      when "string"
         value.to_s
-        else
+      else
         value
-        end    
+      end
     end
 
- 
-
-
 
   end
-end
+end

data/lib/app_manager/tasks/sync/local_app_manager.rake

@@ -4,9 +4,8 @@ namespace :sync do
 		begin
 			@fs = AppManager::FailSafe.new
 			@fs.sync_app_manager
-			puts "app manager sync successfully"
-		rescue Exception => e
-			Rails.logger.info "APP MANAGER SYNC TAKS FAILED #{e.inspect}"
+    rescue Exception => e
+			Rollbar.error("APP MANAGER SYNC TAKS FAILED #{e.inspect}")
 		end
 	end
 end

data/lib/app_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppManager
-  VERSION = "1.2.6"
+  VERSION = "1.3.1"
 end

data/lib/app_manager.rb

@@ -2,7 +2,7 @@
 
 require "httparty"
 require "rails"
-require 'sqlite3'
+# require 'sqlite3'
 require "app_manager/version"
 require "app_manager/engine"
 require "app_manager/client"
@@ -29,8 +29,8 @@ module AppManager
   def self.clear_cache
   	begin
   		Rails.cache.delete_matched('app-manager-cache/*')
-  	rescue Exception => e
-  		Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+    rescue Exception => e
+      Rollbar.error("APP MANAGER Error in Clear Cache #{e}")
   	end
   end
 

data/lib/generators/app_manager/install/install_generator.rb

@@ -2,42 +2,51 @@ require "rails/generators/base"
 require "rails/generators/active_record"
 
 module AppManager
-    module Generators
-        class InstallGenerator < Rails::Generators::Base
-            include Rails::Generators::Migration
-            source_root File.expand_path('../templates', __FILE__)
-
-            def mount_engine
-             route("mount AppManager::Engine, at: '/'")
-            end
-
-			# def create_initializer_file
-			#  copy_file("plan_features.rb", "config/initializers/plan_features.rb")
-			# end
-
-			def create_app_manager_initializer
-		      template("app_manager.rb", "config/initializers/app_manager.rb")
-            end
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      source_root File.expand_path('../templates', __FILE__)
+
+      def mount_engine
+        route("mount AppManager::Engine, at: '/'")
+      end
+
+      def create_app_manager_initializer
+        template("app_manager.rb", "config/initializers/app_manager.rb")
+      end
+
+      def create_plan_trial_grandfathered_to_shops_migration
+        if self.class.migration_exists?("db/migrate", "add_plan_trial_grandfathered_to_shops")
+          say_status("skipped", "Migration add_plan_trial_grandfathered_to_shops.rb already exists")
+        else
+          migration_template("add_plan_trial_grandfathered_to_shops.erb", "db/migrate/add_plan_trial_grandfathered_to_shops.rb")
+        end
+      end
 
-            def create_plan_trial_grandfathered_to_shops_migration
-              migration_template("add_plan_trial_grandfathered_to_shops.erb", "db/migrate/add_plan_trial_grandfathered_to_shops.rb")
-            end
+      def create_fail_safe
+        if self.class.migration_exists?("db/app_manager", "failsafe_tables")
+          say_status("skipped", "Migration add_fail_safe.rb already exists")
+        else
+          migration_template("failsafe_tables.erb", "db/app_manager/add_fail_safe.rb")
+        end
+      end
 
-            private
 
-            def rails_migration_version
-            Rails.version.match(/\d\.\d/)[0]
-            end
+      private
 
-            class << self
-                private :next_migration_number
+      def rails_migration_version
+        Rails.version.match(/\d\.\d/)[0]
+      end
 
-            # for generating a timestamp when using `create_migration`
-                def next_migration_number(dir)
-                ActiveRecord::Generators::Base.next_migration_number(dir)
-                end
-            end
+      class << self
+        private :next_migration_number
 
+        # for generating a timestamp when using `create_migration`
+        def next_migration_number(dir)
+          ActiveRecord::Generators::Base.next_migration_number(dir)
         end
+      end
+
     end
-end
+  end
+end