From 8b93c1a9770bc70f19618fb4e83e64b5367e77dc Mon Sep 17 00:00:00 2001 From: Steven Farlie Date: Thu, 1 Feb 2024 22:42:23 +0000 Subject: [PATCH] hack fix with verified correct database and files --- config/bsb_bank_list.json | 5 +- config/bsb_db.json | 198 ++++++++++++++++---------------------- lib/auspaynet/client.rb | 2 +- lib/tasks/bsb_tasks.rake | 7 +- 4 files changed, 90 insertions(+), 122 deletions(-) diff --git a/config/bsb_bank_list.json b/config/bsb_bank_list.json index 72f5ff2..0b44940 100644 --- a/config/bsb_bank_list.json +++ b/config/bsb_bank_list.json @@ -30,6 +30,7 @@ "255": "BPS BNP Paribas Securities Services", "813": "Capricornian Ltd (The)", "888": "China Construction Bank Corporation, Sydney Branch", + "681": "China Everbright Bank Co Ltd", "512": "Community First Credit Union Limited", "510": "Citibank N.A.", "24": "CTI Citibank N.A.", @@ -92,7 +93,7 @@ "514": "Members Banking Group Limited Trading as RACQ Bank", "724": "Railways Credit Union Limited t/a MOVE Bank", "932": "Regional Australia Bank Limited", - "721": "Regional Australia Bank Limited", + "721": "HCC Regional Australia Bank Limited", "09": "Reserve Bank of Australia", "655": "MyState Bank Limited", "43": "Standard Chartered Bank, Australia Branch", @@ -100,7 +101,7 @@ "840": "Zepto Payments Pty Ltd", "913": "State Street Bank and Trust Company", "911": "Sumitomo Mitsui Banking Corporation", - "728": "Summerland Financial Servces Limited (Trading as Summerland Credit Union)", + "728": "Summerland Financial Servces Limited (Trading as Summerland Bank)", "825": "Australian Unity Bank Limited", "48": "Suncorp-Metway Limited", "66": "SUN Suncorp-Metway Limited", diff --git a/config/bsb_db.json b/config/bsb_db.json index b922024..f338808 100644 --- a/config/bsb_db.json +++ b/config/bsb_db.json @@ -11512,11 +11512,11 @@ ], "016412": [ "ANZ", - "Merged", - "Refer to BSB 016-334", - "Innaloo", + "Osborne Park", + "15 Hutton Street", + "Osborne Park", "WA", - "6018", + "6017", "PEH" ], "016416": [ @@ -12626,15 +12626,6 @@ "2000", " EH" ], - "017909": [ - "ANZ", - "ONETWO FUND 1 PTY LTD", - "(Corp ARM to 017000)", - "Sydney", - "NSW", - "2000", - " E " - ], "017989": [ "ANZ", "Bank of Taiwan", @@ -30304,11 +30295,11 @@ ], "062148": [ "CBA", - "Coogee", - "199 Coogee Bay Road", - "Coogee", + "Randwick", + "Ground floor, 92-94 Belmore Road", + "Randwick", "NSW", - "2034", + "2031", "PEH" ], "062149": [ @@ -42121,11 +42112,11 @@ ], "064410": [ "CBA", - "Coolangatta", - "Sh3&4, The Strand, 72-80 Marine Pde", - "Coolangatta", - "QLD", - "4225", + "Tweed City Shopping Centre", + "Shop 25 Tweed City 54 Minjungbal Dr", + "Tweed Heads South", + "NSW", + "2486", "PEH" ], "064411": [ @@ -43516,8 +43507,8 @@ ], "065004": [ "CBA", - "Rundle Mall Adelaide", - "136 Rundle Mall", + "96 King William Street Adelaide", + "96 King William Street", "Adelaide", "SA", "5000", @@ -55479,7 +55470,7 @@ "NAB", "Geelong Office", "East 16 13-35 Mackey St", - "North Geelong", + "Geelong North", "VIC", "3215", "PEH" @@ -55497,7 +55488,7 @@ "NAB", "Geelong BBC2", "East 16 13-35 Mackey St", - "North Geelong", + "Geelong North", "VIC", "3215", "PEH" @@ -58278,7 +58269,7 @@ "NAB", "Geelong BBC", "East 16 13-35 Mackey St", - "North Geelong", + "Geelong North", "VIC", "3215", "PEH" @@ -75356,33 +75347,6 @@ "6000", "PEH" ], - "248001": [ - "CTI", - "Mana Payment Australia Pty Ltd", - "Level 24, 2 Park St", - "Sydney", - "NSW", - "2000", - " EH" - ], - "248002": [ - "CTI", - "Mana Payment Australia Pty Ltd", - "Level 24, 2 Park St", - "Sydney", - "NSW", - "2000", - " EH" - ], - "248003": [ - "CTI", - "Mana Payment Australia Pty Ltd", - "Level 24, 2 Park St", - "Sydney", - "NSW", - "2000", - " EH" - ], "248004": [ "CTI", "Mana Payment Australia Pty Ltd", @@ -75392,33 +75356,6 @@ "2000", " EH" ], - "248005": [ - "CTI", - "Mana Payment Australia Pty Ltd", - "Level 24, 2 Park St", - "Sydney", - "NSW", - "2000", - " EH" - ], - "248006": [ - "CTI", - "Mana Payment Australia Pty Ltd", - "Level 24, 2 Park St", - "Sydney", - "NSW", - "2000", - " EH" - ], - "248007": [ - "CTI", - "Mana Payment Australia Pty Ltd", - "Level 24, 2 Park St", - "Sydney", - "NSW", - "2000", - " EH" - ], "248008": [ "CTI", "Air Liquide Australia Ltd", @@ -75466,7 +75403,7 @@ ], "248013": [ "CTI", - "PINGPONG GLOBAL TECHNOLOGY LTD", + "Mana Payment Australia Pty Ltd", "Level 24, 2 Park St", "Sydney", "NSW", @@ -75475,7 +75412,7 @@ ], "248014": [ "CTI", - "PINGPONG GLOBAL TECHNOLOGY LTD", + "Mana Payment Australia Pty Ltd", "Level 24, 2 Park St", "Sydney", "NSW", @@ -80866,20 +80803,20 @@ ], "342082": [ "HBA", - "HSBC Ashfield", - "2/3 Ashfield Mall 260A Liverpool Rd", - "Ashfield", + "Burwood", + "Ground Floor, 202 Burwood Road", + "Burwood", "NSW", - "2131", + "2134", "PEH" ], "342083": [ "HBA", - "North Sydney", - "51 Mount Street", - "North Sydney", + "Barangaroo", + "C1.03, Daramu House 1 Sussex St", + "Barangaroo", "NSW", - "2060", + "2000", "PEH" ], "342085": [ @@ -82027,11 +81964,11 @@ ], "343008": [ "HBA", - "Camberwell", - "S19-20CamberwellArd600-606 Burke Rd", - "Camberwell", + "South Yarra", + "Shop 1, 241 Toorak Road", + "South Yarra", "VIC", - "3124", + "3141", "PEH" ], "343009": [ @@ -82054,11 +81991,11 @@ ], "343020": [ "HBA", - "Eastland Branch", - "Sh1086Eastland S/C175Maroondah Hway", - "Ringwood", + "Box Hill Branch", + "23 Carrington Road", + "Box Hill", "VIC", - "3134", + "3128", "PEH" ], "343028": [ @@ -93599,6 +93536,24 @@ "2600", " E " ], + "572505": [ + "ASL", + "Finmo Corporate", + "Suite 162, 202 Victoria Rd", + "Drummoyne", + "NSW", + "2047", + " EH" + ], + "572506": [ + "ASL", + "Finmo Customer", + "Suite 162, 202 Victoria Rd", + "Drummoyne", + "NSW", + "2047", + " EH" + ], "573001": [ "ASL", "Australian Settlements Limited - SP", @@ -119467,11 +119422,11 @@ ], "762148": [ "CBA", - "Coogee", - "199 Coogee Bay Road", - "Coogee", + "Randwick", + "Ground floor, 92-94 Belmore Road", + "Randwick", "NSW", - "2034", + "2031", "PEH" ], "762149": [ @@ -129988,11 +129943,11 @@ ], "764410": [ "CBA", - "Coolangatta", - "Sh3&4, The Strand, 72-80 Marine Pde", - "Coolangatta", - "QLD", - "4225", + "Tweed City Shopping Centre", + "Shop 25 Tweed City 54 Minjungbal Dr", + "Tweed Heads South", + "NSW", + "2486", "PEH" ], "764411": [ @@ -131230,8 +131185,8 @@ ], "765004": [ "CBA", - "Rundle Mall Adelaide", - "136 Rundle Mall", + "96 King William Street Adelaide", + "96 King William Street", "Adelaide", "SA", "5000", @@ -135440,6 +135395,15 @@ "2148", "PEH" ], + "802872": [ + "CRU", + "Credit Corp Financial Services", + "Level 15, 201 Kent Street", + "Sydney", + "NSW", + "2000", + " E " + ], "802876": [ "CRU", "First Option Bank Ltd", @@ -136900,11 +136864,11 @@ ], "806025": [ "CRU", - "Statewest / Home Building Society", - "111 St Georges Terrace", - "Perth", - "WA", - "6000", + "Bank of Queensland", + "100 Skyring Terrace", + "Newstead", + "QLD", + "4006", " E " ], "806028": [ @@ -137683,7 +137647,7 @@ ], "808256": [ "CRU", - "ZAI Australia", + "Guardhouse", "(Agency to 803320)", "Melbourne", "VIC", @@ -137692,7 +137656,7 @@ ], "808257": [ "CRU", - "ZAI Australia", + "Xpress Sewa", "(Agency to 803320)", "Melbourne", "VIC", diff --git a/lib/auspaynet/client.rb b/lib/auspaynet/client.rb index f0d0093..d0be30e 100644 --- a/lib/auspaynet/client.rb +++ b/lib/auspaynet/client.rb @@ -25,7 +25,7 @@ def list(dir:, matching_filename:, file_format: 'csv') files = @ftp.nlst.select do |f| f.include?(matching_filename) && f.include?(file_format) && - f.include?(current_year) + (f.include?("#{current_year}-") || f.include?("#{current_year})")) end extract_latest_files(files: files, file_format: file_format) diff --git a/lib/tasks/bsb_tasks.rake b/lib/tasks/bsb_tasks.rake index 5cbdb33..14dfcea 100644 --- a/lib/tasks/bsb_tasks.rake +++ b/lib/tasks/bsb_tasks.rake @@ -15,12 +15,15 @@ namespace :bsb do raise 'No bank list or bsb found' unless bank_list_filename || db_list_filename + puts "Bank list file: '#{bank_list_filename}'" + puts "DB file: '#{db_list_filename}'" + if bank_list_filename require 'bsb/bank_list_generator' bsb_bl_gen = BSB::BankListGenerator.load_file(bank_list_filename) File.write('config/bsb_bank_list.json', bsb_bl_gen.json) else - $stderr.puts 'Missing bank list "KEY TO ABBREVIATIONS AND BSB NUMBERS"' + warn 'Missing bank list "KEY TO ABBREVIATIONS AND BSB NUMBERS"' end if db_list_filename @@ -28,7 +31,7 @@ namespace :bsb do bsb_db_gen = BSB::DatabaseGenerator.load_file(db_list_filename) File.write('config/bsb_db.json', bsb_db_gen.json) else - $stderr.puts 'Missing bsb db "BSBDirectory"' + warn 'Missing bsb db "BSBDirectory"' end end end