panda_pal 5.12.0 → 5.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab899936461dc59208ae6afef28264feda7a75927798e158ca1ee8381b2ea463
-  data.tar.gz: 20424ac6bef9bede8af9e58e8a1393267b0966f96cf56dd8ae8ed0e5b486420a
+  metadata.gz: 5aaa770332536d17f0a40ca1501b4b1e7887d1ce06a77ceb36f379d6177fa841
+  data.tar.gz: 33645394c6afdc6e56a3cba902c615dc8bea904d327768193f533eff40e1ec4f
 SHA512:
-  metadata.gz: 85041955aabe8255fcf0a4e3cbcfce3c55c690e0d66d74ac511d6b4d70825d796a62a18fe3ac3e0b5dc66e9ddc865c5b45f672940d92c15a1cc38a7ac350ad91
-  data.tar.gz: bcbe2513a4b4916af671f5a913036e0154dd474d510351f6325a2f264d03c1dac10adc4c48bc060c40faafdc798268664c48e2c32943dd4ed3d0dcda076b7ff3
+  metadata.gz: dd6acc35f33b92bb9bcb05390867c34680cd81fe02c985399ee97fa82988efe79694392024d40e8cecd4e873f606d810ed1ad9e30dad3654395355f8ec1f2a9e
+  data.tar.gz: 79fb4db2b78e89025737ff607a062351cec69f747c61169a93c1e5759aad19672f4c14148d49229b80eef07b1d11615c75127082946576b17f49d29a6479ef56

data/lib/panda_pal/engine.rb

@@ -66,9 +66,17 @@ module PandaPal
           end
         end
 
+        unless defined?(switch_org)
+          def switch_org(org, &block)
+            org = PandaPal::Organization.find_by(name: org) if org.is_a?(String)
+            org.switch_tenant(&block)
+          end
+        end
+
         unless defined?(current_organization)
           def current_organization
-            PandaPal::Organization.find_by_name(Apartment::Tenant.current)
+            org_name = Apartment::Tenant.split_tenant(Apartment::Tenant.current)[1]
+            PandaPal::Organization.find_by_name(org_name)
           end
         end
       end

data/lib/panda_pal/spec_helper.rb

@@ -2,7 +2,7 @@ module PandaPal::SpecHelper
   extend ActiveSupport::Concern
 
   class_methods do
-    def with_multiple_shards(shards:, preclean_schemas: [], determine_shard: nil, transactional: true)
+    def with_multiple_shards(shards:, tenant_names: [], determine_shard: nil, transactional: true)
       self.use_transactional_tests = transactional
 
       original_settings = {}
@@ -26,7 +26,7 @@ module PandaPal::SpecHelper
 
         Apartment::Tenant.reload!
 
-        clean_schemas(preclean_schemas)
+        clean_schemas(tenant_names)
       end
 
       after :all do
@@ -48,7 +48,7 @@ module PandaPal::SpecHelper
       end
 
       before :each do
-        clean_schemas(preclean_schemas) unless transactional
+        clean_schemas(tenant_names)
 
         @each_existing_org_ids = PandaPal::Organization.pluck(:id)
 
@@ -68,9 +68,12 @@ module PandaPal::SpecHelper
       end
 
       define_method :clean_schemas do |schemas|
-        PandaPal::Organization.where(name: schemas).delete_all
+        # Clean known schemas if an Organization record does not exist for them
+        schema_to_fqt = schemas.index_by { |s| Apartment::Tenant.split_tenant(s)[1] }
+        schemas_to_clean = schema_to_fqt.keys - PandaPal::Organization.pluck(:name)
 
-        schemas.each do |schema|
+        schemas_to_clean.each do |schema|
+          # fqt = schema_to_fqt[schema]
           Apartment::Tenant.drop(schema) rescue nil
           shards.each do |k, v|
             Apartment::Tenant.drop("#{k}:#{schema}") rescue nil

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.12.0"
+  VERSION = "5.12.2"
 end

data/spec/core/apartment_multidb_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe PandaPal::Organization, type: :model do
   context "across multiple DBs" do
     with_multiple_shards(
       shards: { alt: "panda_pal_test2" },
-      preclean_schemas: %w[on_primary on_alt],
+      tenant_names: %w[on_primary alt:on_alt],
       transactional: false,
       determine_shard: ->(org) { org.name.include?("alt") ? "alt" : nil }
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.2
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails