Skip to content

Commit bb40e33

Browse files
authored
Merge pull request #151 from internetee/end-to-end-lhv-field-parsing
end to end lhv field parsing
2 parents b24052c + 614e10b commit bb40e33

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gem 'money'
1515
gem 'countries', :require => 'countries/global'
1616
gem 'e_invoice', github: 'internetee/e_invoice', branch: :master
1717
gem 'directo', github: 'internetee/directo', branch: :master
18-
gem 'lhv', github: 'internetee/lhv', branch: 'master'
18+
gem 'lhv', github: 'internetee/lhv', branch: :master
1919
gem 'strong_migrations'
2020
gem 'figaro'
2121
gem 'capistrano'

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ GIT
1919

2020
GIT
2121
remote: https://github.com/internetee/lhv.git
22-
revision: e38afe4095e367b41151c0f14e391f6f8dcf6316
22+
revision: f1e383152dffbe00b10328abc5a2eefcf6c58dfd
2323
branch: master
2424
specs:
2525
lhv (0.1.0)
@@ -177,7 +177,7 @@ GEM
177177
activerecord (>= 5.a)
178178
database_cleaner-core (~> 2.0.0)
179179
database_cleaner-core (2.0.1)
180-
date (3.4.0)
180+
date (3.4.1)
181181
diff-lcs (1.5.0)
182182
docile (1.4.1)
183183
drb (2.2.1)
@@ -278,7 +278,7 @@ GEM
278278
listen (3.8.0)
279279
rb-fsevent (~> 0.10, >= 0.10.3)
280280
rb-inotify (~> 0.9, >= 0.9.10)
281-
logger (1.5.3)
281+
logger (1.7.0)
282282
loofah (2.23.1)
283283
crass (~> 1.0.2)
284284
nokogiri (>= 1.12.0)
@@ -297,7 +297,7 @@ GEM
297297
mutex_m (0.3.0)
298298
net-http (0.4.1)
299299
uri
300-
net-imap (0.5.1)
300+
net-imap (0.5.6)
301301
date
302302
net-protocol
303303
net-pop (0.1.2)
@@ -310,10 +310,10 @@ GEM
310310
net-protocol
311311
net-ssh (7.2.0)
312312
nio4r (2.7.4)
313-
nokogiri (1.18.1)
313+
nokogiri (1.18.7)
314314
mini_portile2 (~> 2.8.2)
315315
racc (~> 1.4)
316-
nokogiri (1.18.1-x86_64-linux-gnu)
316+
nokogiri (1.18.7-x86_64-linux-gnu)
317317
racc (~> 1.4)
318318
nori (2.6.0)
319319
omniauth (2.1.1)
@@ -352,7 +352,7 @@ GEM
352352
puma (6.5.0)
353353
nio4r (~> 2.0)
354354
racc (1.8.1)
355-
rack (2.2.10)
355+
rack (2.2.13)
356356
rack-oauth2 (2.2.0)
357357
activesupport
358358
attr_required
@@ -497,7 +497,7 @@ GEM
497497
terminal-table (3.0.2)
498498
unicode-display_width (>= 1.1.1, < 3)
499499
thor (1.3.2)
500-
timeout (0.4.2)
500+
timeout (0.4.3)
501501
turbo-rails (1.5.0)
502502
actionpack (>= 6.0.0)
503503
activejob (>= 6.0.0)
@@ -506,7 +506,7 @@ GEM
506506
concurrent-ruby (~> 1.0)
507507
unaccent (0.4.0)
508508
unicode-display_width (2.5.0)
509-
uri (0.13.0)
509+
uri (1.0.3)
510510
validate_email (0.1.6)
511511
activemodel (>= 3.0)
512512
mail (>= 2.2.5)

app/controllers/dashboard_controller.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
class DashboardController < ParentController
22
def index
3+
page = [params[:page].to_i, 1].max
34
@pagy, @invoices = pagy(Invoice.search(params),
45
items: params[:per_page] ||= 25,
6+
page:,
57
link_extra: 'data-turbo-action="advance"')
68

79
@min_amount = 0

app/jobs/payment_lhv_connect_job.rb

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,25 @@ def messages_proccess(message, registry_bank_account_iban, &block)
6565

6666
def parse_reference_number(credit_transaction)
6767
reference = ref_number_from_description(credit_transaction.payment_description)
68-
return unless valid_ref_no?(reference)
68+
if reference && valid_ref_no?(reference)
69+
Rails.logger.info "Found reference number #{reference} in payment description"
70+
ref = Reference.find_by(reference_number: reference)
71+
return reference if ref.present?
72+
end
6973

70-
ref = Reference.find_by(reference_number: reference)
71-
inform_admin(reference:, body: credit_transaction) and return nil if ref.nil?
74+
if credit_transaction.end_to_end_id.present?
75+
reference = credit_transaction.end_to_end_id
76+
Rails.logger.info "Checking end_to_end_id field for reference number: #{reference}"
77+
ref = Reference.find_by(reference_number: reference)
78+
if ref.present?
79+
Rails.logger.info "Found valid reference number in end_to_end_id field: #{reference}"
80+
return reference
81+
end
82+
end
7283

73-
reference
84+
Rails.logger.info "Reference number not found in database: #{reference}"
85+
inform_admin(reference:, body: credit_transaction)
86+
nil
7487
end
7588

7689
def ref_number_from_description(description)

0 commit comments

Comments
 (0)