app_manager 1.2.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef86306a34e83be7d439ecda3ca318a33146373c0a5f8cd910d5da1cf06d587
-  data.tar.gz: 1239cc87364f045b966f9f2ccc24ca770c7fdd07dda704b25d7b37bf2a49dc05
+  metadata.gz: 332f708479d365509b91a40229d7be81e2d4ff29bc14ec4d24f59cad3dd007d8
+  data.tar.gz: addf31453c0847a80a734994ec65d8eaa8eb9a8bf18067359e3e97c5cbd06ac6
 SHA512:
-  metadata.gz: db78e088159f14d5bad35456c2a3b41e87e5e813bcd92a12c32562d8882ba698e6eae97f6a7807e8b94ccf6673234f6cd58ef3c8846c40e6df3a97dbe6e8f266
-  data.tar.gz: d9d6dcb07015cde6b085473762cdffa39f12bf03ed7d2af0c9c79fe6849b29338b839f0f31712fd362fa7b037318bf9fa72754e0847ca09fe3a5f86a4f974a75
+  metadata.gz: cafc22adef5875aea99cc8f8acebc7ee79e187359bf7aa6408d1692390a79af37e721efe3e7fd7a3a23e898b092988eca098a0ce6d3f737cfae30ceb19422243
+  data.tar.gz: d74683f76df315f6a9b03f3f357d09ef63d50f0efd18b64e7fd83a160603cc26078ab82fc1d2c0041772de37f656714f554ac83656514cbd59a2c25220e2efc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.2.0)
+    app_manager (1.2.3)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -119,7 +119,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.1)
+    minitest (5.16.2)
     multi_xml (0.6.0)
     net-imap (0.2.3)
       digest

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
@@ -34,7 +35,8 @@ module AppManager
             					AppManager::EventHandler.new('charge_created',{
 								"plan" => plan_data,
 								"charge" => nil,
-								"previous_charge" => nil 	
+								"previous_charge" => nil,
+								"shopify_domain" => params[:shop]  	
 								})
             				rescue Exception => e
             					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
@@ -82,11 +84,11 @@ module AppManager
 					plan_data = plan_obj.get_plan(params[:plan],params[:shop])
 
     				charge = charges.parsed_response['recurring_application_charge']
-					charge['charge_id']  = charge['id'];
-					charge['type'] = 'recurring';
-					charge['plan_id'] = params[:plan];
-					charge['shop_domain'] = params[:shop];
-					charge['interval'] = plan_data['interval']['value'];
+					charge['charge_id']  = charge['id']
+					charge['type'] = 'recurring'
+					charge['plan_id'] = params[:plan]
+					charge['shop_domain'] = params[:shop]
+					charge['interval'] = plan_data['interval']['value']
 
 						if !@plan_field.nil?
 							begin
@@ -107,7 +109,8 @@ module AppManager
 								AppManager::EventHandler.new('charge_created',{
 								"plan" => plan_data,
 								"charge" => charge,
-								"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil 	
+								"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
+								"shopify_domain" => params[:shop]  	
 								})
 							rescue Exception => e
 								Rails.logger.info "APP MANAGER >>>> #{e.inspect}"

data/app/controllers/app_manager/plans_controller.rb

@@ -13,6 +13,7 @@ module AppManager
 	
 	    def plans
 	    	active_plan_id_or_name = shopify_plan = plan = nil
+	    	active_charge = nil
 			default_plan_id = nil
 			choose_later = false
 			plan_obj = AppManager::Client.new
@@ -30,7 +31,7 @@ module AppManager
 				    @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 
+					if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at 
 					choose_later = true
 					end
 
@@ -64,7 +65,8 @@ module AppManager
 				'shopify_plan' => shopify_plan,
 				'plan' => plan,
 				'default_plan_id' => default_plan_id,
-                'choose_later' => choose_later
+                'choose_later' => choose_later,
+                'has_active_charge' => (!active_charge['active_charge'].nil? ? true : false) 
 			}
 			render json: response
 	    end
@@ -127,12 +129,13 @@ module AppManager
 								"plan" => plan_data,
 								"charge" => nil,
 								"previous_charge" => nil,
-								"choose_later" => true 	
+								"choose_later" => true,
+								"shopify_domain" => params[:shop_domain] 	
 								})
             				rescue Exception => e
             					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
             				end
-				render json: {'status' => true}
+				    render json: {'status' => true}
 				else
 					render json: {'status' => false,'error' => "#{@shop.errors.full_messages.to_sentence}"}, status: 422
 				end
@@ -169,6 +172,7 @@ module AppManager
 	    end
 
 
+
         private
 
         def params_permit

data/lib/app_manager/fail_safe.rb

@@ -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,40 @@ 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.0"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.3
 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