Merge pull request #151 from internetee/end-to-end-lhv-field-parsing

end to end lhv field parsing

Author: vohmar

Gemfile

@@ -15,7 +15,7 @@ gem 'money'
 gem 'countries', :require => 'countries/global'
 gem 'e_invoice', github: 'internetee/e_invoice', branch: :master
 gem 'directo', github: 'internetee/directo', branch: :master
-gem 'lhv', github: 'internetee/lhv', branch: 'master'
+gem 'lhv', github: 'internetee/lhv', branch: :master
 gem 'strong_migrations'
 gem 'figaro'
 gem 'capistrano'

Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 
 GIT
   remote: https://github.com/internetee/lhv.git
-  revision: e38afe4095e367b41151c0f14e391f6f8dcf6316
+  revision: f1e383152dffbe00b10328abc5a2eefcf6c58dfd
   branch: master
   specs:
     lhv (0.1.0)
@@ -177,7 +177,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.0)
+    date (3.4.1)
     diff-lcs (1.5.0)
     docile (1.4.1)
     drb (2.2.1)
@@ -278,7 +278,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.3)
+    logger (1.7.0)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -297,7 +297,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.4.1)
       uri
-    net-imap (0.5.1)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -310,10 +310,10 @@ GEM
       net-protocol
     net-ssh (7.2.0)
     nio4r (2.7.4)
-    nokogiri (1.18.1)
+    nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.7-x86_64-linux-gnu)
       racc (~> 1.4)
     nori (2.6.0)
     omniauth (2.1.1)
@@ -352,7 +352,7 @@ GEM
     puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.13)
     rack-oauth2 (2.2.0)
       activesupport
       attr_required
@@ -497,7 +497,7 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
-    timeout (0.4.2)
+    timeout (0.4.3)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -506,7 +506,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (1.0.3)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)

app/controllers/dashboard_controller.rb

@@ -1,7 +1,9 @@
 class DashboardController < ParentController
   def index
+    page = [params[:page].to_i, 1].max
     @pagy, @invoices = pagy(Invoice.search(params),
                             items: params[:per_page] ||= 25,
+                            page:,
                             link_extra: 'data-turbo-action="advance"')
 
     @min_amount = 0

app/jobs/payment_lhv_connect_job.rb

@@ -65,12 +65,25 @@ def messages_proccess(message, registry_bank_account_iban, &block)
 
   def parse_reference_number(credit_transaction)
     reference = ref_number_from_description(credit_transaction.payment_description)
-    return unless valid_ref_no?(reference)
+    if reference && valid_ref_no?(reference)
+      Rails.logger.info "Found reference number #{reference} in payment description"
+      ref = Reference.find_by(reference_number: reference)
+      return reference if ref.present?
+    end
 
-    ref = Reference.find_by(reference_number: reference)
-    inform_admin(reference:, body: credit_transaction) and return nil if ref.nil?
+    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
+    end
 
-    reference
+    Rails.logger.info "Reference number not found in database: #{reference}"
+    inform_admin(reference:, body: credit_transaction)
+    nil
   end
 
   def ref_number_from_description(description)