app_manager 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b537020a68cfa232a0ad374777b2a3a9317d5aa599da985ac07334814567d321
-  data.tar.gz: e89d2d9140a3196468d77b5bed6e014e3cabde20478c5206c29fc47e3322b9e9
+  metadata.gz: 92d071e3e478e20f2fb063d5a821be4d772edb68de15c862c50f0a01c69727d8
+  data.tar.gz: 1e171148960d955ca01c76a7bf715630508e2766e4a46790a85e86ffba4ea7a1
 SHA512:
-  metadata.gz: 95d3718467208b590e9889a5b774da042a257b7e8f8d05f15b2317637b490b6399bdbe8467fad02226b651d9c7119e805f0e031658202f2f439c9a8dff836111
-  data.tar.gz: aaeee10fb9e7e7edeb4c743ce2bb3df1b5c332f42386a6d87b866d9e33da2a06ba74e45cb7888da1ea97ca581a48291ae373c49ea1e93cbf7c9e6322337c2ada
+  metadata.gz: 205c194f35ab5df4a9fab9fe374a1e83c89ff5ca2ceaa8327ae6ca92589343522ba8c35bdac61d63c92932d9dd7b5769410d4975c8b7fc191e9fcbcf6df4ba61
+  data.tar.gz: b8f6a607d5f1a71e5d0b2537909a87a771718b5f31bbe2d39d3ae291521e40eac5b807c2749806f6c20f1bc19453c6e04ebf52533e69c490441f6d9b33ca8b3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.1.0)
+    app_manager (1.1.1)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -10,67 +10,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actioncable (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activestorage (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionmailbox (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      actionview (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionmailer (7.0.3)
+      actionpack (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activesupport (= 7.0.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activestorage (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actiontext (7.0.3)
+      actionpack (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.3.6)
-    activemodel (7.0.2.3)
-      activesupport (= 7.0.2.3)
-    activerecord (7.0.2.3)
-      activemodel (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
-    activestorage (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activestorage (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activesupport (= 7.0.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -95,7 +95,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-wait (0.2.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -108,7 +107,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.15.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -120,7 +119,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.0)
     multi_xml (0.6.0)
     net-imap (0.2.3)
       digest
@@ -130,47 +129,48 @@ GEM
       digest
       net-protocol
       timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.6-x86_64-linux)
+      racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (7.0.2.3)
-      actioncable (= 7.0.2.3)
-      actionmailbox (= 7.0.2.3)
-      actionmailer (= 7.0.2.3)
-      actionpack (= 7.0.2.3)
-      actiontext (= 7.0.2.3)
-      actionview (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activemodel (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activestorage (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    rails (7.0.3)
+      actioncable (= 7.0.3)
+      actionmailbox (= 7.0.3)
+      actionmailer (= 7.0.3)
+      actionpack (= 7.0.3)
+      actiontext (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activemodel (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.2.3)
+      railties (= 7.0.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -193,9 +193,9 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     sqlite3 (1.3.13)
-    strscan (3.0.1)
+    strscan (3.0.3)
     thor (1.2.1)
-    timeout (0.2.0)
+    timeout (0.3.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     webmock (3.14.0)
@@ -205,7 +205,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -28,6 +28,10 @@ gem 'app_manager'
 
  this install command will mount routes in your rails route and will create a config file at ```config/initializers/app_manager.rb```
 
+```
+    rails db:migrate
+```
+
 
 <a name="step2"></a>
 ### Configuration
@@ -35,18 +39,7 @@ gem 'app_manager'
 * Set Shopify API version to 2022-04 as app_manager is best compatible with this version.
 
 
-* Please check the 'shops' table that must have 'plan_id' as int/bigint and 'trial_activated_at' as datetime otherwise add its migration like following example: 
-
-```
-class AddPlanIdToShops < ActiveRecord::Migration[5.2]
-  def change
-    	add_column :shops, :plan_id, :bigint
-    	add_column :shops, :trial_activated_at, :datetime
-  end
-end
-```
-
-and map these new fields in 'config.field_names' in below initializer file which is generated by install command. Please note: this is important step.
+* Please map new fields (which added by app manager migration) in 'config.field_names' in below initializer file which is generated by install command. Please note: this is important step.
 
 
 * Please update blank fields in initializer file. Please copy 'uuid' from this [file](https://docs.google.com/spreadsheets/d/1cw2nSKxAHTGn4Cfa98RNdtfHT3zdtwu9bQD7s7hErXc/edit#gid=0) and paste in the following file and make sure that is unique per feature. After copying put your 'app name' next to 'uuid' column in this [file](https://docs.google.com/spreadsheets/d/1cw2nSKxAHTGn4Cfa98RNdtfHT3zdtwu9bQD7s7hErXc/edit#gid=0).
@@ -66,10 +59,11 @@ AppManager.configure do |config|
         'name' => 'shopify_domain', # demo-rahul-tiwari.myshopify.com
         'shopify_email' => 'email', # rahul.t@hulkapps.com
         'shopify_token' => 'shopify_token',
-        'shopify_plan' => 'plan_name', # partner_test
+        'shopify_plan' => 'shopify_plan', # partner_test
         'plan_id' => 'plan_id', # 1. t
         'created_at' => 'created_at', # 2022-04-15 10:43:05
-        'trial_activated_at' => 'trial_activated_at' # field name that stores trial start/activated date
+        'trial_activated_at' => 'trial_activated_at', # field name that stores trial start/activated date
+        'grandfathered' => 'grandfathered' 
     }
   config.plan_features =  [
     {
@@ -79,7 +73,10 @@ AppManager.configure do |config|
 	  	"description" => "Feature Description",
 	  	"value_type" => "integer",
 	  	"format" => "count",
-	  	"display_order" => 1
+	  	"display_order" => 1,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	},
 	{
 		"uuid" => "9f18f95a-bfaf-11ec-9d64-0242ac120002",
@@ -88,7 +85,10 @@ AppManager.configure do |config|
 		"description" => "Feature Description",
 		"value_type" => "boolean",
 		"format" => "percentage",
-	  	"display_order" => 2
+	  	"display_order" => 2,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	},
 	{
 		"uuid" => "9f190a26-bfaf-11ec-9d64-0242ac120002",
@@ -97,7 +97,10 @@ AppManager.configure do |config|
 		"description" => "Feature Description",
 		"value_type" => "string",
 	  	"format" => "string",
-	  	"display_order" => 3
+	  	"display_order" => 3,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	},
 	{
 		"uuid" => "9f191340-bfaf-11ec-9d64-0242ac12000",
@@ -110,10 +113,15 @@ AppManager.configure do |config|
 			"val 2"
 		],
 	  	"format" => "string",
-	  	"display_order" => 4
+	  	"display_order" => 4,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	}
-]  #Required, Values type : integer, boolean, string, array
+]  
 end
+#Required, Values type : integer, boolean, string, array #
+#Format: percentage, count, string
 ```
 
 
@@ -159,6 +167,10 @@ and then you can use follwing methods with your shop objects.
 @shop.get_feature('feature-3') #  provide slug of feature and this returns value of feature which is set in portal. 
 
 @shop.get_remaining_days # return integer based on trial activated date.
+
+@shop.get_plan # return integer based on trial activated date.
+
+@shop.get_charge # return integer based on trial activated date.
 ```
 
 

data/app/controllers/app_manager/application_controller.rb

@@ -1,12 +1,7 @@
 module AppManager
   class ApplicationController < ActionController::Base
   	include AppManager::Actions
-  	cache_response_of_app_manager
     protect_from_forgery with: :exception
     include AppManager::Authenticate
-	# rescue_from StandardError do |exception|
-	# render json: { :error => exception.message }, :status => 500
-	# end
-
   end
 end

data/app/controllers/app_manager/banners_controller.rb

@@ -2,6 +2,7 @@ require_dependency "app_manager/application_controller"
 
 module AppManager
 	  class BannersController < ApplicationController
+	  	cache_response_for :marketing_banner
 	    def marketing_banner
 	    		begin
 					banner_obj = AppManager::Client.new

data/app/controllers/app_manager/charges_controller.rb

@@ -1,5 +1,4 @@
 require_dependency "app_manager/application_controller"
-
 module AppManager
 	  class ChargesController < ApplicationController
 	  	include HTTParty
@@ -23,16 +22,16 @@ module AppManager
 						redirect_charge = data["data"]["appSubscriptionCreate"]["confirmationUrl"]
 						render json: {'redirect_url' => redirect_charge}
 					else
-						render json: {'error' => data["errors"].as_json}
+						raise Error, "#{data["errors"].as_json}"
 					end
 	    		 else
-	    		 	render json: {'error' => data["errors"]}
+	    		 	raise Error, "#{data["errors"]}"
 	    		 end
 	    		else
-	    			render json: {'error' => 'Shop not found'}
+	    			raise ModelNotFound, "Shop not found"
 	    		end
 	        else
-	        	render json: {'error' => 'Missing Shop domain or plan id in params'}
+	        	raise Error, "Missing Shop domain or plan id in params"
 	    	end
 	    end
 
@@ -65,22 +64,29 @@ module AppManager
 								
 							end
 						end
+
 						charge_ob = AppManager::Client.new(nil,json_req=true)
 						response = charge_ob.store_charge(charge.to_json)
 
 						if response['message'] == "success"
-						model.update(@plan_field => params[:plan])
+							AppManager.clear_cache
+							model.update(@plan_field => params[:plan])
+							charge_data = plan_obj.get_charge(@shop[shopify_domain]) 
+							AppManager::EventHandler.new('charge_created',{
+								"plan" => plan_data,
+								"charge" => charge,
+								"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil 	
+								})
 						end     					
-						redirect_to "/?shop=#{params[:shop]}"
+						redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
 	    			else
-
-	    				render json: {'error' => 'Invalid shopify charge'}
+	    				raise Error, "Invalid shopify charge #{charges.insect}"
 	    			end
 	    		else
-					render json: {'error' => 'Shop not found'}
+					raise ModelNotFound, "Shop not found"
 	    		end
 			else
-				render json: {'error' => 'Invalid params'}
+				raise Error, "Invalid params, must have charge_id,shop && plan"
 			end
 	    end
 

data/app/controllers/app_manager/plans_controller.rb

@@ -2,6 +2,9 @@ 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 || []}
@@ -12,8 +15,9 @@ module AppManager
 	    	active_plan_id_or_name = shopify_plan = plan = nil
 			default_plan_id = nil
 			plan_obj = AppManager::Client.new
-			plans = plan_obj.get_plans
+			plans = []
 			if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
+				plans = plan_obj.get_plans(params[:shop_domain])
 				@shop = shop_data
 				if !@shop.nil?
 					active_plan_id_or_name = @shop[@plan_field] 
@@ -53,7 +57,7 @@ module AppManager
 			end
 
 			response = {
-				'plans' => plan_obj.get_plans,
+				'plans' => plans,
 				'shopify_plan' => shopify_plan,
 				'plan' => plan,
 				'default_plan_id' => default_plan_id

data/app/services/app_manager/event_handler.rb

@@ -0,0 +1,10 @@
+module AppManager
+
+	class EventHandler
+	  def initialize(event,payload)
+       ActiveSupport::Notifications.instrument(event, payload)
+	  end
+	end
+
+end
+

data/lib/app_manager/actions.rb

@@ -2,8 +2,10 @@ module AppManager
   module Actions
     extend ActiveSupport::Concern
     module ClassMethods
-      def cache_response_of_app_manager
-        around_action  ApiCacheHandler.new
+      def cache_response_for(*actions)
+        options = actions.extract_options!
+        filter_options = options.extract!(:if, :unless).merge(only: actions)
+        around_action  ApiCacheHandler.new(options), filter_options
       end
     end
   end

data/lib/app_manager/api_cache_handler.rb

@@ -1,8 +1,9 @@
 module AppManager
   module Actions
     class ApiCacheHandler
-      def initialize
-        
+      def initialize(options)
+        @options       = options
+        @expires_in    = @options[:expires_in]
       end
 
 
@@ -20,7 +21,7 @@ module AppManager
       protected
 
       def should_response_cache?
-       return @request.get? && @response_cache.cached_response.present?
+       return @request.get? && AppManager.configuration.enable_caching && @response_cache.cached_response.present?
       end
 
       def log_info
@@ -37,29 +38,33 @@ module AppManager
 
       def cache_path
         @cache_path = "app-manager-cache"
-
-        path_only   = @request.fullpath.split('?').first
-        @cache_path = "#{@cache_path}#{path_only}"
+        if @options[:cache_path].present?
+          @cache_path = "#{@cache_path}#{@options[:cache_path]}"
+        elsif AppManager.configuration.refresh_by_request_params?
+          @cache_path = "#{@cache_path}#{@request.fullpath}"
+        else
+          path_only   = @request.fullpath.split('?').first
+          @cache_path = "#{@cache_path}#{path_only}"
+        end
 
         if AppManager.configuration.cache_by_headers.present?
           headers = AppManager.configuration.cache_by_headers.map do |header|
             @request.headers[header].to_s
           end
           headers_cache_path = headers.join('-')
-          @cache_path = "#{@cache_path}/#{headers_cache_path}"
+          @cache_path = "#{@cache_path}#{headers_cache_path}"
         end
-
-        @cache_path
+        return @cache_path
       end
 
       def render_cached_response
         body    = @response_cache.body
         status  = @response_cache.status
         headers = @response_cache.headers
-        # headers.try(:each) do |key, value|
-        #   @controller.response.headers[key] = value
-        # end
-        @controller.render json: body, status: status 
+        headers.try(:each) do |key, value|
+          @controller.response.headers[key] = value
+        end
+        @controller.render plain: body, status: status 
       end
     end
   end

data/lib/app_manager/client/connection.rb

@@ -23,19 +23,24 @@ module AppManager
       private
 
       def request(http_method, path, options)
-        response = self.class.send(http_method, path, { body: options })
-        if path.include? "/get-status"
-          data = response
-        elsif path.include? "/sync-charge" 
-          data = response.parsed_response
-          data = parse_data(response.parsed_response)
-        else
-          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)
+        begin
+          response = self.class.send(http_method, path, { body: options, timeout: 10 })
+          if path.include? "/get-status"
+            data = response
+          elsif path.include? "/sync-charge" 
+            data = response.parsed_response
+            data = parse_data(response.parsed_response)
           else
-          data = response_from_failsafe(path,options) 
+            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) 
+            else
+              data = response_from_failsafe(path,options) 
+            end
           end
+        rescue Exception => e
+           data = response_from_failsafe(path,options) 
         end
       end
 
@@ -57,7 +62,7 @@ module AppManager
         when "static-contents"
           return @fs.get_local_app_structures
         when 'plans'
-          return @fs.get_local_plans
+          return @fs.get_local_plans(params)
         when 'plan'
           return @fs.get_local_plan(params)
         when 'store-charge'

data/lib/app_manager/client/plans.rb

@@ -2,8 +2,8 @@ module AppManager
 	class Client
 			module Plans
 
-			  def get_plans(options = {})
-				  get("/plans", options)
+			  def get_plans(shop_domain)
+				  get("/plans?shop_domain=#{shop_domain}")
 			  end
 
 			  def get_plan(plan_id,shop_domain=nil)

data/lib/app_manager/config.rb

@@ -12,10 +12,10 @@ module AppManager
     attr_accessor :shopify_domain_field
     attr_accessor :plan_id_or_name_field
     attr_accessor :field_names
-
-
+    attr_accessor :refresh_by_request_params
 
     def initialize
+      @refresh_by_request_params = true
       @expires_in = 1.day
       @enable_caching = true
       @app_url = nil
@@ -35,6 +35,7 @@ module AppManager
         'email' => 'email'
     }
       @fs = AppManager::FailSafe.new
+      AppManager.clear_cache
     end
 
     def expires_in
@@ -77,6 +78,9 @@ module AppManager
       @field_names
     end
 
+    def refresh_by_request_params?
+      @refresh_by_request_params
+    end
 
   end
 end

data/lib/app_manager/exceptions.rb

@@ -0,0 +1,4 @@
+module AppManager
+   class Error < StandardError; end
+   class ModelNotFound < Error; end
+end

data/lib/app_manager/fail_safe.rb

@@ -11,53 +11,46 @@ module AppManager
 		end
 
 		def save_api_data(params)	
-			Thread.new do			
 				begin
 					save_api_plans(params["plans"])
 				rescue Exception => e
 					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 				end
-			end
-			Thread.new do
 				begin
 					save_api_charges(params["charges"])
 				rescue Exception => e
 					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 				end
-			end
-			Thread.new do
 				begin
 					save_api_apps(params["apps"])
 				rescue Exception => e
 					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 				end
-			end
-			Thread.new do
 				begin
 					save_api_app_structures(params["app_structures"])
 				rescue Exception => e
 					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 				end
-			end
-			Thread.new do
 				begin
 					save_api_discount_plans(params["discount_plans"])
 				rescue Exception => e
 					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 				end
-			end
-			Thread.new do
 				begin
 					save_api_extend_trials(params["extend_trials"])
 				rescue Exception => e
 					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 				end
-		    end
+				begin
+					save_api_plan_users(params["plan_users"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 		end
 
 		def save_api_plans(plans)
 		   	@apm_db.execute("DROP TABLE IF EXISTS plans;")
-				@apm_db.execute "CREATE TABLE IF NOT EXISTS plans(id integer,type varchar(255),  name varchar(255),  price float,  offer_text varchar(255),  interval text,  shopify_plans text,  trial_days integer,  test boolean,  on_install integer,  is_custom boolean,  app_id integer,  base_plan integer,  created_at datetime,  updated_at datetime,  public boolean,  discount integer,  cycle_count integer,  store_base_plan boolean,  discount_type varchar(255),  affiliate text,  features text)"
+				@apm_db.execute "CREATE TABLE IF NOT EXISTS plans(id integer,type varchar(255),  name varchar(255),  price float,  offer_text varchar(255),  interval text,  shopify_plans text,  trial_days integer,  test boolean,  on_install integer,  is_custom boolean,  app_id integer,  base_plan integer,  created_at datetime,  updated_at datetime,  public boolean,  discount integer,  cycle_count integer,  store_base_plan boolean,  discount_type varchar(255),  affiliate text,  features text, deleted_at datetime)"
 		
 		   if plans.any?
 				plans.each do |plan|
@@ -73,7 +66,7 @@ module AppManager
 					is_custom = plan['is_custom'] ? 1 : 0
 					public_val = plan['public'] ? 1 : 0
 					store_base_plan = plan['store_base_plan'] ? 1 : 0
-					@apm_db.execute("INSERT INTO plans (  id ,  type ,  name ,  price ,  offer_text ,  interval ,  shopify_plans ,  trial_days ,  test ,  on_install ,  is_custom ,  app_id ,  base_plan ,  created_at,  updated_at ,  public ,  discount ,  cycle_count ,  store_base_plan ,  discount_type,  affiliate,  features ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",plan["id"], plan["type"], plan["name"], plan["price"], plan["offer_text"], "#{interval}", "#{shopify_plans}", plan["trial_days"], plan_test, plan["on_install"], is_custom, plan["app_id"], plan["base_plan"], plan["created_at"], plan["updated_at"],public_val, plan["discount"], plan["cycle_count"], store_base_plan, plan["discount_type"], "#{affiliate}", "#{features}")
+					@apm_db.execute("INSERT INTO plans (  id ,  type ,  name ,  price ,  offer_text ,  interval ,  shopify_plans ,  trial_days ,  test ,  on_install ,  is_custom ,  app_id ,  base_plan ,  created_at,  updated_at ,  public ,  discount ,  cycle_count ,  store_base_plan ,  discount_type,  affiliate,  features, deleted_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",plan["id"], plan["type"], plan["name"], plan["price"], plan["offer_text"], "#{interval}", "#{shopify_plans}", plan["trial_days"], plan_test, plan["on_install"], is_custom, plan["app_id"], plan["base_plan"], plan["created_at"], plan["updated_at"],public_val, plan["discount"], plan["cycle_count"], store_base_plan, plan["discount_type"], "#{affiliate}", "#{features}",plan["deleted_at"])
 				end
 		    end
 		end
@@ -129,6 +122,16 @@ module AppManager
 			end
 		end
 
+		def save_api_plan_users(plan_users)
+			@apm_db.execute("DROP TABLE IF EXISTS plan_users;")
+            @apm_db.execute "CREATE TABLE IF NOT EXISTS plan_users(id integer,shop_domain varchar(255),plan_id integer,created_by integer,created_at datetime,updated_at datetime)"
+            if plan_users.any?
+				plan_users.each do |plan_user|
+				@apm_db.execute("INSERT INTO plan_users (id ,shop_domain, plan_id, created_by, created_at, updated_at ) VALUES (?,?,?,?,?,?)", plan_user['id'], plan_user['shop_domain'], plan_user['plan_id'], plan_user['created_by'], plan_user['created_at'], plan_user['updated_at'])
+				end
+			end
+		end
+
 
 		def get_local_app_structures
 			app_structures = {}
@@ -146,38 +149,89 @@ module AppManager
 		end
 
 
-		def get_local_plans
-		    plans = []
-		    @apm_db.execute( "SELECT * FROM plans;") do |plan|
-				new_plan = {}
-				plan.each_with_index do |(key, value), index|
-					if ['interval'].include?(key)
-						val = eval(value) 
-						new_plan[key] = val
-						new_plan[key] = val['value'] if val rescue {}
-					elsif ['shopify_plans'].include?(key)
-						val = eval(value) 
-						new_plan[key] = val.collect{|e|e['value']}
-					elsif ['affiliate'].include?(key)
-						new_plan[key] = eval(value)
-					elsif ['is_custom','public','store_base_plan'].include?(key)
-						new_plan[key] = (value == 0 ? false : true)
-					elsif ['test'].include?(key)
-						new_plan[key] = (value == 0 ? nil : true)
-					elsif ['features'].include?(key)
-						value = eval(value)
-						value = value.each {|e| e.delete("id")}.each {|e| e.delete("created_at")}.each {|e| e.delete("updated_at")}.group_by{|h| h['feature_id']}
-						new_feature = {}
-						value.each_with_index do |(k, v), index|
-							new_feature[k] = v.first if v.class == Array
+		def get_local_plans(params)
+		    plans_data = []
+
+            active_plan_id = nil
+            charges = @apm_db.execute( "SELECT * FROM charges WHERE shop_domain = ? ",params['shop_domain'])
+            active_plan_id = charges.first['plan_id'] if charges.any?
+
+            custom_plan_ids = []
+            plan_users = @apm_db.execute( "SELECT * FROM plan_users WHERE shop_domain = ? ",params['shop_domain'])
+            custom_plan_ids = plan_users.collect{|e|e['plan_id']} if plan_users.any?
+
+            custom_plan_base_ids = []
+            plan_data = @apm_db.execute( "SELECT * FROM plans WHERE id IN (?) AND base_plan IS NOT NULL;",custom_plan_ids)
+            custom_plan_base_ids = plan_data.collect{|e|e['base_plan']} if plan_data.any? 
+
+			if active_plan_id && custom_plan_base_ids.include?(active_plan_id)
+			custom_plan_base_ids.delete(active_plan_id)
+			end
+
+			if custom_plan_base_ids.any?
+			plans = @apm_db.execute( "SELECT * FROM plans WHERE (public = ? OR id IN (?)) AND id NOT IN (?)", 1,custom_plan_ids,custom_plan_base_ids) 
+			else
+			plans = @apm_db.execute( "SELECT * FROM plans WHERE (public = ? OR id IN (?))", 1,custom_plan_ids) 
+			end
+
+			if plans.any? 
+
+				plans.each do |plan|
+					new_plan = {}
+					plan.each_with_index do |(key, value), index|
+						if ['interval'].include?(key)
+							val = eval(value) 
+							new_plan[key] = val
+							new_plan[key] = val['value'] if val rescue {}
+						elsif ['shopify_plans'].include?(key)
+							val = eval(value) 
+							new_plan[key] = val.collect{|e|e['value']}
+						elsif ['affiliate'].include?(key)
+							new_plan[key] = eval(value)
+						elsif ['is_custom','public','store_base_plan'].include?(key)
+							new_plan[key] = (value == 0 ? false : true)
+						elsif ['test'].include?(key)
+							new_plan[key] = (value == 0 ? nil : true)
+						elsif ['features'].include?(key)
+							value = eval(value)
+							value = value.each {|e| e.delete("id")}.each {|e| e.delete("created_at")}.each {|e| e.delete("updated_at")}
+							new_plan[key] = value
+						else
+							new_plan[key] = value unless key.class == Integer
 						end
-						new_plan[key] = new_feature
+					end
+			    	plans_data.push(new_plan)
+			    end
+
+			features_by_plans = plans_data.collect{|e|e['features']}
+			if features_by_plans.any? && AppManager.configuration.plan_features.any?
+				features_by_plans_data = []
+				features = AppManager.configuration.plan_features
+				features_by_plans.each do |features_by_plan|
+					features_by_plan.each do |fp|
+					fp['name'] = features.find{|e| e['uuid'] == fp['feature_id']}['name'] rescue nil
+					fp['format'] = features.find{|e| e['uuid'] == fp['feature_id']}['format'] rescue nil
+					features_by_plans_data.push(fp)
+					end
+				end
+			end
+
+				plans_data.each do |plan|
+					if features_by_plans_data.select{|e| e['plan_id'] == plan['id']}.size > 0 
+					 feature_hash = {}
+					 features_by_plans_data.select{|e| e['plan_id'] == plan['id']}.each do |fp|
+					 	feature_hash[fp["feature_id"]] = fp
+					 end
+					 features = feature_hash
 					else
-						new_plan[key] = value unless key.class == Integer
+					 features = nil
 					end
+					plan['features'] = features
 				end
-		    	plans.push(new_plan)
-		    end
+
+				plans = plans_data
+			end
+			
 			return plans
 		end
 

data/lib/app_manager/graphql_helper.rb

@@ -72,7 +72,7 @@ module AppManager
       
       discount_type = plan['discount_type'] || "percentage"
       discount_val = discount_type == "percentage" ? (plan['discount'].to_f/ 100) : "#{plan['discount']}"
-      plan_discount =  plan['discount'] ? { "discount" => { "durationLimitInIntervals" => (plan['cycle_count'] || nil), "value" => {"#{discount_type}" => discount_val} }  } : {}
+      plan_discount =  plan['discount'] ? { "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i || 0), "value" => {"#{discount_type}" => discount_val} }  } : {}
 
       price_details = {
                        "price": { "amount": plan['price'], "currencyCode": 'USD' },

data/lib/app_manager/model.rb

@@ -7,8 +7,11 @@ module AppManager
     def has_plan
         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.plan_id
+        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;
@@ -26,9 +29,9 @@ module AppManager
 
 
     def plan_features
-    	plan_id = self.plan_id
+    	plan_id = self[AppManager.configuration.plan_id_or_name_field]
     	if !plan_id
-    		raise "Plan id not found"
+    		raise Error, "Plan id not found"
     	end
 		plan_obj = AppManager::Client.new
 		plans = plan_obj.get_plan(plan_id)
@@ -70,6 +73,27 @@ module AppManager
         shop_domain ? plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id) : 0
     end
 
+
+    def get_plan
+        if !self[AppManager.configuration.plan_id_or_name_field]
+            raise Error, "Invalid params, must have charge_id,shop && plan"
+        end
+        plan_obj = AppManager::Client.new
+        return plan_obj.get_plan(self[AppManager.configuration.plan_id_or_name_field])
+    end
+
+    def get_charge
+        begin
+            shop_domain = self[AppManager.configuration.shopify_domain_field]
+            plan_obj = AppManager::Client.new
+          return  plan_obj.get_charge(self[AppManager.configuration.shopify_domain_field]) 
+        rescue Exception => e
+          return "#{e.inspect}" 
+        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.1.0"
+  VERSION = "1.1.1"
 end

data/lib/app_manager.rb

@@ -15,6 +15,7 @@ require "app_manager/protection"
 require "app_manager/model"
 require "app_manager/fail_safe"
 require 'app_manager/railtie' if defined?(Rails)
+require 'app_manager/exceptions'
 
 module AppManager
   def self.configure

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

@@ -1,7 +1,10 @@
 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
@@ -16,6 +19,25 @@ module AppManager
 		      template("app_manager.rb", "config/initializers/app_manager.rb")
             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
+
+            private
+
+            def rails_migration_version
+            Rails.version.match(/\d\.\d/)[0]
+            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

data/lib/generators/app_manager/install/templates/add_plan_trial_grandfathered_to_shops.erb

@@ -0,0 +1,7 @@
+class AddPlanTrialGrandfatheredToShops < ActiveRecord::Migration[<%= rails_migration_version %>]
+  def change
+    	add_column :shops, :plan_id, :bigint unless column_exists? :shops, :plan_id
+    	add_column :shops, :trial_activated_at, :datetime unless column_exists? :shops, :trial_activated_at
+    	add_column :shops, :grandfathered, :boolean unless column_exists? :shops, :grandfathered
+  end
+end

data/lib/generators/app_manager/install/templates/app_manager.rb.tt

@@ -11,10 +11,11 @@ AppManager.configure do |config|
         'name' => 'shopify_domain', # demo-rahul-tiwari.myshopify.com
         'shopify_email' => 'email', # rahul.t@hulkapps.com
         'shopify_token' => 'shopify_token',
-        'shopify_plan' => 'plan_name', # partner_test
+        'shopify_plan' => 'shopify_plan', # partner_test
         'plan_id' => 'plan_id', # 1. t
         'created_at' => 'created_at', # 2022-04-15 10:43:05
-        'trial_activated_at' => 'trial_activated_at' # field name that stores trial start/activated date
+        'trial_activated_at' => 'trial_activated_at', # field name that stores trial start/activated date
+        'grandfathered' => 'grandfathered' 
     }
   config.plan_features =  [
     {
@@ -24,7 +25,10 @@ AppManager.configure do |config|
 	  	"description" => "Feature Description",
 	  	"value_type" => "integer",
 	  	"format" => "count",
-	  	"display_order" => 1
+	  	"display_order" => 1,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	},
 	{
 		"uuid" => "9f18f95a-bfaf-11ec-9d64-0242ac120002",
@@ -33,7 +37,10 @@ AppManager.configure do |config|
 		"description" => "Feature Description",
 		"value_type" => "boolean",
 		"format" => "percentage",
-	  	"display_order" => 2
+	  	"display_order" => 2,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	},
 	{
 		"uuid" => "9f190a26-bfaf-11ec-9d64-0242ac120002",
@@ -42,7 +49,10 @@ AppManager.configure do |config|
 		"description" => "Feature Description",
 		"value_type" => "string",
 	  	"format" => "string",
-	  	"display_order" => 3
+	  	"display_order" => 3,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	},
 	{
 		"uuid" => "9f191340-bfaf-11ec-9d64-0242ac12000",
@@ -55,7 +65,23 @@ AppManager.configure do |config|
 			"val 2"
 		],
 	  	"format" => "string",
-	  	"display_order" => 4
+	  	"display_order" => 4,
+		"hidden_feature" => false,
+		"group_order" => "1",
+		"group" => "Group Name",
 	}
-]  #Required, Values type : integer, boolean, string, array
-end
+]  
+end
+#Required, Values type : integer, boolean, string, array #
+#Format: percentage, count, string
+
+
+#################################################
+# Following method receives payload after charge created functionality. Use this for 'MauticCall' 
+# payload contains plan, charge and previous_charge
+
+ActiveSupport::Notifications.subscribe "charge_created"  do |name, start, finish, id, payload|
+   Rails.logger.debug "========APP MANAGER========="
+   Rails.logger.debug "DATA : #{payload}"
+   Rails.logger.debug "========APP MANAGER========="
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -85,6 +85,7 @@ files:
 - app/controllers/app_manager/charges_controller.rb
 - app/controllers/app_manager/plans_controller.rb
 - app/controllers/concerns/app_manager/authenticate.rb
+- app/services/app_manager/event_handler.rb
 - app_manager-0.1.0.gem
 - app_manager.gemspec
 - bin/console
@@ -99,6 +100,7 @@ files:
 - lib/app_manager/client/plans.rb
 - lib/app_manager/config.rb
 - lib/app_manager/engine.rb
+- lib/app_manager/exceptions.rb
 - lib/app_manager/fail_safe.rb
 - lib/app_manager/graphql_helper.rb
 - lib/app_manager/model.rb
@@ -108,6 +110,7 @@ files:
 - lib/app_manager/tasks/sync/local_app_manager.rake
 - lib/app_manager/version.rb
 - lib/generators/app_manager/install/install_generator.rb
+- lib/generators/app_manager/install/templates/add_plan_trial_grandfathered_to_shops.erb
 - lib/generators/app_manager/install/templates/app_manager.rb.tt
 homepage: https://www.hulkapps.com
 licenses: []