Merge pull request #157 from internetee/e_invoice-retry-job-when-error-occur

implement retry functional when e-invoice job failed

Author: vohmar

Gemfile.lock

@@ -114,20 +114,21 @@ GEM
       mutex_m
       securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     airbrussh (1.5.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    akami (1.3.1)
+    akami (1.3.3)
+      base64
       gyoku (>= 0.4.0)
       nokogiri
     apipie-rails (1.4.2)
       actionpack (>= 5.0)
       activesupport (>= 5.0)
     ast (2.4.2)
     attr_required (1.0.1)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.19)
     benchmark (0.4.0)
     better_html (2.0.2)
@@ -137,7 +138,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     bindata (2.5.0)
     bootsnap (1.17.0)
       msgpack (~> 1.2)
@@ -221,12 +222,14 @@ GEM
       railties (>= 5.0.0)
     faker (3.2.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.13.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.1.0)
-      net-http
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
     ffi (1.16.3)
     figaro (1.2.0)
       thor (>= 0.14.0, < 2)
@@ -242,8 +245,11 @@ GEM
       rails (>= 6.0.0)
       stimulus-rails
       turbo-rails
-    httpi (3.0.1)
-      rack
+    httpi (4.0.4)
+      base64
+      mutex_m
+      nkf
+      rack (>= 2.0, < 4)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.13)
@@ -265,7 +271,7 @@ GEM
     irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.6.3)
+    json (2.13.1)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -289,15 +295,15 @@ GEM
       net-smtp
     marcel (1.0.4)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.4)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     msgpack (1.7.2)
     mutex_m (0.3.0)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
-    net-imap (0.5.6)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -306,16 +312,18 @@ GEM
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     net-ssh (7.2.0)
     nio4r (2.7.4)
-    nokogiri (1.18.7)
+    nkf (0.2.0)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    nori (2.6.0)
+    nori (2.7.1)
+      bigdecimal
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -348,11 +356,11 @@ GEM
       activesupport (>= 5.2)
     psych (5.2.0)
       stringio
-    public_suffix (5.0.3)
+    public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.17)
     rack-oauth2 (2.2.0)
       activesupport
       attr_required
@@ -452,15 +460,15 @@ GEM
       rubocop (>= 1.33.0, < 2.0)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    savon (2.14.0)
+    savon (2.15.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
-      httpi (>= 2.4.5)
+      httpi (>= 4, < 5)
       mail (~> 2.5)
       nokogiri (>= 1.8.1)
       nori (~> 2.4)
-      wasabi (~> 3.4)
+      wasabi (>= 3.7, < 6)
     securerandom (0.4.1)
     selenium-webdriver (4.10.0)
       rexml (~> 3.2, >= 3.2.5)
@@ -496,7 +504,7 @@ GEM
       faraday-follow_redirects
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.2)
+    thor (1.4.0)
     timeout (0.4.3)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
@@ -513,10 +521,10 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    wasabi (3.8.0)
+    wasabi (5.1.0)
       addressable
-      httpi (~> 3.0)
-      nokogiri (>= 1.4.2)
+      faraday (>= 1.9, < 3)
+      nokogiri (>= 1.13.9)
     webdrivers (5.3.1)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)

app/jobs/send_e_invoice_job.rb

@@ -4,6 +4,9 @@ class SendEInvoiceJob < ApplicationJob
   def perform(e_invoice_data)
     Rails.logger.info "Started to process e-invoice for invoice_id #{e_invoice_data[:invoice_data][:id]}"
     process(e_invoice_data)
+  rescue Savon::SOAPFault => e
+    log_error(invoice: e_invoice_data[:invoice_data][:id], error: e)
+    retry_job wait: 1.minute, attempts: 3
   rescue StandardError => e
     log_error(invoice: e_invoice_data[:invoice_data][:id], error: e)
     raise e
@@ -19,9 +22,9 @@ def process(e_invoice_data)
     message = data.to_hash[:e_invoice_response][:message]
 
     if message.include? 'Success'
-      EInvoiceResponseSender.send_request(invoice_number: invoice_number,
+      EInvoiceResponseSender.send_request(invoice_number:,
                                           initiator: e_invoice_data[:initiator])
-      invoice = Invoice.find_by(invoice_number: invoice_number)
+      invoice = Invoice.find_by(invoice_number:)
       invoice&.update(sent_at_omniva: Time.zone.now)
     else
       Rails.logger.info 'FAILED IN EINVOICE OMNIVA TRANSFER'

spec/jobs/payment_lhv_connect_job_spec.rb

@@ -238,5 +238,105 @@
       )
       PaymentLhvConnectJob.perform_now
     end
+
+    it 'should find reference number in end_to_end_id when not found in payment description' do
+      ref = Billing::ReferenceNo.generate
+      Reference.create(reference_number: ref, initiator: 'registry')
+
+      date = Time.zone.now - 4.hours
+      params_for_sending = OpenStruct.new(
+        amount: '10.0', 
+        currency: 'EUR', 
+        date: date, 
+        payment_reference_number: ref,
+        payment_description: 'Money transfer without reference',
+        end_to_end_id: ref
+      )
+
+      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 without reference',
+            end_to_end_id: ref
+          )
+          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 not process transaction when end_to_end_id is present but not in database' do
+      invalid_ref = '12345678'
+      date = Time.zone.now - 4.hours
+
+      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 without valid reference',
+            end_to_end_id: invalid_ref
+          )
+          message = OpenStruct.new(
+            bank_account_iban: Setting.registry_bank_account_iban_lhv || 'EE177700771001155322',
+            credit_transactions: [transaction]
+          )
+          [message]
+        end
+      end
+
+      expect_any_instance_of(BillingMailer).to receive(:inform_admin).with(
+        reference_number: invalid_ref, 
+        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 not process transaction when neither payment description nor end_to_end_id contain valid reference' do
+      date = Time.zone.now - 4.hours
+
+      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 without any reference',
+            end_to_end_id: nil
+          )
+          message = OpenStruct.new(
+            bank_account_iban: Setting.registry_bank_account_iban_lhv || 'EE177700771001155322',
+            credit_transactions: [transaction]
+          )
+          [message]
+        end
+      end
+
+      expect_any_instance_of(BillingMailer).to receive(:inform_admin).with(
+        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
   end
 end

spec/jobs/send_e_invoice_job_spec.rb

@@ -1,4 +1,6 @@
 require 'rails_helper'
+require 'httpi'   # HTTPI::Response
+require 'nori'    # Nori для парсинга SOAP
 
 RSpec.describe "SendEInvoiceJob", type: :job do
   let!(:admin) { create(:user) }
@@ -67,5 +69,42 @@
 
       expect { SendEInvoiceJob.perform_now(params) }.to change { ActionMailer::Base.deliveries.count }.by(1)
     end
+
+    it 'retries the job when Savon::SOAPFault is raised' do
+      params = {
+        invoice_data: {
+          id: '2',
+          number: invoice.invoice_number,
+        }
+      }
+
+      fault_xml = <<~XML
+        <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+          <soap:Body>
+            <soap:Fault>
+              <faultcode>Server</faultcode>
+              <faultstring>Something went wrong</faultstring>
+            </soap:Fault>
+          </soap:Body>
+        </soap:Envelope>
+      XML
+
+      real_response = HTTPI::Response.new(500, {}, fault_xml)
+      soap_fault    = Savon::SOAPFault.new(real_response, Nori.new)
+
+      allow_any_instance_of(SendEInvoiceJob)
+        .to receive(:process)
+        .and_raise(soap_fault)
+
+      job = SendEInvoiceJob.new
+
+      expect(job)
+        .to receive(:retry_job)
+        .with(wait: 1.minute, attempts: 3)
+
+      # просто запускаем – никаких SOAPFault наружу не уходит
+      expect { job.perform(params) }.not_to raise_error
+    end
+
   end
 end