app_manager 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c08b2b7330d0590d3de81bd25db16817ddca044984dd3761be00d073ff92b85
-  data.tar.gz: eea3b459b131b5da995ed2b067fae91fe2499b03f14f4cf3f286d856986ee868
+  metadata.gz: d468cb1d631b3dd1d1ba0e8f76e40325c016b829c647c96d94ed0de4c61fe695
+  data.tar.gz: ec9a70baaa08bf3ccaebb45dde27e4f5dde7daf72fafe6c79c3ac158e9c649fe
 SHA512:
-  metadata.gz: 4d5092dd2ccab3b389eda6f93bb826c66a41f8a6508e8a926d9ebc018b073cf732cbd7b400eb7fde0a6b30bce632651891d93207a2cbdb52c35965ae3ce443d5
-  data.tar.gz: d6d93a43535968f4135a8704988b09091b5e2880a534dcb4f8b171a71388d564a782d1911139528782ad0ef536920f1a8be295adef77522105e5f5e3aff1a2cd
+  metadata.gz: 7215b1509241685ed730efaa6c19d291f653e5bc06f24599bd37610512a54ce854b24f4e0a7c82be31638d404f11e57f7bd13cf3b6b97084781cd29741658cce
+  data.tar.gz: 3f08b7e25236d1aee6fb8a5488fc8f07545bcfb388865d352b7d83c65a55470b4b8397a2fed24f795b8c7b94fec92c7ce5632aa4eb5ea5224818a342c46772c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.4.1)
+    app_manager (1.4.2)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -63,7 +63,7 @@ GEM
     activerecord (7.0.4)
       activemodel (= 7.0.4)
       activesupport (= 7.0.4)
-    activerecord-import (1.4.0)
+    activerecord-import (1.4.1)
       activerecord (>= 4.2)
     activestorage (7.0.4)
       actionpack (= 7.0.4)

data/app/controllers/app_manager/plans_controller.rb

@@ -86,7 +86,7 @@ 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 = 25
+        items_per_page = params[:itemsPerPage] || 25
         @shopify_email = AppManager.configuration.field_names['shopify_email']
         @shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
         if params[:search]
@@ -100,20 +100,21 @@ module AppManager
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         end
+        all_user_count = model.count
         users = {
             "current_page" => data && data.current_page ? data.current_page : 0,
             "data" => data ? data.collect { |st| @field_names.map { |key, value| [key, "#{st[value]}"] }.to_h } : [],
             "first_page_url" => "#{app_url}/api/app-manager/users?page=1",
-            "from" => data && data.total_pages ? 1 : 0,
+            "from" => data && data.total_pages ? data.current_page == 1 ? 1 : ((data.current_page-1)*items_per_page)+1 : 0,
             "last_page" => data && data.total_pages ? data.total_pages : 0,
             "last_page_url" => data && data.total_pages ? "#{app_url}/api/app-manager/users?page=#{data.total_pages}" : nil,
             "links" => '',
             "next_page_url" => data && data.next_page ? "#{app_url}/api/app-manager/users?page=#{data.next_page}" : nil,
             "path" => "#{app_url}/api/app-manager/users",
-            "per_page" => 1,
+            "per_page" => items_per_page,
             "prev_page_url" => data && data.prev_page ? "#{app_url}/api/app-manager/users?page=#{data.prev_page}" : nil,
-            "to" => data && data.total_pages ? data.total_pages : 0,
-            "total" => data && data.total_pages ? data.total_pages : 0,
+            "to" => data && data.total_pages ? data.current_page == data.total_pages ? all_user_count : ((data && data.current_page ? data.current_page : 0)*data.size) : 0,
+            "total" => all_user_count,
         }
         render json: users
 

data/lib/app_manager/fail_safe.rb

@@ -128,8 +128,8 @@ module AppManager
     #Complete
     def save_api_app_structures(app_structures)
       begin
-        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE app_structures RESTART IDENTITY")
-        AppManager::AppStructure.connection.truncate(AppManager::AppStructure.table_name)
+        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

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty