bankserv 0.7.0 → 0.7.1

data/lib/bankserv/transmission/set/reply.rb

@@ -11,6 +11,7 @@ module Bankserv
 
         rejections = []
         records_with_errors = []
+        reply_file_rejected = false
 
         transactions.each do |transaction|
           case transaction.record_type
@@ -27,10 +28,19 @@ module Bankserv
             end
             
           when "transmission_rejected_reason"
+            reply_file_rejected = true
+
             input_document.error = {
               code: transaction.data[:error_code],
               message: transaction.data[:error_message]
             }
+
+            if service.is_a?(Bankserv::CreditService) && transaction.data[:error_code] == "6"
+              # transmission number is incorrect, fetch the last accepted input file trans number and increment by 1
+              last_successful_submission = Bankserv::Document.where(type: 'input', client_code: service.client_code, reply_status: "ACCEPTED").last
+              service.config[:transmission_number] = (last_successful_submission.transmission_number.to_i + 1).to_s
+              service.save!
+            end
             
             input_document.save!
           when "ahv_status"
@@ -42,6 +52,22 @@ module Bankserv
             set = input_document.set_with_generation_number(transaction.data[:user_code_generation_number])
             set.reply_status = transaction.data[:user_set_status]
             set.save!
+
+            if reply_file_rejected
+              rejections << transaction
+
+              if service.is_a? Bankserv::CreditService
+                set = input_document.set_with_generation_number(transaction.data[:user_code_generation_number])
+                next if set.contra_records.empty?
+                user_ref = set.contra_records.first.reference.match(/CONTRA([0-9]*)/)[1]
+                request_id = Bankserv::Credit.where(user_ref: user_ref)[0].bankserv_request_id
+
+                Bankserv::Credit.where(bankserv_request_id: request_id).each do |credit|
+                  credit.renew!
+                end
+              end
+
+            end
           when "accepted_report_reply"
             # what do we do here.. what is an accepted report reply?
             if transaction.data[:accepted_report_transaction][4,2] == "12" # Contra record
@@ -106,28 +132,13 @@ module Bankserv
 
         unless rejections.empty?
           service.config[:generation_number] = rejections.first.data[:user_code_generation_number].to_i
-          service.config[:sequence_number] = rejections.first.data[:user_sequence_number].to_i
+          unless rejections.first.data.has_key?(:user_sequence_number) # Transmission number out of sequence, reset to 1
+            service.config[:sequence_number] = 1
+          else
+            service.config[:sequence_number] = rejections.first.data[:user_sequence_number].to_i
+          end
           service.save!
         end
-
-        #records_with_errors.uniq.each do |rwe|
-
-        #end
-        # rejections.each do |rejection|
-
-        #   set = input_document.set_with_generation_number(rejection.data[:user_code_generation_number])
-        #   user_ref = set.contra_records.first.reference.match(/CONTRA([0-9]*)/)[1]
-        #   request_id = Bankserv::Credit.where(user_ref: user_ref)[0].bankserv_request_id
-        #   # if service.is_a? Bankserv::CreditService
-        #   #   set = input_document.set_with_generation_number(transaction.data[:user_code_generation_number])
-        #   #   user_ref = set.contra_records.first.reference.match(/CONTRA([0-9]*)/)[1]
-        #   #   request_id = Bankserv::Credit.where(user_ref: user_ref)[0].bankserv_request_id
-
-        #   #   Bankserv::Credit.where(bankserv_request_id: request_id).each do |credit|
-        #   #     credit.renew!
-        #   #   end
-        #   # end
-        # end
       end
     end
   end

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/examples/input_with_wrong_trans_num.txt

@@ -0,0 +1,6 @@
+000L2014072604136RENTAL CONNECT PTY LTD        000036900000                                                                                                                       2431                
+020L04A8551407261407261407261407260000016535BATCH     YY                                                                                                                                              
+020L1063200504079323748A85500000125400562270571576100000225194140726880   RAWSONPROP001701              LA HABANA BODY CORPORATE      00000000000000000000                21                          
+020L1263200504079323748A85500000263200504079323748100000225194140726100000RAWSONPROPCONTRA6631                                                                                                        
+020L92A855000001000002140726140726000001000001000001000000225194000000225194066349895324                                                                                                              
+999L000000006                                                                                                                                                                                         

data/spec/examples/reply/transnumber_wrong.txt

@@ -0,0 +1,5 @@
+000L2014072600000RENTAL CONNECT PTY LTD        000000004136                                                                                                                       2431                
+900L000 TRANSMISSION 04136-0000369 REJECTED                                                                                                                                                           
+901L000 00006-*** TRANS. NUMBER NOT NEXT IN SEQUENCE ***                                                                                                                                              
+900L020 ACB USER SET A855-0006535-000002 ACCEPTED                                                                                                                                                     
+999L000000005                                                                                                                                                                                         

data/spec/lib/bankserv/transmission/reply_document_spec.rb

@@ -243,6 +243,64 @@ describe Bankserv::ReplyDocument do
     end
 
   end
+
+  context "Process a reply file with trans number not next in sequence" do
+
+    before(:each) do
+      tear_it_down
+      @cs = Bankserv::CreditService.register(client_code: '04136', client_name: "RENTAL CONNECT PTY LTD", client_abbreviated_name: 'RAWSONPROP', user_code: "A855", generation_number: 6365, transmission_status: "L", transmission_number: "369", sequence_number: 57)
+
+      Bankserv::Document.create!(type: "input", set_id: 18242, processed: true, transmission_status: "L", rec_status: "L", transmission_number: "367", reply_status: "ACCEPTED", error: nil, created_at: "2014-07-25 15:10:24", updated_at: "2014-07-25 16:30:22", client_code: "04136", user_ref: "2426")
+      @file_contents = File.open("./spec/examples/input_with_wrong_trans_num.txt", "rb").read
+      @input_document = Bankserv::InputDocument.store(@file_contents)
+
+      options = Absa::H2h::Transmission::Document.hash_from_s(@file_contents, 'input')
+      options[:data].each do |entry|
+        if entry[:data].count == 4
+          c = entry[:data].map {|x| x[:data]}
+          request = Bankserv::Request.create!({
+            type: "credit",
+            data: {
+              :type_of_service=>"BATCH", 
+              :batches=>[{
+                :debit=>{:account_number=>c[2][:homing_account_number], :id_number=>"", :initials=>"", :account_name=>c[2][:homing_account_name], :branch_code=>c[2][:homing_branch], :account_type=>"cheque", :amount=>c[2][:amount], :user_ref=>c[2][:user_ref].gsub("RAWSONPROPCONTRA", ""), :action_date=>"2014-07-15".to_date}, 
+                :credit=>{:account_number=>c[1][:homing_account_number], :id_number=>"", :initials=>"", :account_name=>c[1][:homing_account_name], :branch_code=>c[1][:homing_branch], :account_type=>"cheque", :amount=>c[1][:amount], :user_ref=>c[1][:user_ref].gsub("RAWSONPROP", ""), :action_date=>"2014-07-15".to_date}
+              }]
+            }
+          })
+
+          request.service_id = @cs.id
+          request.save!
+        end
+      end
+
+      Bankserv::Credit.all.each {|x| x.status="pending";x.save!}
+
+      @file_contents = File.open("./spec/examples/reply/transnumber_wrong.txt", "rb").read
+      
+      @document = Bankserv::ReplyDocument.store(@file_contents)
+      @document.process!
+      @cs.reload
+    end
+
+    it "should reverse the credit service transmission number by 1" do
+      Bankserv::CreditService.last.config[:transmission_number].should == "368"
+    end
+
+    it "should reset the generation number" do
+      Bankserv::CreditService.last.config[:generation_number].should == 6535
+    end
+
+    it "should reset the user sequence number" do
+      Bankserv::CreditService.last.config[:sequence_number].should == 1
+    end
+
+    it "should resubmit the credits" do
+      Bankserv::Credit.all.each do |credit|
+        credit.status.should == "new"
+      end
+    end
+  end
   
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Jeffrey van Aswegen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-07-22 00:00:00 +02:00
+date: 2014-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,6 +186,7 @@ files:
 - spec/examples/empty_output.txt
 - spec/examples/failed_output_file.txt
 - spec/examples/host2host/tmp.log
+- spec/examples/input_with_wrong_trans_num.txt
 - spec/examples/notify_me.xml
 - spec/examples/notify_me_with_one_record.xml
 - spec/examples/reply/accepted_and_rejected_transactions.txt
@@ -193,6 +194,7 @@ files:
 - spec/examples/reply/rejected_transmission.txt
 - spec/examples/reply/reply2.txt
 - spec/examples/reply/reply_file.txt
+- spec/examples/reply/transnumber_wrong.txt
 - spec/examples/simple_input_file.txt
 - spec/examples/statement4_unpacked.dat
 - spec/examples/tmp/OUTPUT0412153500.txt
@@ -270,6 +272,7 @@ test_files:
 - spec/examples/empty_output.txt
 - spec/examples/failed_output_file.txt
 - spec/examples/host2host/tmp.log
+- spec/examples/input_with_wrong_trans_num.txt
 - spec/examples/notify_me.xml
 - spec/examples/notify_me_with_one_record.xml
 - spec/examples/reply/accepted_and_rejected_transactions.txt
@@ -277,6 +280,7 @@ test_files:
 - spec/examples/reply/rejected_transmission.txt
 - spec/examples/reply/reply2.txt
 - spec/examples/reply/reply_file.txt
+- spec/examples/reply/transnumber_wrong.txt
 - spec/examples/simple_input_file.txt
 - spec/examples/statement4_unpacked.dat
 - spec/examples/tmp/OUTPUT0412153500.txt