app_manager 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e3986aadebfd51cccf040bfd0a5ad36041de436ac3ab4c074fb0a2174a9da10
-  data.tar.gz: 83e772b1847481e9e91745f91569973d16e1809eb7732affe4f6f46ab3385c89
+  metadata.gz: 332f708479d365509b91a40229d7be81e2d4ff29bc14ec4d24f59cad3dd007d8
+  data.tar.gz: addf31453c0847a80a734994ec65d8eaa8eb9a8bf18067359e3e97c5cbd06ac6
 SHA512:
-  metadata.gz: 8793bb25fdfbff2ed36e2c0f4f24f63d6c40c1bc6df999ef101cfa6f6b66d2732729743f1ab2298d66debfbd6785ea47bddcdacf7fa3d21efcebdd17bcda5b3b
-  data.tar.gz: 1b040a0afaedeb15cf4892f9010105e4f1ea1e6f7a92b75c5d65dc5e1c3a5870fd3eb4a01f825738a5c8fbc722a8f3dd63fe3be8eb217bf19ac4859bc1d716bd
+  metadata.gz: cafc22adef5875aea99cc8f8acebc7ee79e187359bf7aa6408d1692390a79af37e721efe3e7fd7a3a23e898b092988eca098a0ce6d3f737cfae30ceb19422243
+  data.tar.gz: d74683f76df315f6a9b03f3f357d09ef63d50f0efd18b64e7fd83a160603cc26078ab82fc1d2c0041772de37f656714f554ac83656514cbd59a2c25220e2efc8

data/Gemfile.lock

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

data/app/controllers/app_manager/plans_controller.rb

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

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.2"
+  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.2
+  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