Merge pull request #192 from internetee/impvove-end-to-end-parsing

Fix parsing of reference numbers from end_to_end_id field with text prefixes

Author: vohmar

.gitignore

@@ -50,3 +50,5 @@ vendor/gems
 /public/assets/
 
 .DS_Store
+.cursorindexingignore
+.specstory/

app/jobs/payment_lhv_connect_job.rb

@@ -72,12 +72,15 @@ def parse_reference_number(credit_transaction)
     end
 
     if credit_transaction.end_to_end_id.present?
-      reference = credit_transaction.end_to_end_id
-      Rails.logger.info "Checking end_to_end_id field for reference number: #{reference}"
-      ref = Reference.find_by(reference_number: reference)
-      if ref.present?
-        Rails.logger.info "Found valid reference number in end_to_end_id field: #{reference}"
-        return reference
+      end_to_end_reference = extract_reference_from_text(credit_transaction.end_to_end_id)
+      if end_to_end_reference
+        Rails.logger.info "Checking end_to_end_id field for reference number: #{end_to_end_reference}"
+        ref = Reference.find_by(reference_number: end_to_end_reference)
+        if ref.present?
+          Rails.logger.info "Found valid reference number in end_to_end_id field: #{end_to_end_reference}"
+          return end_to_end_reference
+        end
+        reference = end_to_end_reference
       end
     end
 
@@ -91,6 +94,13 @@ def ref_number_from_description(description)
     matches.detect { |m| break m if m.length == 7 || valid_ref_no?(m) }
   end
 
+  def extract_reference_from_text(text)
+    return text if text.to_s.match?(Billing::ReferenceNo::REGEXP)
+
+    matches = text.to_s.scan(Billing::ReferenceNo::MULTI_REGEXP).flatten
+    matches.detect { |m| break m if m.length == 7 || valid_ref_no?(m) }
+  end
+
   def valid_ref_no?(match)
     true if Billing::ReferenceNo.valid?(match)
   end

spec/jobs/payment_lhv_connect_job_spec.rb

@@ -331,12 +331,146 @@
       end
 
       expect_any_instance_of(BillingMailer).to receive(:inform_admin).with(
-        reference_number: nil, 
+        reference_number: nil,
         body: an_instance_of(OpenStruct)
       ).and_return(double("mailer", deliver_now: true))
-      
+
       expect_any_instance_of(PaymentLhvConnectJob).not_to receive(:send_transactions)
       PaymentLhvConnectJob.perform_now
     end
+
+    it 'should parse reference number from end_to_end_id with text prefix like "Ref 1234567"' do
+      ref = Billing::ReferenceNo.generate
+      Reference.create(reference_number: ref, initiator: 'registry')
+
+      date = Time.zone.now - 4.hours
+      end_to_end_with_text = "Ref #{ref}"
+
+      params_for_sending = OpenStruct.new(
+        amount: '10.0',
+        currency: 'EUR',
+        date: date,
+        payment_reference_number: ref,
+        payment_description: 'Money transfer',
+        end_to_end_id: end_to_end_with_text
+      )
+
+      Lhv::ConnectApi.class_eval do
+        define_method :credit_debit_notification_messages do
+          transaction = OpenStruct.new(
+            amount: '10.0',
+            currency: 'EUR',
+            date: date,
+            payment_reference_number: nil,
+            payment_description: 'Money transfer',
+            end_to_end_id: end_to_end_with_text
+          )
+          message = OpenStruct.new(
+            bank_account_iban: Setting.registry_bank_account_iban_lhv || 'EE177700771001155322',
+            credit_transactions: [transaction]
+          )
+          [message]
+        end
+      end
+
+      expect_any_instance_of(PaymentLhvConnectJob).to receive(:send_transactions).with(
+        params: [params_for_sending],
+        payment_reference_number: ref
+      )
+      PaymentLhvConnectJob.perform_now
+    end
+
+    it 'should parse reference number from end_to_end_id with various text formats' do
+      ref = Billing::ReferenceNo.generate
+      Reference.create(reference_number: ref, initiator: 'registry')
+
+      date = Time.zone.now - 4.hours
+      end_to_end_with_text = "Reference: #{ref} payment"
+
+      params_for_sending = OpenStruct.new(
+        amount: '10.0',
+        currency: 'EUR',
+        date: date,
+        payment_reference_number: ref,
+        payment_description: 'Money transfer',
+        end_to_end_id: end_to_end_with_text
+      )
+
+      Lhv::ConnectApi.class_eval do
+        define_method :credit_debit_notification_messages do
+          transaction = OpenStruct.new(
+            amount: '10.0',
+            currency: 'EUR',
+            date: date,
+            payment_reference_number: nil,
+            payment_description: 'Money transfer',
+            end_to_end_id: end_to_end_with_text
+          )
+          message = OpenStruct.new(
+            bank_account_iban: Setting.registry_bank_account_iban_lhv || 'EE177700771001155322',
+            credit_transactions: [transaction]
+          )
+          [message]
+        end
+      end
+
+      expect_any_instance_of(PaymentLhvConnectJob).to receive(:send_transactions).with(
+        params: [params_for_sending],
+        payment_reference_number: ref
+      )
+      PaymentLhvConnectJob.perform_now
+    end
+  end
+
+  describe '#extract_reference_from_text' do
+    let(:job) { PaymentLhvConnectJob.new }
+
+    before do
+      allow(Billing::ReferenceNo).to receive(:valid?).and_call_original
+    end
+
+    it 'returns text as-is when it is already a pure reference number' do
+      ref = Billing::ReferenceNo.generate
+      result = job.send(:extract_reference_from_text, ref)
+      expect(result).to eq(ref)
+    end
+
+    it 'extracts reference number from "Ref 1234567" format' do
+      ref = Billing::ReferenceNo.generate
+      result = job.send(:extract_reference_from_text, "Ref #{ref}")
+      expect(result).to eq(ref)
+    end
+
+    it 'extracts reference number from text with prefix and suffix' do
+      ref = Billing::ReferenceNo.generate
+      result = job.send(:extract_reference_from_text, "Reference: #{ref} payment")
+      expect(result).to eq(ref)
+    end
+
+    it 'returns nil for text without any numbers' do
+      result = job.send(:extract_reference_from_text, 'No numbers here')
+      expect(result).to be_nil
+    end
+
+    it 'returns nil for empty string' do
+      result = job.send(:extract_reference_from_text, '')
+      expect(result).to be_nil
+    end
+
+    it 'returns nil for nil input' do
+      result = job.send(:extract_reference_from_text, nil)
+      expect(result).to be_nil
+    end
+
+    it 'extracts 7-digit reference number from text' do
+      result = job.send(:extract_reference_from_text, 'Ref 1234567')
+      expect(result).to eq('1234567')
+    end
+
+    it 'finds valid reference number among multiple numbers in text' do
+      ref = Billing::ReferenceNo.generate
+      result = job.send(:extract_reference_from_text, "Invoice 99 ref #{ref} amount 100")
+      expect(result).to eq(ref)
+    end
   end
 end