No need to selectively filter blank fields

app/models/claim/matching_attribute_finder.rb

@@ -27,7 +27,6 @@ def matching_claims
       # Claim attributes
       CLAIM_ATTRIBUTE_GROUPS_TO_MATCH.each do |attributes|
         vals = values_for_attributes(@source_claim, attributes)
-
         next if vals.blank?
 
         concatenated_columns = "CONCAT(#{attributes.join(",")})"
@@ -38,12 +37,10 @@ def matching_claims
 
       # Eligibility attributes
       eligibility_ids = eligibility_attributes_groups_to_match.map { |attributes|
-        present_attributes = attributes_for(@source_claim.eligibility, attributes).reject { |_, v| v.blank? }.map(&:first)
-        next if present_attributes.empty?
-
-        vals = values_for_attributes(@source_claim.eligibility, present_attributes)
-        concatenated_columns = "CONCAT(#{present_attributes.join(",")})"
+        vals = values_for_attributes(@source_claim.eligibility, attributes)
+        next if vals.blank?
 
+        concatenated_columns = "CONCAT(#{attributes.join(",")})"
         policies_to_find_matches.map { |policy|
           policy::Eligibility.where("LOWER(#{concatenated_columns}) = LOWER(?)", vals.join)
         }
@@ -81,11 +78,5 @@ def values_for_attributes(object, attributes)
         object.read_attribute(attribute)
       }.reject(&:blank?)
     end
-
-    def attributes_for(object, attributes)
-      attributes.map { |attribute|
-        [attribute, object.read_attribute(attribute)]
-      }
-    end
   end
 end

spec/models/claim/matching_attribute_finder_spec.rb

@@ -229,4 +229,36 @@
 
     it { is_expected.to eq [other_claim] }
   end
+
+  describe "matching_claims - blank trn, another field group with same contract type, blank provision_search" do
+    before do
+      stub_const("Policies::FurtherEducationPayments::ELIGIBILITY_MATCHING_ATTRIBUTES", [["teacher_reference_number"], ["provision_search", "contract_type"]])
+    end
+
+    let(:policy) { Policies::FurtherEducationPayments }
+
+    let!(:source_claim) {
+      eligibility = create(:further_education_payments_eligibility, :eligible, contract_type: "permanent", provision_search: nil)
+      create(
+        :claim,
+        :submitted,
+        policy: policy,
+        eligibility: eligibility
+      )
+    }
+
+    let!(:other_claim) {
+      eligibility = create(:further_education_payments_eligibility, :eligible, contract_type: "permanent", provision_search: nil)
+      create(
+        :claim,
+        :submitted,
+        policy: policy,
+        eligibility: eligibility
+      )
+    }
+
+    subject(:matching_claims) { Claim::MatchingAttributeFinder.new(source_claim).matching_claims }
+
+    it { is_expected.to eq [other_claim] }
+  end
 end