bankserv 0.7.4 → 0.7.5

data/lib/bankserv/service.rb

@@ -61,9 +61,14 @@ module Bankserv
       false
     end
 
+    def next_transmission_number
+      last_successful_submission = Bankserv::Document.where(type: 'input', client_code: self.client_code, reply_status: "ACCEPTED").last
+      (last_successful_submission.transmission_number.to_i + 1).to_s
+    end
+
     def update_transmission_number!
       last_successful_submission = Bankserv::Document.where(type: 'input', client_code: self.client_code, reply_status: "ACCEPTED").last
-      config[:transmission_number] = (last_successful_submission.transmission_number.to_i + 1).to_s #(config[:transmission_number].to_i + 1).to_s
+      config[:transmission_number] = (last_successful_submission.transmission_number.to_i + 2).to_s #(config[:transmission_number].to_i + 1).to_s
       save!
     end
   

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

@@ -22,8 +22,12 @@ module Bankserv
             input_document.save!
 
             if input_document.accepted?
-              Bankserv::Service.for_client_code(input_document.client_code).active.each do |service|
-                service.update_transmission_number!
+              service.config[:transmission_number] = (transaction.data[:transmission_number].to_i + 1).to_s
+              service.save!
+              # service.reload
+              Bankserv::Service.for_client_code(input_document.client_code).active.each do |c_service|
+               c_service.config[:transmission_number] = (transaction.data[:transmission_number].to_i + 1).to_s
+               c_service.save!
               end
             end
             
@@ -59,7 +63,7 @@ module Bankserv
               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]
+                user_ref = set.contra_records.first.data[:user_ref].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|
@@ -81,7 +85,7 @@ module Bankserv
               end
             end
           when "rejected_message"
-            if transaction.data[:error_code] == "80" 
+            if transaction.data[:error_message].starts_with?("*** WARNING ONLY")
               # Warning only
               set = input_document.set_with_generation_number(transaction.data[:user_code_generation_number])
               record = set.record_with_sequence_number(transaction.data[:user_sequence_number])
@@ -124,7 +128,7 @@ module Bankserv
                 next if set.contra_records.empty?
 
                 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]
+                user_ref = set.contra_records.first.data[:user_ref].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|
@@ -138,7 +142,7 @@ module Bankserv
 
               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]
+                user_ref = set.contra_records.first.data[:user_ref].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|

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

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

@@ -346,4 +346,52 @@ describe Bankserv::ReplyDocument do
       Bankserv::Credit.where(status: 'warning').first.response.first[:error_code].should == "80"
     end
   end
+
+  context "Fix bug where transmission number not being updated after accepted reply file received" do
+    before(:all) do
+      @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: "376", sequence_number: 57, active: true)
+
+      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_long.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::InputDocument.last.update_attributes(client_code: '04136')
+
+      Bankserv::Credit.all.each {|x| x.status="pending";x.save!}
+
+      @file_contents = File.open("./spec/examples/reply/reply_long.txt", "rb").read
+      
+      @document = Bankserv::ReplyDocument.store(@file_contents)
+      @document.process!
+      @cs.reload
+    end
+
+    it "should bump the credit service trans number to 377" do
+      Bankserv::CreditService.last.config[:transmission_number].should == "377"
+    end
+
+    it "should not have any rejected credits" do
+      Bankserv::Credit.where(status: 'rejected').count.should == 0
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Jeffrey van Aswegen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-08-01 00:00:00 +02:00
+date: 2014-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency