app_manager 1.3.4 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73c07b966d8cbce529a652bd4765b5f4107280a9438868e4b5d898631d8d8c38
-  data.tar.gz: a7fe2691818b06e7f43feb481046f3c6ff4bd3e4c744b737f2c6ca81abf80a56
+  metadata.gz: ac3a1d17d520c154419fd5917813fda210900f58d12686723bacf05d99ecbd14
+  data.tar.gz: 0f62d38f1160f30e07eb96007f845395ce397f70d82043f76f71aaf8c564e0e0
 SHA512:
-  metadata.gz: 335f46ddc9d884bd9edf6b3361d8e4c2c0fda5f4ed8ece90a18eec729b00bdc5fed894700dee1a423678a259af025ff9013fb21fc7e016d8f0a07e1f34c84a0c
-  data.tar.gz: 4624f11210812f05fb6f421b8ceb624a31b64aabde7a757bafceca97cd21705f17eb3b2851d49139526940f37f999abeed5497cab88b705de47e2a936d130229
+  metadata.gz: c6136666c06d579b448ab775a4e9cc6c72f314f0ffc39baccece2d9fe3951a56c1853848d6e83bdfb847037680d2b1e978a4e04b0d440fbc783169a6ecac3e06
+  data.tar.gz: 730a1f415a8d7a679ade4bb74b60b84ddc109ecfa661dc950c666c8fa8bdef44dd3faf6d14d0979052ae73c58350ff53225e0fe51f96f4f463a19f7c50314e95

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    app_manager (1.3.4)
+    app_manager (1.3.7)
+      activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -62,6 +63,8 @@ GEM
     activerecord (7.0.3.1)
       activemodel (= 7.0.3.1)
       activesupport (= 7.0.3.1)
+    activerecord-import (1.4.0)
+      activerecord (>= 4.2)
     activestorage (7.0.3.1)
       actionpack (= 7.0.3.1)
       activejob (= 7.0.3.1)
@@ -92,7 +95,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)

data/app/controllers/app_manager/charges_controller.rb

@@ -10,43 +10,50 @@ module AppManager
     def process_plan
       if params[:shop].present? && params[:plan_id].present?
         @shop = shop_data
+        grandfathered_field = @field_names['grandfathered']
         if !@shop.nil?
           plan_obj = AppManager::Client.new
           plan_data = plan_obj.get_plan(params[:plan_id], params[:shop])
           # render json: plan_data and return #use this to test plan failsafe api
           if plan_data.present? && plan_data.is_a?(Hash)
-            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'].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"]["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)
+              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'].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"]["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
+                  Rollbar.error("APP MANAGER Process Plan Failed #{e}")
                 end
-              rescue Exception => e
-                Rollbar.error("APP MANAGER Process Plan Failed #{e}")
-              end
-
-              if @shop.update(@plan_field => params[:plan_id])
-                begin
-                  AppManager::EventHandler.new('charge_created', {
-                      "plan" => plan_data,
-                      "charge" => nil,
-                      "previous_charge" => nil,
-                      "shopify_domain" => params[:shop]
-                  })
-								rescue Exception => e
-									Rollbar.error("APP MANAGER Error in Process Plan #{e}")
+                @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
+                update_info = {@plan_field => params[:plan_id], @trial_activated_field => nil,grandfathered_field => 0}
+                if !config_trial_days.nil? && !plan_data.nil?
+                  trial_days = plan_data['trial_days'] || 0
+                  update_info[config_trial_days] = trial_days
+                end
+                if @shop.update(update_info)
+                  begin
+                    AppManager::EventHandler.new('charge_created', {
+                        "plan" => plan_data,
+                        "charge" => nil,
+                        "previous_charge" => nil,
+                        "shopify_domain" => params[:shop]
+                    })
+                  rescue Exception => e
+                    Rollbar.error("APP MANAGER Error in Process Plan #{e}")
+                  end
+                  AppManager.clear_cache
+                  # render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"} and return true
+                  render json: {'status' => true,'plan_type' => 'free_plan'} and return true
+                else
+                  raise Error, "Invalid charge"
                 end
-                AppManager.clear_cache
-                render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"} and return true
-              else
-                raise Error, "Invalid charge"
               end
-            end
             request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
             return_url = "#{app_url}#{plan_callback_path}?#{Rack::Utils.build_query(request_data)}"
             gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain, @shop.shopify_token)
@@ -91,30 +98,40 @@ module AppManager
             charge['shop_domain'] = params[:shop]
             charge['interval'] = plan_data['interval']['value']
 
-            if !@plan_field.nil?
-              begin
-                plan_obj.cancel_charge(@shop[shopify_domain], @shop[@plan_field])
-              rescue Exception => e
-                Rollbar.error("APP MANAGER Error in Cancel charge >>>> #{e.inspect}")
-              end
-            end
+            # new_plan_obj = AppManager::Client.new
+            # if !@plan_field.nil?
+            #   begin
+            #     new_plan_obj.cancel_charge(@shop[shopify_domain], @shop[@plan_field])
+            #   rescue Exception => e
+            #     Rollbar.error("APP MANAGER Error in Cancel charge >>>> #{e.inspect}")
+            #   end
+            # end
 
             charge_ob = AppManager::Client.new(nil, json_req = true)
             response = charge_ob.store_charge(charge.to_json)
 
             if response['message'] == "success"
               AppManager.clear_cache
-              @shop.update(@plan_field => params[:plan],grandfathered_field => 0)
-              charge_data = plan_obj.get_charge(@shop[shopify_domain])
-              begin
-                AppManager::EventHandler.new('charge_created', {
-                    "plan" => plan_data,
-                    "charge" => charge,
-                    "previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
-                    "shopify_domain" => params[:shop]
-                })
-              rescue Exception => e
-                Rollbar.error("Error in APP MANAGER Charge Created Callback >>>> #{e.inspect}")
+
+              update_info = {@plan_field => params[:plan],grandfathered_field => 0}
+              if !config_trial_days.nil? && !plan_data.nil?
+                trial_days = plan_data['trial_days'] || 0
+                update_info[config_trial_days] = trial_days
+              end
+
+              @shop.update(update_info)
+              Thread.new do
+                charge_data = plan_obj.get_charge(@shop[shopify_domain])
+                begin
+                  AppManager::EventHandler.new('charge_created', {
+                      "plan" => plan_data,
+                      "charge" => charge,
+                      "previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
+                      "shopify_domain" => params[:shop]
+                  })
+                rescue Exception => e
+                  Rollbar.error("Error in APP MANAGER Charge Created Callback >>>> #{e.inspect}")
+                end
               end
             end
             redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
@@ -125,7 +142,11 @@ module AppManager
           raise ModelNotFound, "Shop not found"
         end
       else
-        raise Error, "Invalid params, must have charge_id,shop && plan"
+        if params[:shop].present?
+          redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
+        else
+          raise Error, "Invalid params, must have charge_id,shop && plan in charge controller"
+        end
       end
     end
 
@@ -161,6 +182,15 @@ module AppManager
       AppManager.configuration.app_url
     end
 
+    def config_trial_days
+      @field_names = AppManager.configuration.field_names
+      if !@field_names.nil? && @field_names.has_key?('total_trial_days') && !@field_names['total_trial_days'].nil? && !@field_names['total_trial_days'].blank?
+        return @field_names['total_trial_days']
+      else
+        return nil
+      end
+    end
+
 
   end
 end

data/app/controllers/app_manager/plans_controller.rb

@@ -86,17 +86,17 @@ module AppManager
         plans = plans.values if !plans.nil?
         shopify_plans = params[:shopify_plans] || nil
         shopify_plans = shopify_plans.values if !shopify_plans.nil?
-        items_per_page = params[:itemsPerPage] || 25
+        items_per_page = 25
         @shopify_email = AppManager.configuration.field_names['shopify_email']
         @shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
-        data = model
         if params[:search]
           data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%")
           data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         else
-          data = model.where(@plan_field => plans) if !plans.nil?
+          data = model
+          data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         end
@@ -126,10 +126,16 @@ module AppManager
       if params[:shop_domain].present? && params[:plan_id].present? && model
         @shop = shop_data
         @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
-        if @shop.update(@plan_field => params[:plan_id], @trial_activated_field => DateTime.now)
+        plan_obj = AppManager::Client.new
+        plan_data = plan_obj.get_plan(params[:plan_id], params[:shop_domain]) rescue nil
+        update_info = {@plan_field => params[:plan_id], @trial_activated_field => DateTime.now}
+        if !config_trial_days.nil? && !plan_data.nil?
+          trial_days = plan_data['trial_days'] || 0
+          update_info[config_trial_days] = trial_days
+        end
+        if @shop.update(update_info)
           begin
-            plan_obj = AppManager::Client.new
-            plan_data = plan_obj.get_plan(params[:plan_id], params[:shop_domain]) rescue nil
+            AppManager.clear_cache
             AppManager::EventHandler.new('charge_created', {
                 "plan" => plan_data,
                 "charge" => nil,
@@ -161,7 +167,7 @@ module AppManager
       Thread.new do
         @fs = AppManager::FailSafe.new
         begin
-          @fs.sync_app_manager
+            @fs.sync_app_manager
         rescue Exception => e
           Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
         end
@@ -209,5 +215,14 @@ module AppManager
       AppManager.configuration.app_url
     end
 
+    def config_trial_days
+      @field_names = AppManager.configuration.field_names
+      if !@field_names.nil? && @field_names.has_key?('total_trial_days') && !@field_names['total_trial_days'].nil? && !@field_names['total_trial_days'].blank?
+        return @field_names['total_trial_days']
+      else
+        return nil
+      end
+    end
+
   end
 end

data/app_manager.gemspec

@@ -33,6 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "rails",   '>= 5.2.0'
   spec.add_dependency "kaminari",   '>= 0.16.3'
+  spec.add_dependency "activerecord-import", '~> 1.4'
+
+
   # spec.add_dependency "sqlite3", '~> 1.3.0'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/app_manager/client/connection.rb

@@ -28,7 +28,8 @@ module AppManager
           response = response_from_cache_for_api(http_method, path, options)
           failsafe_or_caching_done = true
           else
-          response = self.class.send(http_method, path, { body: options, timeout: 10 })
+          time_out = Rails.env.development? ?  120 : 30
+          response = self.class.send(http_method, path, { body: options, timeout: time_out })
           end
           if path.include? "/get-status"
             data = response
@@ -59,14 +60,16 @@ module AppManager
           return fetch_static_cached_response(cache_key)
         end
         begin
-        response = self.class.send(http_method, path, { body: options, timeout: 10 })
-        if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
-           Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
-        else
-          response = response_from_failsafe(path,options)
-        end
+        response = self.class.send(http_method, path, { body: options, timeout: 15 })
+          if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
+             Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
+          else
+            response = response_from_failsafe(path,options)
+          end
         rescue Net::ReadTimeout => error
           response = response_from_failsafe(path,options)
+        rescue Exception => e
+          response = response_from_failsafe(path,options)
         end
         return response
       end

data/lib/app_manager/client.rb

@@ -9,6 +9,8 @@ module AppManager
     include AppManager::Client::Banners
     include AppManager::Client::Plans
 
+    # debug_output $stderr if Rails.env.development?
+
     format :json
 
 

data/lib/app_manager/fail_safe.rb

@@ -2,17 +2,18 @@ require 'json'
 require 'date'
 require 'time'
 require "fileutils"
-
+require 'active_record'
+require 'activerecord-import'
 module AppManager
 
   class FailSafe
 
     def initialize(db_name = 'app_manager_local')
-      begin
-        FileUtils.chmod 0664, "db/#{db_name}.db"
-      rescue Exception => e
-        puts ">>>>>> #{e.inspect}"
-      end
+      # begin
+      #   FileUtils.chmod 0664, "db/#{db_name}.db"
+      # rescue Exception => e
+      #   puts ">>>>>> #{e.inspect}"
+      # end
       # @apm_db = SQLite3::Database.open "db/#{db_name}.db"
       # @apm_db.results_as_hash = true
     end
@@ -62,8 +63,14 @@ module AppManager
     end
 
     def save_api_plans(plans)
-      AppManager::Plan.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE plans RESTART IDENTITY")
+        AppManager::Plan.connection.truncate(AppManager::Plan.table_name)
+      rescue
+        AppManager::Plan.delete_all
+      end
       if plans.any?
+        plan_data = []
         plans.each do |plan|
           interval = {}
           shopify_plans = []
@@ -77,62 +84,103 @@ module AppManager
           public_val = plan['public'] ? 1 : 0
           store_base_plan = plan['store_base_plan'] ? 1 : 0
           choose_later_plan = plan['choose_later_plan'] ? 1 : 0
-          AppManager::Plan.create(id: plan["id"], type: plan["type"], name: plan["name"], price: plan["price"], offer_text: plan["offer_text"], description: plan["description"], interval: interval, shopify_plans: shopify_plans, trial_days: plan["trial_days"], test: plan_test, on_install: plan["on_install"], is_custom: is_custom, app_id: plan["app_id"], base_plan: plan["base_plan"], created_at: plan["created_at"], updated_at: plan["updated_at"], public: public_val, discount: plan["discount"], cycle_count: plan["cycle_count"], store_base_plan: store_base_plan, choose_later_plan: choose_later_plan, discount_type: plan["discount_type"], affiliate: affiliate, features: features, deleted_at: plan["deleted_at"])
+          plan_data << AppManager::Plan.new(id: plan["id"], type: plan["type"], name: plan["name"], price: plan["price"], offer_text: plan["offer_text"], description: plan["description"], interval: interval, shopify_plans: shopify_plans, trial_days: plan["trial_days"], test: plan_test, on_install: plan["on_install"], is_custom: is_custom, app_id: plan["app_id"], base_plan: plan["base_plan"], created_at: plan["created_at"], updated_at: plan["updated_at"], public: public_val, discount: plan["discount"], cycle_count: plan["cycle_count"], store_base_plan: store_base_plan, choose_later_plan: choose_later_plan, discount_type: plan["discount_type"], affiliate: affiliate, features: features, deleted_at: plan["deleted_at"])
         end
+        AppManager::Plan.bulk_import plan_data
       end
     end
 
 
     def save_api_charges(charges)
-      AppManager::Charge.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE charges RESTART IDENTITY")
+        AppManager::Charge.connection.truncate(AppManager::Charge.table_name)
+      rescue
+        AppManager::Charge.delete_all
+      end
       if charges.any?
+        charge_data = []
         charges.each do |charge|
           charge_test = charge['test'] ? true : false
-          AppManager::Charge.create(charge_id: charge["charge_id"], test: charge_test, status: charge["status"], name: charge["name"], type: charge["type"], price: charge["price"], interval: charge["interval"], trial_days: charge["trial_days"], billing_on: charge["billing_on"], activated_on: charge["activated_on"], trial_ends_on: charge["trial_ends_on"], cancelled_on: charge["cancelled_on"], expires_on: charge["expires_on"], plan_id: charge["plan_id"], description: charge["description"], shop_domain: charge["shop_domain"], created_at: charge["created_at"], updated_at: charge["updated_at"], app_id: charge["app_id"], sync: true)
+          charge_data << AppManager::Charge.new(charge_id: charge["charge_id"], test: charge_test, status: charge["status"], name: charge["name"], type: charge["type"], price: charge["price"], interval: charge["interval"], trial_days: charge["trial_days"], billing_on: charge["billing_on"], activated_on: charge["activated_on"], trial_ends_on: charge["trial_ends_on"], cancelled_on: charge["cancelled_on"], expires_on: charge["expires_on"], plan_id: charge["plan_id"], description: charge["description"], shop_domain: charge["shop_domain"], created_at: charge["created_at"], updated_at: charge["updated_at"], app_id: charge["app_id"], sync: true)
         end
+        AppManager::Charge.bulk_import charge_data
       end
     end
 
 
     def save_api_apps(apps)
-      AppManager::App.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE apps RESTART IDENTITY")
+        AppManager::App.connection.truncate(AppManager::App.table_name)
+      rescue
+        AppManager::App.delete_all
+      end
       if apps.any?
+        apps_data = []
         apps.each do |app|
-          AppManager::App.create(id: app['id'], name: app['name'], slug: app['slug'], url: app['url'], image: app['image'], api_token: app['api_token'], slack: app['slack'], created_at: app['created_at'], updated_at: app['updated_at'])
+          apps_data << AppManager::App.new(id: app['id'], name: app['name'], slug: app['slug'], url: app['url'], image: app['image'], api_token: app['api_token'], slack: app['slack'], created_at: app['created_at'], updated_at: app['updated_at'])
         end
+        AppManager::Charge.bulk_import apps_data
       end
     end
 
     #Complete
     def save_api_app_structures(app_structures)
-      AppManager::AppStructure.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE app_structures RESTART IDENTITY")
+        AppManager::AppStructure.connection.truncate(AppManager::AppStructure.table_name)
+      rescue
+        AppManager::AppStructure.delete_all
+      end
       AppManager::AppStructure.create(banners: app_structures.to_h)
     end
 
     def save_api_discount_plans(discount_plans)
-      AppManager::DiscountPlan.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE discount_plans RESTART IDENTITY")
+        AppManager::DiscountPlan.connection.truncate(AppManager::DiscountPlan.table_name)
+      rescue
+        AppManager::DiscountPlan.delete_all
+      end
       if discount_plans.any?
+        discount_plans_data = []
         discount_plans.each do |discount_plan|
-          AppManager::DiscountPlan.create(id: discount_plan['id'], discount: discount_plan['discount'], shop_domain: discount_plan['shop_domain'], cycle_count: discount_plan['cycle_count'], plan_id: discount_plan['plan_id'], created_by: discount_plan['created_by'], created_at: discount_plan['created_at'], updated_at: discount_plan['updated_at'], app_id: discount_plan['app_id'], discount_type: discount_plan['discount_type'])
+          discount_plans_data << AppManager::DiscountPlan.new(id: discount_plan['id'], discount: discount_plan['discount'], shop_domain: discount_plan['shop_domain'], cycle_count: discount_plan['cycle_count'], plan_id: discount_plan['plan_id'], created_by: discount_plan['created_by'], created_at: discount_plan['created_at'], updated_at: discount_plan['updated_at'], app_id: discount_plan['app_id'], discount_type: discount_plan['discount_type'])
         end
+        AppManager::DiscountPlan.bulk_import discount_plans_data
       end
     end
 
     def save_api_extend_trials(extend_trials)
-      AppManager::ExtendTrial.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE extend_trials RESTART IDENTITY")
+        AppManager::ExtendTrial.connection.truncate(AppManager::ExtendTrial.table_name)
+      rescue
+        AppManager::ExtendTrial.delete_all
+      end
       if extend_trials.any?
+        extend_trials_data = []
         extend_trials.each do |extend_trial|
-          AppManager::ExtendTrial.create(id: extend_trial['id'], shop_domain: extend_trial['shop_domain'], plan_id: extend_trial['plan_id'], app_id: extend_trial['app_id'], days: extend_trial['days'], created_by: extend_trial['created_by'], created_at: extend_trial['created_at'], updated_at: extend_trial['updated_at'], extend_trial_start_at: extend_trial['extend_trial_start_at'])
+          extend_trials_data << AppManager::ExtendTrial.new(id: extend_trial['id'], shop_domain: extend_trial['shop_domain'], plan_id: extend_trial['plan_id'], app_id: extend_trial['app_id'], days: extend_trial['days'], created_by: extend_trial['created_by'], created_at: extend_trial['created_at'], updated_at: extend_trial['updated_at'], extend_trial_start_at: extend_trial['extend_trial_start_at'])
         end
+        AppManager::ExtendTrial.bulk_import extend_trials_data
       end
     end
 
     def save_api_plan_users(plan_users)
-      AppManager::PlanUser.destroy_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE plan_users RESTART IDENTITY")
+        AppManager::PlanUser.connection.truncate(AppManager::PlanUser.table_name)
+      rescue
+        AppManager::PlanUser.delete_all
+      end
       if plan_users.any?
+        extend_plan_users = []
         plan_users.each do |plan_user|
-          AppManager::PlanUser.create(id: plan_user['id'], shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'])
+          extend_plan_users << AppManager::PlanUser.new(id: plan_user['id'], shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'])
         end
+        AppManager::ExtendTrial.bulk_import extend_plan_users
       end
     end
 
@@ -363,6 +411,11 @@ module AppManager
           if charge['trial_ends_on'] && DateTime.now < charge['trial_ends_on']
             @remaining_days = (charge['trial_ends_on'].to_datetime - DateTime.now.to_datetime).to_i
           end
+
+          # ADD EXTRA DAY
+          if charge['created_at'] && ((charge['created_at'].to_datetime - DateTime.now.to_datetime).to_i == 0)
+            @remaining_days = @remaining_days + 1
+          end
           # TODO: Uncomment this code when we implement Shopify trial extension apis
           # trial_extension_data = AppManager::ExtendTrial.where(shop_domain: @shop_domain, plan_id: @plan_id).order(extend_trial_start_at: :desc)
           # if trial_extension_data.any?

data/lib/app_manager/graphql_helper.rb

@@ -59,15 +59,27 @@ module AppManager
       plan_test = true
       end
       trial_days = plan['trial_days'] || 0
-
       if shop && shop.shopify_domain && trial_days
         trial_activated_at = shop[AppManager.configuration.field_names['trial_activated_at']] rescue nil
         plan_id_field = shop[AppManager.configuration.plan_id_or_name_field] rescue nil
         remaining_obj = AppManager::Client.new
         remaining = remaining_obj.get_remaining_days(shop.shopify_domain,trial_activated_at,plan_id_field)
-        trial_days = !remaining.nil? ? remaining : trial_days
+        # trial_days = !remaining.nil? ? remaining : trial_days
+        if !remaining.nil?
+          if !plan_id_field.nil?
+            plan_obj = AppManager::Client.new
+            current_plan = plan_obj.get_plan(plan_id_field) rescue nil
+            used_days = (current_plan['trial_days'].to_i - remaining.to_i) if current_plan rescue 0
+            if used_days > 0
+              days = trial_days - used_days
+              trial_days = days > 0 ? days : 0
+            end
+          else
+            trial_days = remaining
+          end
+        end
       end
-      
+
       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'].to_i || 0), "value" => {"#{discount_type}" => discount_val} }  } : {}

data/lib/app_manager/model.rb

@@ -84,7 +84,7 @@ module AppManager
         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}")
+        return 0
       end
     end
 
@@ -98,7 +98,6 @@ module AppManager
         if shop_plan_id && !shop_plan_id.nil?
           req_plan_id = shop_plan_id
         else
-          Rollbar.error("Invalid params, must have charge_id,shop && plan")
           return {}
         end
       end

data/lib/app_manager/version.rb

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

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

@@ -15,7 +15,8 @@ AppManager.configure do |config|
         '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
-        'grandfathered' => 'grandfathered' 
+        'grandfathered' => 'grandfathered',
+        'total_trial_days' => '' #optional, put a trial days field from your shops table otherwise leave it blank
     }
   config.plan_features =  [
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.7
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.3
+- !ruby/object:Gem::Dependency
+  name: activerecord-import
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: Provides helper function to access AppManager API
 email: rahul.t@hulkapps.com
 executables: []