zuora_connect 1.4.0c → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f90478a30b359a0c95d5e75549eae2a3a4814c7f
-  data.tar.gz: fa8eb400c05c20cbaf601b92786f8d412926012c
+  metadata.gz: 9ac3e691c387b162c6b0266f6cee43a8ab95dabf
+  data.tar.gz: 48918306c16420b83a42a9a12b6c4d26bacd9b32
 SHA512:
-  metadata.gz: 8b0834624506a5cec1e02a342f15cca8a374f4d4d284d86304aa29288c1934d22d1c811e87c918d51eee30416e87e5363788732959b9bb353fdd2f3c41c54eb1
-  data.tar.gz: 0160ba545b722ed02689b3f4358c8002a8a27e10781fd8229d7125466b7fc383a9645454f0dafa0cba19a9621f9924951505a8719408dbe31116d6f3626408d4
+  metadata.gz: 4a3be57abe25f5d5997d81690d29a22540df3448db123e6392c725ecadd2ce9b92d459844323e482b4a1c41fd35106a2bce931a1b535828d63c33c9a9ef15f07
+  data.tar.gz: 78e378daa61b7731691d578b995034c5e6ca4fbae24c85d2702e310c705b1f7292dcb268e4dd8ee15fdbaa3d2db3e9bb0167037d709f607f7025d0b217b37e67

data/app/models/zuora_connect/app_instance_base.rb

@@ -11,14 +11,14 @@ module ZuoraConnect
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       Apartment::Tenant.switch!(self.id)
-      if( ActiveRecord::Migrator.needs_migration?)
+      if(ActiveRecord::Migrator.needs_migration?)
         Apartment::Migrator.migrate(self.id)
       end
       Thread.current[:appinstance] = self
     end
 
-    def data_lookup(session: nil)
-      return session.blank? ? {} : session
+    def data_lookup(session: {})
+      return session
     end
 
     def cache_app_instance
@@ -43,6 +43,59 @@ module ZuoraConnect
       return ActiveSupport::MessageEncryptor.new(secret, sign_secret)
     end
 
+    def catalog_outdated?
+      return self.catalog_updated_at.blank? || (self.catalog_updated_at < Time.now - 12.hours)
+    end
+
+    def catalog_lookup(entity_id: nil, object: :product, map_lower_objects: true)
+      entity_reference = entity_id.blank? ? 'Default' : entity_id
+      stub_catalog = ((self.catalog || {})[entity_reference] || {})
+      case object
+      when :product
+        if !map_lower_objects
+          stub_catalog = stub_catalog.map{|k,v| [k,v.except("productRatePlans").merge({"productRatePlans" =>  v["productRatePlans"].map {|k,v| v.except("productRatePlanCharges").merge({"productRatePlanCharges" =>  v["productRatePlanCharges"].map {|k,v| v}})}})]}.to_h
+        end
+      when :rateplan
+        stub_catalog = stub_catalog.map {|k,x| x["productRatePlans"] }.reduce({}, :merge)
+
+        if !map_lower_objects
+          stub_catalog = stub_catalog.map {|k,v| [k,v.except("productRatePlanCharges").merge({"productRatePlanCharges" =>  v["productRatePlanCharges"].map {|k,v| v}})]}.to_h
+        end
+      when :charge
+        stub_catalog = stub_catalog.map {|k,x| x["productRatePlans"].map{|k,x| x["productRatePlanCharges"] }.reduce({}, :merge)}.reduce({}, :merge)
+      end
+
+      return stub_catalog
+    end
+
+    def instance_failure(failure)
+      raise failure
+    end
+
+    def login_lookup(type: "Zuora")
+      results = []
+      self.logins.each do |name, login|
+        results << login if login.tenant_type == type
+      end
+      return results
+    end
+
+    def get_catalog(zuora_login: self.login_lookup.first, force_update: false, entity_id: nil)
+      entity_reference = entity_id.blank? ? 'Default' : entity_id
+      Rails.logger.debug("Fetching catalog for default") if entity_id.blank?
+      Rails.logger.debug("Fetching catalog for entity #{entity_id}") if !entity_id.blank?
+      if catalog_outdated? || force_update
+        Rails.logger.debug("Fetch Catalog")
+        self.update_column(:catalog_updated_at, Time.now.utc)
+        products = zuora_login.client(entity_reference).get_catalog
+        self.catalog = {} if self.catalog.blank? || self.catalog.class == Array
+        self.catalog[entity_reference] = products.blank? ? {} : products
+        self.update_column(:catalog, self.catalog)
+        self.touch
+      end
+      return self.catalog[entity_reference]
+    end
+
     def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token)
       @api_version = (username.include?("@") ? "v1" : "v2")
       @username = username

data/app/models/zuora_connect/login.rb

@@ -4,7 +4,7 @@ module ZuoraConnect
     def initialize (fields)
       @clients = {}
       if fields["tenant_type"] == "Zuora" && fields["entities"] && fields["entities"].size > 0
-        @clients["none"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+        @clients["Default"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
         @default_entity = fields["entities"][0]["id"] if fields["entities"].size == 1
         fields["entities"].each do |entity|
           login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
@@ -12,7 +12,7 @@ module ZuoraConnect
           @clients[entity["id"]] = ::ZuoraAPI::Login.new(login_fields)
         end
       elsif fields["tenant_type"] == "Zuora"
-        @clients["none"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+        @clients["Default"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
       end
 
       self.attr_builder("available_entities",@clients.keys) if fields["tenant_type"] == "Zuora"
@@ -20,7 +20,7 @@ module ZuoraConnect
       fields.each do |k,v|
         self.attr_builder(k,v)
       end
-      @default_entity ||= "none"
+      @default_entity ||= "Default"
     end
 
     def attr_builder(field,val)
@@ -34,5 +34,3 @@ module ZuoraConnect
 
   end
 end
-
-

data/db/migrate/20110503003602_add_catalog_data_to_app_instance.rb

@@ -0,0 +1,6 @@
+class AddCatalogDataToAppInstance < ActiveRecord::Migration
+  def change
+    add_column :zuora_connect_app_instances, :catalog_updated_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_updated_at
+    add_column :zuora_connect_app_instances, :catalog, :jsonb  unless column_exists? :zuora_connect_app_instances, :catalog
+  end
+end

data/lib/zuora_connect/configuration.rb

@@ -32,4 +32,8 @@ module ZuoraConnect
       @s3_folder_name = Rails.application.class.parent_name
     end
   end
+
+  def private_key
+    @private_key.include? ("BEGIN") ? @private_key : Base64.urlsafe_decode64(@private_key)
+  end
 end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.0c"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.0c
+  version: 1.4.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0c
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0c
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
 - db/migrate/20110131211919_add_sessions_table.rb
 - db/migrate/20110411200303_add_expiration_to_app_instance.rb
 - db/migrate/20110413191512_add_new_api_token.rb
+- db/migrate/20110503003602_add_catalog_data_to_app_instance.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb
@@ -280,9 +281,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1