app_manager 2.3.7 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65de0d94a90a9b1c656bbc2fba01e4ab8efab00c5cef9625516fe82b771de75c
-  data.tar.gz: c705887f73bf5634e805c7af9038869edcfcd3e18f18ec245895fb7a91d9a95f
+  metadata.gz: c95901b20e1d3c4085bf8c8405134e61d4a4866e28639a172945e70de743dbfb
+  data.tar.gz: c121594095bf641eeed150a9622a4a94a6bbb422ae958833ded6250dc9a7c881
 SHA512:
-  metadata.gz: 993a9870f84b778ad8fecedb7bfea401469300a5daf7a8b0993b2db97d261ee8e7ef57332468f8cae4c6a41351e9ca79f3478d1b94e3d1ab909a4f4608c825c2
-  data.tar.gz: a2bfc4327453ed04674f06dbb85d5cbf309bfd71ad3200b492b6172236c3cce9bfc88511683a116ccc6f401b266a1cd91ba6f6e3bf94c5a06c62cb46b3299a46
+  metadata.gz: 538a10b897e1345edabc150ae24d6629ec093ed3aa70b34f84be0ebbc2af3b82c8c29a6ed7be929a5d66c7b9af7a36bdf6a264a2d6ac6afa87a691913e6561d5
+  data.tar.gz: 48b7037ace77ff9db72c6d910d1108eaae836e0aae96e380ff4486a80e32f6a17e662fa68ffd84aafb66b9d07cc58f356077072de7f7ea24f716af372b3c1239

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.3.7)
+    app_manager (2.4.1)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -103,7 +103,7 @@ GEM
     diff-lcs (1.6.2)
     dotenv (2.1.2)
     drb (2.2.3)
-    erb (6.0.1)
+    erb (6.0.2)
     erubi (1.13.1)
     globalid (1.3.0)
       activesupport (>= 6.1)
@@ -147,7 +147,8 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     multi_xml (0.8.1)
       bigdecimal (>= 3.1, < 5)
@@ -205,8 +206,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (8.1.2)
       actionpack (= 8.1.2)
@@ -257,7 +258,7 @@ GEM
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby

data/app/controllers/app_manager/charges_controller.rb

@@ -140,7 +140,7 @@ module AppManager
 
                 begin
                   plan_obj = AppManager::Client.new
-                  if params[:discount].present? && !params[:discount].nil? && params[:discount] != '0' && !plan_data['is_global']
+                  if params[:discount].present? && !params[:discount].nil? && params[:discount] != '0' && plan_data['is_global'] == 0
                     discounted_plans = plan_obj.get_related_discounted_plans(params[:discount])
                     if discounted_plans.empty? || discounted_plans.include?(params[:plan].to_i)
                       plan_obj.discount_used(@shop[shopify_domain], params[:discount])

data/app/controllers/app_manager/plans_controller.rb

@@ -13,6 +13,8 @@ module AppManager
 
 
     def plans
+      most_popular_plan_ids_raw = AppManager.configuration.most_popular_plan_ids || []
+      most_popular_plan_ids = Array(most_popular_plan_ids_raw).filter_map { |v| v.to_s =~ /\A\d+\z/ ? v.to_i : nil }.uniq
       active_plan_id_or_name = nil
       shopify_plan = nil
       plan = nil
@@ -96,6 +98,7 @@ module AppManager
           'bundle_plan' => bundle_plan,
           'bundle_details' => app_bundle_data,
           'default_plan_id' => default_plan_id,
+          'most_popular_plan_ids' => most_popular_plan_ids,
           'choose_later' => choose_later,
           'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false),
           'global_plan_charge' => plan.present? && plan['is_global'] && active_charge.present? && active_charge.any? && !active_charge['active_charge'].nil? && !active_charge['bundle_charge'].nil?
@@ -192,20 +195,50 @@ module AppManager
 
     def fail_safe_backup
       params_permit
+      backup_type = params[:backup_type] || "full"
+      if (backup_type == "incremental")
+          fail_safe_incremental_backup
+      else
+          rebuild_failsafe
+      end
+      head :ok
+    end
+
+    def fail_safe_incremental_backup
       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
 
         begin
-        @fs.save_api_data(params)
-          rescue Exception => e
+          @fs.fail_safe_incremental_backup(params)
+        rescue Exception => e
+          Rails.logger.info "APP MANAGER fail_safe_incremental_backup >>>> #{e.inspect}"
+        end
+        AppManager.clear_cache
+      end
+    end
+
+
+    def rebuild_failsafe
+      params_permit
+      Thread.new do
+        @fs = AppManager::FailSafe.new
+        begin
+          @fs.sync_app_manager
+        rescue Exception => e
+          Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
+        end
+
+        begin
+          @fs.save_api_data(params)
+        rescue Exception => e
           Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
-          end
-          AppManager.clear_cache
+        end
+        AppManager.clear_cache
       end
       head :ok
     end

data/config/routes.rb

@@ -1,23 +1,20 @@
 AppManager::Engine.routes.draw do
   scope 'api/app-manager' do
-     get 'marketing-banners' => 'banners#marketing_banner'
-
-	 get 'plan-features' => 'plans#index'
-	 get 'plans' => 'plans#plans'
-	 get 'users' => 'plans#users'
-     post 'active-without-plan' => 'plans#active_without_plan'
-	 post 'burst-cache' => 'plans#burst_cache'
-	 post 'fail-safe-backup' => 'plans#fail_safe_backup'
-     get 'plan/process/:plan_id' => 'charges#process_plan'
-     get 'plan/callback' => 'charges#callback', as: :plan_callback
-
-     post 'cancel-charge' => 'charges#cancel_charge'
-		 post 'plan/activate-global' => 'charges#activate_global'
-		 post 'plan/cancel-global' => 'charges#cancel_global'
-
-
-		scope 'app-manager-api' do
-			post 'store-charge' => 'plans#store_charge'
-		end
+      get 'marketing-banners' => 'banners#marketing_banner'
+			get 'plan-features' => 'plans#index'
+			get 'plans' => 'plans#plans'
+			get 'users' => 'plans#users'
+			post 'active-without-plan' => 'plans#active_without_plan'
+			post 'burst-cache' => 'plans#burst_cache'
+			post 'fail-safe-backup' => 'plans#fail_safe_backup'
+			post 'fail-safe-backup-full' => 'plans#rebuild_failsafe'
+			get 'plan/process/:plan_id' => 'charges#process_plan'
+			get 'plan/callback' => 'charges#callback', as: :plan_callback
+			post 'cancel-charge' => 'charges#cancel_charge'
+			post 'plan/activate-global' => 'charges#activate_global'
+			post 'plan/cancel-global' => 'charges#cancel_global'
+			scope 'app-manager-api' do
+				post 'store-charge' => 'plans#store_charge'
+			end
   end
 end

data/lib/app_manager/config.rb

@@ -14,6 +14,7 @@ module AppManager
     attr_accessor :field_names
     attr_accessor :refresh_by_request_params
     attr_accessor :shopify_app_slug
+    attr_accessor :most_popular_plan_ids
     attr_accessor :plan_page_route
 
     def initialize
@@ -28,6 +29,7 @@ module AppManager
       @plan_id_or_name_field = nil
       @shopify_app_slug = nil
       @plan_page_route = nil
+      @most_popular_plan_ids = []
       @field_names = {
         'name' => 'shopify_domain', # sample example: demo-chirag-parmar.myshopify.com
         'shopify_email' => 'email', # chirag.p@hulkapps.com
@@ -94,5 +96,8 @@ module AppManager
       @plan_page_route
     end
 
+    def most_popular_plan_ids
+      @most_popular_plan_ids
+    end
   end
 end

data/lib/app_manager/fail_safe.rb

@@ -110,7 +110,9 @@ module AppManager
           store_base_plan = plan['store_base_plan'] ? 1 : 0
           choose_later_plan = plan['choose_later_plan'] ? 1 : 0
           is_external_charge = plan['is_external_charge'] ? 1 : 0
+         if !plan["id"].nil?
           plan_data << AppManager::Plan.new(plan_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"],is_external_charge: plan["is_external_charge"],external_charge_limit: plan["external_charge_limit"],terms: plan["terms"])
+          end
         end
         AppManager::Plan.bulk_import plan_data
       end
@@ -128,7 +130,9 @@ module AppManager
         charge_data = []
         charges.each do |charge|
           charge_test = charge['test'] ? true : false
+          if !charge["id"].nil?
           charge_data << AppManager::Charge.new(c_id: charge["id"],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
         end
         AppManager::Charge.bulk_import charge_data
       end
@@ -148,7 +152,7 @@ module AppManager
           # 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'])
           apps_data << AppManager::App.new(app_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
+        AppManager::App.bulk_import apps_data
       end
     end
 
@@ -207,7 +211,7 @@ module AppManager
       if plan_users.any?
         extend_plan_users = []
         plan_users.each do |plan_user|
-          extend_plan_users << AppManager::PlanUser.new(plan_user_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(plan_user_id: plan_user['id'],shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], app_id: plan_user['app_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::PlanUser.bulk_import extend_plan_users
@@ -754,6 +758,262 @@ module AppManager
     end
 
 
+
+    def standardize_data_format(data)
+      case data
+      when Array
+        data
+      when Hash
+        [data]
+      else
+        []
+      end
+    end
+
+    def single_record?(data)
+      return true if data.is_a?(Hash) && data.key?("id")
+      return true if data.respond_to?(:id) && data.id.present?
+      false
+    end
+
+    def format_date(value)
+      Time.parse(value.to_s).strftime("%Y-%m-%d %H:%M:%S")
+    rescue
+      value
+    end
+
+    def filter_data(data, date_fields = [], exclude_keys = %w[app_id pivot])
+      rows = standardize_data_format(data)
+
+      processed = rows.map do |row|
+        row = row.is_a?(Hash) ? row : {}
+        serialize_row_for_failsafe(row, date_fields, exclude_keys)
+      end
+
+      processed.first || {}
+    end
+
+    def serialize_row_for_failsafe(row, date_fields, exclude_keys)
+      row.each_with_object({}) do |(key, value), result|
+        next if exclude_keys.include?(key.to_s)
+
+        if date_fields.include?(key.to_s) && value.present?
+          result[key] = format_date(value)
+        elsif value.is_a?(Hash) || value.is_a?(Array)
+          result[key] = value.to_json
+        else
+          result[key] = value
+        end
+      end
+    end
+
+    def fail_safe_incremental_backup(params)
+      params = params.to_unsafe_h.deep_stringify_keys
+
+      sync_type = params["sync_type"]
+      payload = params["payload"] || {}
+
+      #initialize_failsafe_db
+
+          date_fields = %w[
+        created_at
+        updated_at
+        deleted_at
+        valid_from
+        valid_to
+        cancelled_on
+      ]
+
+      case sync_type
+
+      when "plans"
+
+        payload["plan_id"] = payload.delete("id")
+        payload["test"] ||= 0
+
+        filtered = filter_data(payload, date_fields)
+
+        record = AppManager::Plan.find_or_initialize_by(
+            plan_id: filtered["plan_id"]
+        )
+
+        record.update!(filtered)
+      when "plan-delete"
+        AppManager::Plan.where(plan_id: payload["id"]).delete_all
+
+      when "plan-user-delete"
+        AppManager::PlanUser.where(shop_domain: payload["shop_domain"]).delete_all
+
+      when "charges"
+        payload["c_id"] = payload.delete("id")
+        filtered = filter_data(payload, date_fields)
+
+        record = AppManager::Charge.find_or_initialize_by(c_id: filtered["c_id"])
+        record.update!(filtered)
+
+      when "charges-cancel"
+        AppManager::Charge
+            .where(shop_domain: payload["shop_domain"])
+            .update_all(
+                status: "cancelled",
+                cancelled_on: format_date(payload["cancelled_on"] || Time.current),
+                updated_at: format_date(Time.current)
+            )
+
+      when "banners"
+        record = AppManager::AppStructure.first_or_initialize
+
+        record.banners =
+            if payload.is_a?(String)
+              payload
+            else
+              payload.to_json
+            end
+
+        record.save!
+
+      when "promotional-discounts"
+
+        # Normalize main payload
+        payload["discount_id"] = payload.delete("id")
+        payload["discount_type"] = payload.delete("type")
+
+        filtered = filter_data(payload, date_fields, ["pivot"])
+
+        main_data = filtered.except(
+            "shops_relation",
+            "apps_relation",
+            "plans_relation",
+            "usage_relation"
+        )
+
+        discount = AppManager::Discount.find_or_initialize_by(
+            discount_id: main_data["discount_id"]
+        )
+        discount.update!(main_data)
+
+        # ==========================================================
+        # SHOPS RELATION
+        # ==========================================================
+
+        if payload["shops_relation"].present?
+
+          AppManager::DiscountShop
+              .where(discount_id: main_data["discount_id"])
+              .delete_all
+
+          rows = Array(payload["shops_relation"]).map do |row|
+            row = row.deep_stringify_keys
+
+            {
+                "discount_id" => main_data["discount_id"],
+                "domain"      => row["domain"]
+            }
+          end
+
+          AppManager::DiscountShop.insert_all(rows) if rows.present?
+        end
+
+        # ==========================================================
+        # PLANS RELATION
+        # ==========================================================
+
+        if payload["plans_relation"].present?
+
+          AppManager::DiscountLinkPlan
+              .where(discount_id: main_data["discount_id"])
+              .delete_all
+
+          rows = Array(payload["plans_relation"]).map do |row|
+            row = row.deep_stringify_keys
+
+            {
+                "discount_id" => main_data["discount_id"],
+                "plan_id"     => row["plan_id"]
+            }
+          end
+
+          AppManager::DiscountLinkPlan.insert_all(rows) if rows.present?
+        end
+
+        # ==========================================================
+        # USAGE RELATION
+        # ==========================================================
+
+        if payload["usage_relation"].present?
+
+          AppManager::DiscountUsageLog
+              .where(discount_id: main_data["discount_id"])
+              .delete_all
+
+          rows = Array(payload["usage_relation"]).map do |row|
+            row = row.deep_stringify_keys
+            {
+                "discount_id" => main_data["discount_id"],
+                "domain" => row["domain"],
+                "created_at" => row["created_at"],
+                "updated_at" => row["updated_at"],
+                "app_id" => row["app_id"],
+                "sync" => row['sync'],
+                "process_type" => row['process_type']
+            }
+          end
+
+          AppManager::DiscountUsageLog.insert_all(rows) if rows.present?
+        end
+
+      when "promotional-discounts-delete"
+        AppManager::Discount
+            .where(discount_id: payload["id"])
+            .update_all(
+                deleted_at: format_date(payload["deleted_at"] || Time.current),
+                updated_at: format_date(Time.current)
+            )
+
+      when "plan-discount"
+        filtered = filter_data(payload, date_fields)
+
+        record = AppManager::DiscountPlan.find_or_initialize_by(
+            discount_plan_id: filtered["discount_plan_id"]
+        )
+        record.update!(filtered)
+
+      when "plan-user"
+        payload["plan_user_id"] = payload.delete("id")
+        filtered = filter_data(payload, date_fields)
+
+        record = AppManager::PlanUser.find_or_initialize_by(
+            plan_user_id: filtered["plan_user_id"]
+        )
+        record.update!(filtered)
+
+      when "extend-trial"
+        filtered = filter_data(payload, date_fields)
+
+        record = AppManager::ExtendTrial.find_or_initialize_by(
+            extend_trial_id: filtered["extend_trial_id"]
+        )
+        record.update!(filtered)
+
+      when "promotional-discounts-app-removed"
+
+        discount_id = payload["id"]
+
+        AppManager::Discount
+            .where(discount_id: discount_id)
+            .delete_all
+
+        AppManager::DiscountShop
+            .where(discount_id: discount_id)
+            .delete_all
+
+        AppManager::DiscountUsageLog
+            .where(discount_id: discount_id)
+            .delete_all
+      else
+        # Rails.logger.error("Failsafe: Unhandled sync type: #{sync_type}")
+      end
+    end
   end
 
 end

data/lib/app_manager/version.rb

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

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

@@ -8,6 +8,7 @@ AppManager.configure do |config|
   config.shopify_domain_field = 'shopify_domain' #shopify domain field
   config.plan_id_or_name_field = 'plan_id'
   config.shopify_app_slug = '' #Add your app slug here
+  config.most_popular_plan_ids = [] #Add your app slug here
   config.field_names = {
         'name' => 'shopify_domain', # demo-rahul-tiwari.myshopify.com
         'shopify_email' => 'email', # rahul.t@hulkapps.com
@@ -17,6 +18,7 @@ AppManager.configure do |config|
         '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',
+        'partner_development' => 'partner_development',
         '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: 2.3.7
+  version: 2.4.1
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-18 00:00:00.000000000 Z
+date: 2026-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty