zuora_connect 3.0.2.pre.i → 3.0.2.pre.m

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acded16be82a4aa36090fda0248e1d62b739e6ea1bbe39a7b365c137c07c4481
-  data.tar.gz: 263c629b6b718b068f4a6dcc3b9603ab04f0c6895d928a6f1841eae2e5343149
+  metadata.gz: 5e7c7ce2e0e78ef1a25360865897abc69fa2c3f21b80e1ca42cee49a85c9cb01
+  data.tar.gz: 71882230203de07dada155bcc578f7256bd5db78b868ed3a8a58dca134d7559d
 SHA512:
-  metadata.gz: f06d9884240c45a96f17dc2a3927a8addca134d74d96fcdc38e0905b7d1d53f54e32babc95745fb241a754fbbc56d82e835bc1162f459364917abe8295861b63
-  data.tar.gz: 14deefe69fe5b535538f93092606b228397c60ef5ae11417d9c193ec349e50786abd1155673bec58b005cb0fae244f23411850f21cf3b7e5b1f5ef6ecd9f99e8
+  metadata.gz: 044cf34d49fc00ef25d5a6ede5069daef812b5344a6b33a854cdb02e8129e7e92f7b80c8c3a151183ecbffaf91a562e55f6816bdd8ec57a64d2f699e20eca9d5
+  data.tar.gz: 739faf051944ccf5f6db4ab88dfee35408939a939c72784902146af9dc98864045b57551e1b967933cb5984240fa00e783bbceb13073bbc4ba224ad37ae96557

data/app/models/concerns/zuora_connect/auditable.rb

@@ -12,6 +12,9 @@ module ZuoraConnect
       before_update :set_updated_by_id
       before_destroy :set_updated_by_id
 
+      belongs_to :updated_by, class_name: 'ZuoraConnect::ZuoraUser', foreign_key: 'updated_by_id', primary_key: "zuora_user_id", optional: true
+      belongs_to :created_by, class_name: 'ZuoraConnect::ZuoraUser', foreign_key: 'created_by_id', primary_key: "zuora_user_id", optional: true
+
       private
 
       def set_created_by_id

data/app/models/zuora_connect/app_instance_base.rb

@@ -128,7 +128,7 @@ module ZuoraConnect
             raise
           end
         end
-        if migrate && ActiveRecord::Migrator.needs_migration?
+        if migrate
           Apartment::Migrator.migrate(self.id)
         end
       end
@@ -267,7 +267,7 @@ module ZuoraConnect
         params = {
           name: self.task_data.dig('name'),
           zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).select {|entity| !entity['skip'].to_bool}.map{|e| e['id']}.uniq,
-          zuora_global_entity_id: task_data.dig(LOGIN_TENANT_DESTINATION, 'entities', 0, 'globalEntityId').to_i, # tenant id of the global/parent entity, 0 if nil
+          zuora_global_tenant_id: task_data.dig(LOGIN_TENANT_DESTINATION, 'entities', 0, 'globalEntityId').to_i, # tenant id of the global/parent entity, 0 if nil
           zuora_tenant_ids: tenants.map(&:to_s).uniq,
           organizations: organizations
         }

data/app/models/zuora_connect/zuora_user.rb

@@ -8,13 +8,16 @@ module ZuoraConnect
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session
     # app_instance is only needed to try to migrate :/
-    def self.update_id_response(zuora_user_id, zuora_entity_id, zuora_current_identity, app_instance)
+    def self.update_id_response(zuora_user_id, zuora_entity_id, zuora_current_identity, app_instance, permissions)
       zuora_user = find_or_create_by!(zuora_user_id: zuora_user_id) do |user|
         user.zuora_identity_response = { zuora_entity_id => zuora_current_identity }
+        user.app_permissions = permissions
       end
 
-      if zuora_user.stale_identity?
-        zuora_user.zuora_identity_response[zuora_entity_id] = zuora_current_identity
+      zuora_user.zuora_identity_response[zuora_entity_id] = zuora_current_identity
+      zuora_user.app_permissions = permissions
+
+      if zuora_user.changed?
         zuora_user.save!
       end
 
@@ -28,11 +31,5 @@ module ZuoraConnect
       app_instance.apartment_switch(nil, true)
       retry
     end
-
-    # NOTE(hartley): this value was extracted from original usage in helper,
-    # need to investigate when exactly the identity_response should be updated
-    def stale_identity?
-      updated_at < Time.now - 1.day
-    end
   end
 end

data/app/views/sql/refresh_aggregate_table.txt

@@ -18,7 +18,7 @@ BEGIN
 
   FOR schema IN EXECUTE
     format(
-      'SELECT schema_name FROM information_schema.schemata WHERE schema_name ~ ''^[0-9]+$'''
+      'SELECT nspname FROM pg_catalog.pg_namespace where nspname ~ ''^[0-9]+$'''
     )
   LOOP
     IF NOT created THEN
@@ -26,7 +26,7 @@ BEGIN
       EXECUTE format(
         'CREATE TABLE "public".%I (LIKE %I.%I)',
         aggregate_table_name,
-        schema.schema_name, table_name
+        schema.nspname, table_name
       );
       -- Add a special `schema_name` column, which we'll populate with the name of the schema
       -- each row originated from
@@ -68,17 +68,17 @@ BEGIN
     -- and insert them into our new aggregate table
     EXECUTE format(
       'SELECT string_agg(column_name, '','') from information_schema.columns where table_name = ''%s'' AND table_schema = ''%s''',  
-      table_name, schema.schema_name
+      table_name, schema.nspname
     ) into fields_order;
     
-    raise notice 'Importing Schema %', schema.schema_name;
+    raise notice 'Importing Schema %', schema.nspname;
 
     EXECUTE format(        
       'INSERT INTO "public".%I (schema_name, %s) (SELECT ''%s'' AS schema_name, * FROM %I.%I  %s )',
       aggregate_table_name,
       fields_order,
-      schema.schema_name,
-      schema.schema_name, table_name, 
+      schema.nspname,
+      schema.nspname, table_name, 
       filter
     );
   END LOOP;

data/lib/zuora_connect/controllers/helpers.rb

@@ -64,6 +64,8 @@ module ZuoraConnect
           else
             check_instance
           end
+
+          @zuora_user = ZuoraConnect::ZuoraUser.find_by(zuora_user_id: ZuoraConnect::ZuoraUser.current_user_id)
         end
       end
 
@@ -419,7 +421,8 @@ module ZuoraConnect
             if defined?(@appinstance) && !@appinstance['zuora_logins'].nil?
               @zuora_user = ZuoraConnect::ZuoraUser.update_id_response(
                 zuora_user_id, zuora_entity_id, session["ZuoraCurrentIdentity"],
-                @appinstance
+                @appinstance,
+                session['ZuoraCurrentUserInfo']['permissions']
               )
               @zuora_user.session = session
               ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.0.2-i"
+  VERSION = "3.0.2-m"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.2.pre.i
+  version: 3.0.2.pre.m
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -445,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.