app_manager 1.2.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd770dce16b7f6239b4d98067abafbf7701a3dd5b02cd4094b2f264c2ce9d8dd
-  data.tar.gz: 466aa7a4aba2811f53b582b0d2fa6dd7b94b2eb0430ef146729214414175ad8c
+  metadata.gz: 9c547a5aa3260006c06faf84cd242801459dc0d6557139d94797558b2e960cf3
+  data.tar.gz: bb52538ee806521616ca899b526db05d5dfa606921c0a49874584af7d5960ed2
 SHA512:
-  metadata.gz: 6d6e415883e4a5e08155776f041da234c099ec0a9c17814be2013d7efafa91263d117046c35b2dd95c4a0809230a637878cb1d9e1f785b385e9f9588269547db
-  data.tar.gz: 0d3e02114538f9178a88cfc1e2f30409227852088755121c47dd1648d20bd1919e78228f197c41199ae02f2251fef66953ae6ee560b46389ded1bd555f48088a
+  metadata.gz: 0cf9d50efcfd4a72bc88a842d1ba7508a56cfe0a4eb29c3226ed526cda19a095125382292093fd2f296ea71c8cdca562039af5dda5b2ba2df34fe4ca05070f8c
+  data.tar.gz: 6b4db1ea27b42898de5549a5fa528a3df9c759071e228d9a373075766b91086658d632b8427e5d9761382d16c3f46cb2685b5dcb8f33898f4590e3f7dd50f3f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.2.1)
+    app_manager (1.2.4)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)

data/app/controllers/app_manager/charges_controller.rb

@@ -18,11 +18,12 @@ module AppManager
             		if plan_data['price'] == 0
             			active_charge_data = plan_obj.get_charge(params[:shop])
             			begin
-            				if active_charge_data && active_charge_data.any? && !active_charge_data['active_charge']['charge_id'].nil?
+            				if active_charge_data && active_charge_data.any? && !active_charge_data['active_charge'].nil? && !active_charge_data['active_charge']['charge_id'].nil?
 	        					gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain,@shop.shopify_token)
 	        					rec_cancel_data = gq_obj.recurring_charge_cancel_api_call(active_charge_data['active_charge']['charge_id'],@shop)
-								if !rec_cancel_data["errors"].present? && (rec_cancel_data["data"].present? && rec_cancel_data["data"]["appSubscriptionCancel"].present? && !rec_cancel_data["data"]["appSubscriptionCreate"]["userErrors"].any? && (rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["status"] == 'CANCELLED'))
-									plan_obj.cancel_charge(params[:shop],active_charge_data['active_charge']['plan_id'])
+								if !rec_cancel_data["errors"].present? && (rec_cancel_data["data"].present? && rec_cancel_data["data"]["appSubscriptionCancel"].present? && !rec_cancel_data["data"]["appSubscriptionCancel"]["userErrors"].any? && (rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["status"] == 'CANCELLED'))
+									cancelled_charge_id = rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["id"].split('/')[-1]
+									plan_obj.cancel_charge(params[:shop],cancelled_charge_id)
 								end
         					end
             			rescue Exception => e

data/app/controllers/app_manager/plans_controller.rb

@@ -172,6 +172,7 @@ module AppManager
 	    end
 
 
+
         private
 
         def params_permit

data/lib/app_manager/config.rb

@@ -35,7 +35,7 @@ module AppManager
         'email' => 'email'
     }
       @fs = AppManager::FailSafe.new
-      AppManager.clear_cache
+      # AppManager.clear_cache
     end
 
     def expires_in

data/lib/app_manager/fail_safe.rb

@@ -10,7 +10,7 @@ module AppManager
 		def initialize(db_name='app_manager_local')
 			@apm_db = SQLite3::Database.open "db/#{db_name}.db"
 			begin
-				FileUtils.chmod 0777, "db/#{db_name}.db"
+				FileUtils.chmod 0664, "db/#{db_name}.db"
 			rescue Exception => e
 				puts ">>>>>> #{e.inspect}"
 			end			
@@ -29,36 +29,90 @@ module AppManager
 					save_api_plans(params["plans"])
 				rescue Exception => e
 					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					begin
+						create_plan_table
+						save_api_plans(params["plans"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end
 				end
+
+				
 				begin
 					save_api_charges(params["charges"])
 				rescue Exception => e
-					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+					begin
+						create_charges_table
+						save_api_charges(params["charges"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end	
 				end
+
+
 				begin
 					save_api_apps(params["apps"])
 				rescue Exception => e
-					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+					begin
+						create_apps_table
+						save_api_apps(params["apps"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end	
 				end
+
+
 				begin
 					save_api_app_structures(params["app_structures"])
 				rescue Exception => e
-					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+					begin
+						create_app_structures_table
+						save_api_app_structures(params["app_structures"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end	
 				end
+
+
 				begin
 					save_api_discount_plans(params["discount_plans"])
 				rescue Exception => e
 					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					begin
+						create_discount_plans_table
+						save_api_discount_plans(params["discount_plans"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end
 				end
+
+
 				begin
 					save_api_extend_trials(params["extend_trials"])
 				rescue Exception => e
-					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+					begin
+						create_extend_trials_table
+						save_api_extend_trials(params["extend_trials"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end	
 				end
+
+
 				begin
 					save_api_plan_users(params["plan_users"])
 				rescue Exception => e
-					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+					begin
+						create_plan_users_table
+						save_api_plan_users(params["plan_users"])
+					rescue Exception => e
+						Rails.logger.info "APP MANAGER FailSafe >>>> #{e.inspect}"
+					end	
 				end
 		end
 

data/lib/app_manager/model.rb

@@ -2,7 +2,8 @@ module AppManager
   module Model
     extend ActiveSupport::Concern
 
-    
+     @@remaining_cache_key = "get_remaining_days_key"
+     @@get_charge_key = "get_charge_key"
 
     def has_plan
         if !self[AppManager.configuration.plan_id_or_name_field]
@@ -16,14 +17,15 @@ module AppManager
             Rails.logger.info "Plan id found nil or not set"
             return false;
         end
-        remaining_days = self.get_remaining_days
+        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
-        return active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
+        # 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
 
 
@@ -195,6 +197,41 @@ module AppManager
 
 
 
+    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
+      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
+    end
+
+    def fetch_cached_static_get_charge(cache_key)
+        if Rails.cache.read(cache_key).present?
+          return Rails.cache.read(cache_key) 
+        end
+    end
+
+
     private
     
     def casted_value(value,value_type)

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.4
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty