fix gift card type regex

don't filter out certificate column in gift cards
CruGlobal · Dec 12, 2024 · 41dbb42 · 41dbb42
1 parent c00f527
commit 41dbb42
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/app/models/gift_card_type.rb b/app/models/gift_card_type.rb
@@ -1,7 +1,7 @@
 class GiftCardType < ApplicationRecord
   include HasNumbering
 
-  validates :numbering, presence: true, format: { with: /^[^x]*x+[^x]*$/ }
+  validates :numbering, presence: true, format: { with: /\A[^x]*x+[^x]*\z/ }
 
   def to_s
     label

diff --git a/app/models/issuance.rb b/app/models/issuance.rb
@@ -77,7 +77,7 @@ def largest_existing_number_in_certificate
 
     # pulling all allocated certificate ids instead of a regex isn't ideal, but there shouldn't be many, if any, times there
     # are previewed gift cards issuances while another one is being previewed
-    existing_matching_certificates += Issuance.preview.pluck(:allocated_certificates).collect do |allocated_certificates|
+    existing_matching_certificates += Issuance.previewing.pluck(:allocated_certificates).collect do |allocated_certificates|
       allocated_certificates.split(CERTIFICATE_DISPLAY_SEPARATOR).find_all { |certificate| certificate =~ numbering_regex }
     end.flatten
 

diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
@@ -4,5 +4,5 @@
 # Use this to limit dissemination of sensitive information.
 # See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :email, :secret, :token, :_key, :crypt, :salt, :otp, :ssn
 ]
diff --git a/db/schema.rb b/db/schema.rb