app_manager 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6965769520fe875a92f79820bd1288c4d46166b3527d3a6a4417d65b530510
-  data.tar.gz: e84cdb37ae65da5f86e86630b1892ba335939ff46e61309965c7c12a4974c51d
+  metadata.gz: b537020a68cfa232a0ad374777b2a3a9317d5aa599da985ac07334814567d321
+  data.tar.gz: e89d2d9140a3196468d77b5bed6e014e3cabde20478c5206c29fc47e3322b9e9
 SHA512:
-  metadata.gz: f1241ef8b8d0bc7c754f0df7647d3c2402eef5eddbba89f6360844c73cdff81c79ec962bd6322aa8a265fcff07c8296abad3ea5034032eb5c2799262a2b39ad4
-  data.tar.gz: 43097bc92bad6bb5b7cc43c918b869d565f9bbc2c795312ec15933a71494673c00f79378f2c0e1afbc2cacc75020c05141375b4dec6a77518fb6106fb55318fc
+  metadata.gz: 95d3718467208b590e9889a5b774da042a257b7e8f8d05f15b2317637b490b6399bdbe8467fad02226b651d9c7119e805f0e031658202f2f439c9a8dff836111
+  data.tar.gz: aaeee10fb9e7e7edeb4c743ce2bb3df1b5c332f42386a6d87b866d9e33da2a06ba74e45cb7888da1ea97ca581a48291ae373c49ea1e93cbf7c9e6322337c2ada

data/Gemfile.lock

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

data/README.md

@@ -2,23 +2,55 @@
 
 Welcome to the new gem of Hulkapps.com ! An API wrapper of Hulkapps.com's AppManager portal.
 
-## Installation
+* [Installation](#step1)
+* [Configuration](#step2)
+* [Usage](#step3)
+* [Extras](#step4)
 
-Step 1) Add following line to your application's Gemfile:
+
+<a name="step1"></a>
+### Installation
+
+* Add following line to your application's Gemfile:
 
 ```ruby
 gem 'app_manager'
 ```
 
-Step 2) Execute following in terminal:
+* Execute following in terminal:
 
+```
     bundle install
+```
+```
+    rails g app_manager:install
+```
 
+ this install command will mount routes in your rails route and will create a config file at ```config/initializers/app_manager.rb```
 
-    rails g app_manager:install
 
+<a name="step2"></a>
+### Configuration
+
+* 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 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).
 
- this install command will mount routes in your rails route and will create a config file at ```config/initializers/app_manager.rb```
 
 ```
 AppManager.configure do |config|
@@ -85,24 +117,15 @@ end
 ```
 
 
-Please note: Your shops table must have 'plan_id' as int/bigint and 'trial_activated_at' as datetime otherwise add its migration. Sample 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 above initializer file.
-   
-Step 3) You must have to set ENV variable with key 'APP_MANAGER_ACCESS_TOKEN' in your application.yml or .env file like this:
+  
+* You must have to set ENV variable with key 'APP_MANAGER_ACCESS_TOKEN' in your application.yml or .env file like this:
 
+```
     APP_MANAGER_ACCESS_TOKEN: 'XXXXXXXXXXXXXXXXXXX'
     APP_MANAGER_API_URL: 'https://XXXXXXXX.com'
+```
 
-Steps 4) App Manager provides a rake task that must needs to include in your existing app cron for every 10 minutes. Like if you are using [whenever](https://github.com/javan/whenever) gem then you must need to include following rake take in your 'schedule.rb' (created by whenever gem)
+* App Manager provides a rake task that must needs to include in your existing app cron for every 10 minutes. Like if you are using [whenever](https://github.com/javan/whenever) gem then you MUST need to include following rake take in your 'schedule.rb' (created by whenever gem)
 
 ```
 every 10.minutes do
@@ -110,7 +133,12 @@ every 10.minutes do
 end
 ```
 
-Steps 5) App Manager provides a helper module which needs to include in your 'shop' model something like below
+
+<a name="step3"></a>
+### Usage
+
+
+* App Manager provides a helper module which needs to include in your 'shop' model something like below
 
 ```
 class Shop < ActiveRecord::Base
@@ -118,10 +146,7 @@ class Shop < ActiveRecord::Base
 end
 ```
 
-
-## Usage
-
-Using above 5th step you can access following methods from your shop object.
+and then you can use follwing methods with your shop objects.
 
 ```
 @shop.has_plan # return true or false
@@ -137,11 +162,10 @@ Using above 5th step you can access following methods from your shop object.
 ```
 
 
+<a name="step4"></a>
+### Extras
 
-#### As a helper:
-
-
-Then, initialize app_manager instance like with App Manager Portal access:
+* To view the app_manager ruby gem is working in your rails app you can use rails console and initialize app_manager instance like with App Manager Portal access:
 
 ```ruby
 ob = AppManager::Client.new(ENV['APP_MANAGER_ACCESS_TOKEN'])
@@ -152,13 +176,15 @@ To get banners use this command:
 ob.get_banners
 ```
 
-#### For Vue UI Library in Rails Project:
+
+* For Vue UI Library in Rails Project:
 
 Please make sure you have following line in your route file otherwise add this manually. 
 
 mount AppManager::Engine, at: "/"
 
 
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/app/controllers/app_manager/plans_controller.rb

@@ -63,21 +63,27 @@ module AppManager
 
 		def users
 			if model
+				if params[:search]
+				search = params[:search]
+				@shopify_email = AppManager.configuration.field_names['shopify_email']
+				data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%").page(params[:page]).per(10)
+				else
 				data = model.page(params[:page]).per(10)
+				end
 				users = {
-				"current_page" => data.current_page,
-				"data" => data.collect{|st| @field_names.map{ |key, value| [key, "#{st[value]}"] }.to_h },
+				"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.total_pages ? 1 : nil,
-				"last_page" => data.total_pages,
-				"last_page_url" => data.total_pages ? "#{app_url}/api/app-manager/users?page=#{data.total_pages}" : nil,
+				"from" => data && data.total_pages ? 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.next_page ? "#{app_url}/api/app-manager/users?page=#{data.next_page}" : nil,
+				"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,
-				"prev_page_url" => data.prev_page ? "#{app_url}/api/app-manager/users?page=#{data.prev_page}" : nil,
-				"to" => data.total_pages,
-				"total" => data.total_pages 
+				"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,
 				}
 				render json: users
 
@@ -118,6 +124,7 @@ module AppManager
 		    	rescue Exception => e
 		    	Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 		    	end
+		    	AppManager.clear_cache
 		    end
 	    	head :ok
 	    end

data/lib/app_manager/api_cache_handler.rb

@@ -56,10 +56,10 @@ module AppManager
         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 plain: body, status: status 
+        # headers.try(:each) do |key, value|
+        #   @controller.response.headers[key] = value
+        # end
+        @controller.render json: body, status: status 
       end
     end
   end

data/lib/app_manager/fail_safe.rb

@@ -12,22 +12,46 @@ module AppManager
 
 		def save_api_data(params)	
 			Thread.new do			
-			save_api_plans(params["plans"])
+				begin
+					save_api_plans(params["plans"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 			end
 			Thread.new do
-			save_api_charges(params["charges"])
+				begin
+					save_api_charges(params["charges"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 			end
 			Thread.new do
-			save_api_apps(params["apps"])
+				begin
+					save_api_apps(params["apps"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 			end
 			Thread.new do
-			save_api_app_structures(params["app_structures"])
+				begin
+					save_api_app_structures(params["app_structures"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 			end
 			Thread.new do
-			save_api_discount_plans(params["discount_plans"])
+				begin
+					save_api_discount_plans(params["discount_plans"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 			end
 			Thread.new do
-			save_api_extend_trials(params["extend_trials"])
+				begin
+					save_api_extend_trials(params["extend_trials"])
+				rescue Exception => e
+					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+				end
 		    end
 		end
 

data/lib/app_manager/graphql_helper.rb

@@ -71,14 +71,15 @@ module AppManager
       end
       
       discount_type = plan['discount_type'] || "percentage"
-      discount_val = discount_type == "percentage" ? (plan['discount'].to_f/ 100) : plan['discount']
-      plan_discount =  plan['discount'] ? { "durationLimitInIntervals" => (plan['discount_interval'] || nil), "value" => {"#{discount_type}" => discount_val} } : {}
+      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} }  } : {}
 
       price_details = {
                        "price": { "amount": plan['price'], "currencyCode": 'USD' },
                        "interval": plan['interval']['value']
                        }
-      price_details << plan_discount if plan_discount.any?
+      price_details.merge! plan_discount if plan_discount.any?
+
 
       query = 'mutation(
             $name: String!,
@@ -112,10 +113,11 @@ module AppManager
               "test": plan_test,
               "lineItems": [{
                                 "plan": {
-                                    "appRecurringPricingDetails": price_details
+                                    "appRecurringPricingDetails":  price_details
                                 }
                             }]
           }
+
         data = run_graph_api(query,variables)
         return data
    end

data/lib/app_manager/version.rb

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

data/lib/app_manager.rb

@@ -26,7 +26,7 @@ module AppManager
   end
 
   def self.clear_cache
-     Rails.cache.delete_matched('api-response-cache/*')
+     Rails.cache.delete_matched('app-manager-cache/*')
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty