bankserv 0.4.7 → 0.4.8

data/lib/bankserv/account_holder_verification.rb

@@ -11,17 +11,6 @@ module Bankserv
     scope :internal, where(internal: true)
     scope :external, where(internal: false)
     
-    after_create :generate_internal_user_ref
-    
-    def generate_internal_user_ref
-      self.internal_user_ref = Bankserv::AccountHolderVerification.generate_reference_number(self)
-      save!
-    end
-    
-    def self.generate_reference_number(ahv)
-      "AHV#{ahv.id}"
-    end
-    
     def self.service
       Bankserv::AHVService.where(active: true).last
     end
@@ -30,10 +19,6 @@ module Bankserv
       self.where(:user_ref => reference)
     end
     
-    def self.for_internal_reference(reference)
-      self.where(:internal_user_ref => reference)
-    end
-    
     def self.build!(options)
       bank_account = BankAccount.new(options.delete(:bank_account))
       is_internal = bank_account.branch_code == self.service.config[:internal_branch_code]

data/lib/bankserv/credit.rb

@@ -9,8 +9,6 @@ module Bankserv
     belongs_to :bank_account, :foreign_key => 'bankserv_bank_account_id'
     belongs_to :request, :foreign_key => 'bankserv_request_id'
     
-    after_create :generate_internal_user_ref
-    
     def self.bankserv_service
       Bankserv::CreditService.where(active: true).last
     end
@@ -19,19 +17,10 @@ module Bankserv
       Bankserv::Credit.bankserv_service
     end
     
-    def generate_internal_user_ref
-      self.internal_user_ref = "CREDIT#{id}"
-      save!
-    end
-    
     def self.for_reference(reference)
       self.where(:user_ref => reference)
     end
     
-    def self.for_internal_reference(reference)
-      self.where(:internal_user_ref => reference)
-    end
-    
     def new?
       status == "new"
     end
@@ -74,7 +63,5 @@ module Bankserv
         self.bank_account
       end
     end
-    
   end
-  
 end

data/lib/bankserv/debit.rb

@@ -9,8 +9,6 @@ module Bankserv
     belongs_to :bank_account, :foreign_key => 'bankserv_bank_account_id'
     belongs_to :request, :foreign_key => 'bankserv_request_id'
     
-    after_create :generate_internal_user_ref
-    
     def self.bankserv_service
       Bankserv::DebitService.where(active: true).last
     end
@@ -19,11 +17,6 @@ module Bankserv
       Bankserv::Debit.bankserv_service
     end
     
-    def generate_internal_user_ref
-      self.internal_user_ref = "DEBIT#{id}"
-      save!  
-    end
-    
     def standard?
       record_type == "standard"
     end
@@ -54,10 +47,6 @@ module Bankserv
       self.where(:user_ref => reference)
     end
     
-    def self.for_internal_reference(reference)
-      self.where(:internal_user_ref => reference)
-    end
-    
     def process_response(data)
       save_data = if data[:response_status] == 'unpaid'
         {

data/lib/bankserv/eft.rb

@@ -85,9 +85,5 @@ module Bankserv
       Debit.for_reference(reference) + Credit.for_reference(reference)
     end
     
-    def self.for_internal_reference(reference)
-      Debit.for_internal_reference(reference) + Credit.for_internal_reference(reference)
-    end
-    
   end
 end

data/lib/bankserv/service.rb

@@ -4,6 +4,8 @@ module Bankserv
     
     has_many :requests
     serialize :config
+
+    scope :for_client_code, lambda {|client_code| where(client_code: client_code)}
     
     def self.register(params)
       s = new
@@ -54,6 +56,11 @@ module Bankserv
     def can_transmit?
       false
     end
+
+    def update_transmission_number!
+      config[:transmission_number] = (config[:transmission_number].to_i + 1).to_s
+      save!
+    end
   
   end
   
@@ -90,7 +97,15 @@ module Bankserv
     
     def can_transmit?
       true
-    end  
+    end 
+
+    def has_work?
+      if self.config[:internal]
+        Bankserv::AccountHolderVerification.internal.unprocessed.count > 0
+      else
+        Bankserv::AccountHolderVerification.external.unprocessed.count > 0
+      end
+    end
   end
   
   class StatementService < Service

data/lib/bankserv/transmission/document.rb

@@ -38,7 +38,5 @@ module Bankserv
     def set_with_generation_number(generation_number)
       sets.select{|set| set.generation_number == generation_number}.first
     end
-  
   end
-  
 end

data/lib/bankserv/transmission/input_document.rb

@@ -37,6 +37,10 @@ class Bankserv::InputDocument < Bankserv::Document
   def self.has_test_work?
     sets_with_test_work.any?
   end
+
+  def accepted?
+    reply_status == "ACCEPTED"
+  end
   
   def self.generate!(bankserv_service)
     if bankserv_service.is_test_env?
@@ -49,7 +53,14 @@ class Bankserv::InputDocument < Bankserv::Document
     options.merge! rec_status: bankserv_service.config[:transmission_status]
     options.merge! client_code: bankserv_service.client_code
     options.merge! client_name: bankserv_service.config[:client_name]
-    options.merge! th_for_use_of_ld_user: ""
+    options.merge! th_for_use_of_ld_user: bankserv_service.config[:transmission_number]
+
+    if bankserv_service.config.has_key? :internal
+      # swap the internal status and check if the service has any work.
+      bankserv_service.config[:internal] = !bankserv_service.config[:internal]
+      bankserv_service.save
+      return unless bankserv_service.has_work?
+    end
     
     transmission_status = bankserv_service.config[:transmission_status]
     raise "Transmission status not specified" if transmission_status.nil?
@@ -75,8 +86,11 @@ class Bankserv::InputDocument < Bankserv::Document
     input_sets.select!{|s| s.bankserv_service.client_code == bankserv_service.client_code}
     return unless input_sets.count > 0
     
-    input_sets.each do |set| 
-      document.set.sets << set.generate(rec_status: document.rec_status)
+    input_sets.each do |set|
+      hash = {rec_status: document.rec_status}
+      hash.merge!(internal: bankserv_service.config[:internal]) if bankserv_service.config.has_key?(:internal)
+
+      document.set.sets << set.generate(hash)
       document.set.sets[-1].set = document.set # whaaaaaa?
     end
     

data/lib/bankserv/transmission/reply_document.rb

@@ -19,7 +19,7 @@ class Bankserv::ReplyDocument < Bankserv::Document
   
   def process!
     raise "Document already processed" if processed?
-    
+
     self.set.process
     self.processed = true
     self.save

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

@@ -4,9 +4,12 @@ module Bankserv
     class AccountHolderVerification < Set
     
       before_create :set_header, :set_trailer, :decorate_records
+
+      attr_accessor :department_code
     
       def self.generate(options = {})
-        [:internal, :external].collect do |type|
+        arr = options[:internal] ? [:internal] : [:external]
+        arr.collect do |type|
           ahvs = Bankserv::AccountHolderVerification.unprocessed.send(type)
           
           if options[:rec_status] == "L"
@@ -17,7 +20,7 @@ module Bankserv
           
           if ahvs.count > 0
             set = self.new
-            set.build_header
+            set.build_header(type: type)
             ahvs.each{|ahv| set.build_transaction(ahv)}
             set.build_trailer
             set
@@ -46,7 +49,7 @@ module Bankserv
           id_number: ahv.bank_account.id_number,
           initials: ahv.bank_account.initials,
           surname: ahv.bank_account.account_name,
-          user_ref: ahv.internal_user_ref
+          user_ref: ahv.user_ref
         )
       
         record_data.merge!(branch_code: ahv.bank_account.branch_code) if ahv.external?
@@ -70,9 +73,13 @@ module Bankserv
       end
     
       def set_header
+        type = header[:data].delete(:type)
+        department_code = "AHVEXT"
+        department_code = "AHVINT" if type == :internal
+
         self.generation_number = bankserv_service.reserve_generation_number!.to_s
         header.data[:gen_no] = generation_number
-        header.data[:dept_code] = bankserv_service.config[:department_code]
+        header.data[:dept_code] = department_code
       end
     
       def set_trailer
@@ -81,6 +88,5 @@ module Bankserv
       end
     
     end
-  
   end
 end

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

@@ -6,12 +6,9 @@ module Bankserv
       
       def process
         transactions.each do |transaction|
-          Bankserv::AccountHolderVerification.for_internal_reference(transaction.reference).first.process_response(transaction.data)
+          Bankserv::AccountHolderVerification.for_reference(transaction.reference).first.process_response(transaction.data)
         end
       end
-     
     end
-   
   end
-  
 end

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

@@ -6,7 +6,7 @@ module Bankserv
       
       def process
         transactions.each do |transaction|
-          eft = Bankserv::Eft.for_internal_reference(transaction.reference).first
+          eft = Bankserv::Eft.for_reference(transaction.reference).first
           eft.process_response(transaction.data.merge(response_status: 'redirect')) if eft
         end
       end

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

@@ -6,13 +6,10 @@ module Bankserv
       
       def process
         transactions.each do |transaction|
-          eft = Bankserv::Eft.for_internal_reference(transaction.reference).first
+          eft = Bankserv::Eft.for_reference(transaction.reference).first
           eft.process_response(transaction.data.merge(response_status: 'unpaid')) if eft
         end
       end
-     
     end
-   
   end
-  
 end

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

@@ -13,6 +13,13 @@ module Bankserv
             document = Bankserv::InputDocument.for_transmission_number(transaction.data[:transmission_number])
             document.reply_status = transaction.data[:transmission_status]
             document.save!
+
+            if document.accepted?
+              Bankserv::Service.for_client_code(document.client_code).active.each do |service|
+                service.update_transmission_number!
+              end
+            end
+            
           when "transmission_rejected_reason"
             document.error = {
               code: transaction.data[:error_code],
@@ -43,9 +50,6 @@ module Bankserv
           end
         end
       end
-     
     end
-   
   end
-  
 end

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/lib/generators/active_record/templates/migration.rb

@@ -67,7 +67,6 @@ class CreateBankservTables < ActiveRecord::Migration
       t.string :status, :default => "new"
       t.text :response
       t.string :user_ref
-      t.string :internal_user_ref
       t.timestamps
     end
     
@@ -81,7 +80,6 @@ class CreateBankservTables < ActiveRecord::Migration
       t.string :status, :default => "new"
       t.text :response
       t.string :user_ref
-      t.string :internal_user_ref
       t.timestamps
     end
     
@@ -95,7 +93,6 @@ class CreateBankservTables < ActiveRecord::Migration
       t.string :status, :default => "new"
       t.text :response
       t.string :user_ref
-      t.string :internal_user_ref
       t.timestamps
     end
     

data/spec/examples/ahv_input_file.txt

@@ -1,5 +1,5 @@
-000L2009070302236TEST                          000000000000                                                                                                                                           
-030L0000001000001                                                                                                                                                                                     
+000L2009070302236TEST                          000000000000                                                                                                                       0                   
+030L0000001AHVINT                                                                                                                                                                                     
 031L00000010000000010944025246703085829086M  CHAUKE                                                      00000000AHV1                                                                                 
 031L00000020000000029684746696103120039082A  VAN MOLENDORF                                               00000000AHV2                                                                                 
 031L00000030000000024920081778801261110087U  NKWEBA                                                      00000000AHV3                                                                                 

data/spec/examples/ahv_output_file.txt

@@ -1,7 +1,7 @@
 000L2009070302236TEST                        00000001000000                                                                                                                                           
 030L0000001000001                                                                                                                                                                                     
-031L00000010000000010944025246703085829086M  CHAUKE                                                      00000000AHV1                                                                                 
-031L00000020000000029684746696103120039082A  VAN MOLENDORF                                               00020304AHV2                                                                                 
-031L00000030000000024920081778801261110087U  NKWEBA                                                      00000000AHV3                                                                                 
+031L00000010000000010944025246703085829086M  CHAUKE                                                      00000000149505000000000223600000008000                                                       
+031L00000020000000029684746696103120039082A  VAN MOLENDORF                                               00020304198841000000000223600000000000                                                       
+031L00000030000000024920081778801261110087U  NKWEBA                                                      00000000149205000000000223605000700000                                                       
 039L0000003000000006554885370                                                                                                                                                                         
 999L000000007                                                                                                                                                                                         

data/spec/examples/credit_eft_input.txt

@@ -1,4 +1,4 @@
-000L2008080800986TESTTEST                      000084600000                                                                                                                                           
+000L2008080800986TESTTEST                      000084600000                                                                                                                       846                 
 020L0499990808080808080808080808080000780846BATCH     YY                                                                                                                                              
 020L1063200504068123456999900007805002100081136250100001500000080808880   TESTTEST  _2055185_PAY USER   DEWEY  ASSOCIATES             00000000000000000000                21                          
 020L1063200504068123456999900007963200504051717311100000542380080808880   TESTTEST  _2055184_PAY USER   SURE SLIM WELLNESS CLINIC SA  00000000000000000000                21                          

data/spec/examples/debit_eft_input_file.txt

@@ -1,4 +1,4 @@
-000T2004052400010LDC USER 10 AFRICA (PTY)      000062100000                                                                                                                                           
+000T2004052400010LDC USER 10 AFRICA (PTY)      000062100000                                                                                                                       621                 
 001T0495340405240405250405240405250000010037CORPSSV                                                                                                                                                   
 001T5063200504053538939953400000163200501019611899100000001000040524440000ALIMITTST SPP   1040524 01    HENNIE DU TOIT                00000000000000000000                21                          
 001T5063200504053538939953400000263200501019801892100000002000040524440000ALIMITTST SPP   1040524 02    TYRONE DREYDEN                00000000000000000000                21                          

data/spec/examples/reply/rejected_transmission.txt

@@ -1,4 +1,4 @@
-000T2004052400000LCD USER 10 AFRICA (PTY)      000012300010                                                                                                                                           
+000T2004052400000LCD USER 10 AFRICA (PTY)      000012300010                                                                                                                       123                 
 900T000 TRANSMISSION 00010-0000621 REJECTED                                                                                                                                                           
 901T000 12345-HI THIS IS ERROR                                                                                                                                                                        
 900T001 ACB USER SET 9534-0000037-000016 REJECTED                                                                                                                                                     

data/spec/examples/reply/reply_file.txt

@@ -1,4 +1,4 @@
-000T2004052400000LCD USER 10 AFRICA (PTY)      000012300010                                                                                                                                           
+000T2004052400000LCD USER 10 AFRICA (PTY)      000012300010                                                                                                                       123                 
 900T000 TRANSMISSION 00010-0000621 ACCEPTED                                                                                                                                                           
 900T001 ACB USER SET 9534-0000037-000016 ACCEPTED                                                                                                                                                     
 900T001 ACB USER SET 9534-0000038-000032 ACCEPTED                                                                                                                                                     

data/spec/internal/db/schema.rb

@@ -66,7 +66,6 @@ ActiveRecord::Schema.define do
     t.string :status, :default => "new"
     t.text :response
     t.string :user_ref
-    t.string :internal_user_ref
     t.timestamps
   end
   
@@ -80,7 +79,6 @@ ActiveRecord::Schema.define do
     t.string :status, :default => "new"
     t.text :response
     t.string :user_ref
-    t.string :internal_user_ref
     t.timestamps
   end
   
@@ -94,7 +92,6 @@ ActiveRecord::Schema.define do
     t.string :status, :default => "new"
     t.text :response
     t.string :user_ref
-    t.string :internal_user_ref
     t.timestamps
   end
   

data/spec/lib/bankserv/account_holder_verification_spec.rb

@@ -70,11 +70,6 @@ describe Bankserv::AccountHolderVerification do
       ahv.should be_external
     end
     
-    it "should generate a unique internal reference" do
-      @ahv_service.request(@hash)
-      Bankserv::AccountHolderVerification.last.internal_user_ref.should match /AHV[0-9]+/
-    end
-    
   end
   
   context "when processing an account holder verification response" do

data/spec/lib/bankserv/credit_spec.rb

@@ -2,15 +2,6 @@ require 'spec_helper'
 
 describe Bankserv::Debit do
   
-  context "creating a new credit" do
-    
-    it "should generate a unique internal reference" do
-      create(:credit)
-      Bankserv::Credit.last.internal_user_ref.should match /CREDIT[0-9]+/
-    end
-    
-  end
-  
   context "queuing a batch of credit orders" do
     
     before(:all) do

data/spec/lib/bankserv/debit_spec.rb

@@ -2,15 +2,6 @@ require 'spec_helper'
 
 describe Bankserv::Debit do
   
-  context "creating a new debit" do
-    
-    it "should generate a unique internal reference" do
-      create(:debit)
-      Bankserv::Debit.last.internal_user_ref.should match /DEBIT[0-9]+/
-    end
-    
-  end
-  
   context "queuing a batch of debit orders" do
     
     before(:all) do

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

@@ -7,7 +7,7 @@ describe Bankserv::InputDocument do
 
     before(:each) do
       tear_it_down
-      bankserv_service = Bankserv::AHVService.register(client_code: '2236', internal_branch_code: '632005', department_code: "000001", client_name: "TEST", client_abbreviated_name: 'TESTTEST', generation_number: 1, transmission_status: "L", transmission_number: "0")
+      bankserv_service = Bankserv::AHVService.register(client_code: '2236', internal_branch_code: '632005', department_code: "000001", client_name: "TEST", client_abbreviated_name: 'TESTTEST', generation_number: 1, transmission_status: "L", transmission_number: "0", internal: false)
   
       ahv_attributes = {
         bank_account: {
@@ -18,13 +18,12 @@ describe Bankserv::InputDocument do
           initials: "M",
           account_name: "CHAUKE"
         },
-        user_ref: "149505000060000223600000000000"
+        user_ref: "AHV1"
       }
     
       bankserv_service.request(type: 'ahv', data: ahv_attributes)
       ahv = Bankserv::AccountHolderVerification.last
       ahv.internal = true
-      ahv.internal_user_ref = "AHV1"
       ahv.save!
   
       ahv_attributes = {
@@ -36,13 +35,12 @@ describe Bankserv::InputDocument do
           initials: "A",
           account_name: "VAN MOLENDORF"
         },
-        user_ref: "198841000060000223600000000000"
+        user_ref: "AHV2"
       }
     
       bankserv_service.request(type: 'ahv', data: ahv_attributes)
       ahv = Bankserv::AccountHolderVerification.last
       ahv.internal = true
-      ahv.internal_user_ref = "AHV2"
       ahv.save!
     
       ahv_attributes = {
@@ -54,13 +52,12 @@ describe Bankserv::InputDocument do
           initials: "U",
           account_name: "NKWEBA"
         },
-        user_ref: "149205000060000223600000000000"
+        user_ref: "AHV3"
       }
     
       bankserv_service.request(type: 'ahv', data: ahv_attributes)
       ahv = Bankserv::AccountHolderVerification.last
       ahv.internal = true
-      ahv.internal_user_ref = "AHV3"
       ahv.save!
     
       t = Time.local(2009, 7, 3, 10, 5, 0)
@@ -80,7 +77,6 @@ describe Bankserv::InputDocument do
     
       string = File.open("./spec/examples/ahv_input_file.txt", "rb").read
       options = Absa::H2h::Transmission::Document.hash_from_s(string, 'input')
-    
       hash.should == options
     end
   
@@ -88,6 +84,16 @@ describe Bankserv::InputDocument do
       @document.mark_processed!
       @document.processed.should be_true
     end
+
+    it "should mark the ahv services internal status to true" do
+      Bankserv::AHVService.active.first.config[:internal].should be_true
+    end
+
+    it "should not build a document if no sets could be generated" do
+      Bankserv::Transmission::UserSet::Document.all.count.should == 1
+      Bankserv::InputDocument.generate!(Bankserv::AHVService.active.first)
+      Bankserv::Transmission::UserSet::Document.all.count.should == 1
+    end
   end
   
   context "building a transmission document two batches of debit order requests" do

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

@@ -67,8 +67,6 @@ describe Bankserv::OutputDocument do
         internal: true
       )
     
-      ahv1.save!
-      ahv1.internal_user_ref = "AHV1"
       ahv1.save!
     
       ahv2 = Bankserv::AccountHolderVerification.new(
@@ -85,9 +83,7 @@ describe Bankserv::OutputDocument do
       )
     
       ahv2.save!
-      ahv2.internal_user_ref = "AHV2"
-      ahv2.save!
-      
+
       ahv3 = Bankserv::AccountHolderVerification.new(
         bank_account: Bankserv::BankAccount.new(
           account_number: "2492008177",
@@ -101,8 +97,6 @@ describe Bankserv::OutputDocument do
         internal: true
       )
     
-      ahv3.save!
-      ahv3.internal_user_ref = "AHV3"
       ahv3.save!
       
       Bankserv::AccountHolderVerification.for_reference("149505000000000223600000008000").first.completed?.should be_false
@@ -158,38 +152,32 @@ describe Bankserv::OutputDocument do
      
     it "should be able to process the document, updating any related debit or credit requests" do
       debits = []
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 7627, batch_id: 1, user_ref: "A LDC TESTY PREMIE AL0597626X5")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 9964, batch_id: 1, user_ref: "A LDC TESTY PREMIE AL0394056X3")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10851, batch_id: 2, user_ref: "A LDC TESTY PREMIE AL0620127X9")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 31700, batch_id: 3, user_ref: "A LDC TESTM PREMIE AL0876267X2")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 13755, batch_id: 3, user_ref: "A LDC TESTY PREMIE AL0699555X1")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 22935, batch_id: 4, user_ref: "A LDC TESTSALARIS  BL ROODT")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 15198, batch_id: 4, user_ref: "A LDC TESTKREDITEUR L0844622KL")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 12720, batch_id: 4, user_ref: "A LDC TESTVERSEKERING  01BLOR3")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 9345, batch_id: 4, user_ref:  "A LDC TESTSALARIS SOEKIE 12345")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 13420, batch_id: 4, user_ref: "A LDC TESTSALARIS  BL ROODT")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 15300, batch_id: 4, user_ref: "A LDC TESTSALARIS  BL ROODT")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 7790, batch_id: 4, user_ref:  "A LDC TESTSANLAM   AL0849 61X3")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 19698, batch_id: 4, user_ref: "A LDC TESTSOUTHERN LIFE 4627K5")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 5000, batch_id: 4, user_ref:  "A LDC TESTHUISVERBAND 98173587")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10420, batch_id: 4, user_ref: "A LDC TESTPERSOONLIKE LENING")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10000, batch_id: 4, user_ref: "A LDC TESTSPAARKLUB OKT 2001")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 15000, batch_id: 4, user_ref: "A LDC TESTY PREMIE XAZAP1163V5")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10000, batch_id: 4, user_ref: "A LDC TESTQ PREMIE BLASNK158X4")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 16150, batch_id: 4, user_ref: "A LDC TESTY PREMIE ALONE6728X1")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 12300, batch_id: 4, user_ref: "A LDC TESTM PREMIUM LZANA602F3")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 20000, batch_id: 4, user_ref: "A LDC TESTY PREMIE SP0001453X0")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 6287, batch_id: 4, user_ref:  "A LDC TESTW INSTALMENT ND263XZ")
-      debits << Bankserv::Debit.create!(record_type: "standard", amount: 8954, batch_id: 4, user_ref:  "A LDC TESTY PROTECTION 9697523")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 7627, batch_id: 1, user_ref: "DEBIT1")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 9964, batch_id: 1, user_ref: "DEBIT2")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10851, batch_id: 2, user_ref: "DEBIT3")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 31700, batch_id: 3, user_ref: "DEBIT4")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 13755, batch_id: 3, user_ref: "DEBIT5")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 22935, batch_id: 4, user_ref: "DEBIT6")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 15198, batch_id: 4, user_ref: "DEBIT7")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 12720, batch_id: 4, user_ref: "DEBIT8")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 9345, batch_id: 4, user_ref:  "DEBIT9")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 13420, batch_id: 4, user_ref: "DEBIT10")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 15300, batch_id: 4, user_ref: "DEBIT11")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 7790, batch_id: 4, user_ref:  "DEBIT12")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 19698, batch_id: 4, user_ref: "DEBIT13")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 5000, batch_id: 4, user_ref:  "DEBIT14")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10420, batch_id: 4, user_ref: "DEBIT15")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10000, batch_id: 4, user_ref: "DEBIT16")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 15000, batch_id: 4, user_ref: "DEBIT17")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 10000, batch_id: 4, user_ref: "DEBIT18")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 16150, batch_id: 4, user_ref: "DEBIT19")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 12300, batch_id: 4, user_ref: "DEBIT20")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 20000, batch_id: 4, user_ref: "DEBIT21")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 6287, batch_id: 4, user_ref:  "DEBIT22")
+      debits << Bankserv::Debit.create!(record_type: "standard", amount: 8954, batch_id: 4, user_ref:  "DEBIT23")
    
       counter = 1
    
-      debits.each do |debit|
-        debit.internal_user_ref = "DEBIT#{counter}"
-        debit.save!
-        counter += 1
-      end
-
       Bankserv::Debit.all.each{|debit| debit.completed?.should be_false}
       @document.process!
    

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

@@ -8,6 +8,7 @@ describe Bankserv::ReplyDocument do
     before(:all) do
       tear_it_down
       Bankserv::DebitService.register(client_code: '12346', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
+      Bankserv::CreditService.register(client_code: '12346', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
       
       @file_contents = File.open("./spec/examples/reply/reply_file.txt", "rb").read
       @options = Absa::H2h::Transmission::Document.hash_from_s(@file_contents, 'output')
@@ -34,7 +35,8 @@ describe Bankserv::ReplyDocument do
     
     before(:each) do
       tear_it_down
-      Bankserv::DebitService.register(client_code: '12346', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
+      Bankserv::DebitService.register(client_code: '10', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
+      Bankserv::CreditService.register(client_code: '10', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
       
       @file_contents = File.open("./spec/examples/eft_input_with_2_sets.txt", "rb").read
       @input_document = Bankserv::InputDocument.store(@file_contents)
@@ -42,12 +44,11 @@ describe Bankserv::ReplyDocument do
       @file_contents = File.open("./spec/examples/reply/reply_file.txt", "rb").read
       @options = Absa::H2h::Transmission::Document.hash_from_s(@file_contents, 'output')
 
-      @reply_document = Bankserv::OutputDocument.store(@file_contents)
+      @reply_document = Bankserv::ReplyDocument.store(@file_contents)
     end
     
     it "should mark the original input document as ACCEPTED if the transmission was accepted" do
       @input_document.reply_status.should be_nil
-      
       @reply_document.process!
       
       @input_document.reload
@@ -62,6 +63,11 @@ describe Bankserv::ReplyDocument do
         set.reply_status.should == "ACCEPTED"
       end
     end
+
+    it "should update the tranmission number of the service" do
+      @reply_document.process!
+      Bankserv::DebitService.last.config[:transmission_number].should == "2"
+    end
     
   end
   
@@ -69,7 +75,8 @@ describe Bankserv::ReplyDocument do
     
     before(:all) do
       tear_it_down
-      Bankserv::DebitService.register(client_code: '12346', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
+      Bankserv::DebitService.register(client_code: '10', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
+      Bankserv::CreditService.register(client_code: '10', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
       
       @file_contents = File.open("./spec/examples/eft_input_with_2_sets.txt", "rb").read
       @input_document = Bankserv::InputDocument.store(@file_contents)
@@ -82,6 +89,11 @@ describe Bankserv::ReplyDocument do
       @reply_document.process!
       @input_document.reload
     end
+
+    it "should not update the tranmission number of the services" do
+      Bankserv::DebitService.last.config[:transmission_number].should == "1"
+      Bankserv::CreditService.last.config[:transmission_number].should == "1"
+    end
     
     context "processing a transmission status record" do
       it "should mark the document's reply status as REJECTED" do

data/spec/lib/bankserv/transmission/set/account_holder_verification_spec.rb

@@ -5,7 +5,7 @@ describe Bankserv::Transmission::UserSet::AccountHolderVerification do
   
   before(:all) do
     tear_it_down
-    ahv_service = Bankserv::AHVService.register(client_code: '12345', internal_branch_code: '632005', department_code: "506", client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', generation_number: 1, transmission_status: "T", transmission_number: "1")
+    ahv_service = Bankserv::AHVService.register(client_code: '12345', internal_branch_code: '632005', department_code: "506", client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', generation_number: 1, transmission_status: "T", transmission_number: "1", internal: true)
     
     @ahv_list = [
       ahv_service.request(type: 'ahv', data: attributes_for(:internal_ahv).merge(bank_account: attributes_for(:internal_bank_account))),
@@ -21,20 +21,26 @@ describe Bankserv::Transmission::UserSet::AccountHolderVerification do
   it "should report when there are account holder verification requests that need to be processed" do
     Bankserv::Transmission::UserSet::AccountHolderVerification.has_test_work?.should be_true
   end
-  
-  it "should place internal and external account holder verifications into separate user sets" do
-    sets = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T")
-    
-    sets.count.should == 2
+
+  it "should process the external account holder verifications" do
+    sets = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T", internal: false)
+
+    sets.count.should == 1
+    sets.first.transactions.count.should == 3
+  end
+
+  it "should process the internal account holder verifications" do
+    sets = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T", internal: true)
+
+    sets.count.should == 1
     sets.first.transactions.count.should == 2
-    sets.last.transactions.count.should == 3
   end
   
   context "Building an account holder verification set" do
     
     before(:each) do
       tear_it_down
-      ahv_service = Bankserv::AHVService.register(client_code: '12345', internal_branch_code: '632005', department_code: "506", client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', generation_number: 1, transmission_status: "T", transmission_number: "1")
+      ahv_service = Bankserv::AHVService.register(client_code: '12345', internal_branch_code: '632005', department_code: "506", client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', generation_number: 1, transmission_status: "T", transmission_number: "1", internal: false)
     
       @ahv_list = [
         ahv_service.request(type: 'ahv', data: attributes_for(:internal_ahv).merge(bank_account: attributes_for(:internal_bank_account))),
@@ -49,7 +55,7 @@ describe Bankserv::Transmission::UserSet::AccountHolderVerification do
     context "creating a header" do
       
       before(:each) do
-        @set = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T").first
+        @set = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T", internal: true).first
         @set.save
       end
       
@@ -67,13 +73,14 @@ describe Bankserv::Transmission::UserSet::AccountHolderVerification do
       
       it "should store the specified department code" do
         @set.header.data.has_key?(:dept_code).should be_true
+        @set.header.data[:dept_code].should == "AHVINT"
       end      
     end
     
     context "creating a trailer" do
       
       before(:each) do
-        @set = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T").first
+        @set = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T", internal: true).first
         @set.save
       end
       
@@ -98,7 +105,7 @@ describe Bankserv::Transmission::UserSet::AccountHolderVerification do
     end
     
     it "should create a batch of transactions when the job begins" do
-      batch = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T").first
+      batch = Bankserv::Transmission::UserSet::AccountHolderVerification.generate(rec_status: "T", internal: true).first
       batch.save
       batch.transactions.first.record_type.should == "internal_account_detail"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000Z
+date: 2012-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70272531742720 !ruby/object:Gem::Requirement
+  requirement: &70159062700580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272531742720
+  version_requirements: *70159062700580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70272531742160 !ruby/object:Gem::Requirement
+  requirement: &70159062700000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272531742160
+  version_requirements: *70159062700000
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70272531741740 !ruby/object:Gem::Requirement
+  requirement: &70159062699300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272531741740
+  version_requirements: *70159062699300
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70272531741060 !ruby/object:Gem::Requirement
+  requirement: &70159062698560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70272531741060
+  version_requirements: *70159062698560
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70272531740560 !ruby/object:Gem::Requirement
+  requirement: &70159062697860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70272531740560
+  version_requirements: *70159062697860
 - !ruby/object:Gem::Dependency
   name: absa-notify-me
-  requirement: &70272531740100 !ruby/object:Gem::Requirement
+  requirement: &70159062697200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70272531740100
+  version_requirements: *70159062697200
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70272531739640 !ruby/object:Gem::Requirement
+  requirement: &70159062696640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70272531739640
+  version_requirements: *70159062696640
 description: ! "This engine allows users to inject requests into a queue to be processed.
   \n    \n                    The queue handles bank account validations, credit payments,
   debit orders\n                    and collecting bank statements/notify me statements. "