bankserv 0.5.9 → 0.6.0

data/lib/bankserv/transmission/input_document.rb

@@ -110,8 +110,13 @@ class Bankserv::InputDocument < Bankserv::Document
       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?
+      generated_sets = set.generate(hash)
+      generated_sets = [generated_sets] unless generated_sets.is_a? Array
+
+      generated_sets.each do |set|
+        document.set.sets << set
+        document.set.sets[-1].set = document.set # whaaaaaa?
+      end
     end
 
     document.save!

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

@@ -46,7 +46,28 @@ module Bankserv
       def self.bankserv_service
         Bankserv::CreditService.where(active: true).last
       end
-          
+
+      def self.generate(options = {})
+        efts = self.unprocessed_efts(options[:rec_status])
+        
+        if efts.count > 0
+          sets = efts.group_by(&:batch_id).map do |batch_id, efts|
+            set = self.new
+            set.type_of_service = efts.first.request.data[:type_of_service]
+            set.accepted_report = efts.first.request.data[:accepted_report] || "Y"
+            set.account_type_correct = efts.first.request.data[:account_type_correct] || "Y"
+            set.build_header
+            set.build_batches(efts)
+            set.build_trailer
+            set
+          end
+        end
+      end
+
+      def build_batches(efts)
+        efts.select(&:standard?).each{|t| build_standard t}
+        efts.select(&:contra?).each{|t| build_contra t}
+      end
     end
   end
 end

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

@@ -43,13 +43,23 @@ module Bankserv
         Bankserv::Transmission::UserSet::Debit.bankserv_service
         #Bankserv::Service.where(active: true, type: 'debit').last
       end
-      
 
       def self.bankserv_service
         Bankserv::DebitService.where(active: true).last
         #Bankserv::Service.where(active: true, type: 'debit').last
       end
 
+      def build_batches(efts)
+        build_header
+
+        efts.group_by(&:batch_id).each do |batch_id, eft|
+          eft.select(&:standard?).each{|t| build_standard t}
+          eft.select(&:contra?).each{|t| build_contra t}
+        end
+
+        build_trailer
+      end
+
     end
   end
 end

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

@@ -31,9 +31,7 @@ module Bankserv
           set.type_of_service = efts.first.request.data[:type_of_service]
           set.accepted_report = efts.first.request.data[:accepted_report] || "Y"
           set.account_type_correct = efts.first.request.data[:account_type_correct] || "Y"
-          set.build_header
-          set.build_batches(options[:rec_status])
-          set.build_trailer
+          set.build_batches(efts)
           set
         end
       end
@@ -85,15 +83,6 @@ module Bankserv
         records.build(record_type: "trailer", data: record_data.merge(rec_id: rec_id))
       end
       
-      def build_batches(rec_status)
-        efts = self.class.unprocessed_efts(rec_status)
-        
-        efts.group_by(&:batch_id).each do |batch_id, eft|
-          eft.select(&:standard?).each{|t| build_standard t}
-          eft.select(&:contra?).each{|t| build_contra t}
-        end
-      end
-      
       def build_standard(transaction)
         record_data = Absa::H2h::Transmission::Eft.record_type('standard_record').template_options
         homing_account_number = transaction.bank_account.account_number.to_i.to_s

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/spec/lib/bankserv/credit_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Bankserv::Debit do
+describe Bankserv::Credit do
   
   context "queuing a batch of credit orders" do
     

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

@@ -35,16 +35,17 @@ describe Bankserv::Transmission::UserSet::Credit do
       }
 
       bankserv_service.request(@hash)
-      @batch = Bankserv::Transmission::UserSet::Credit.generate(rec_status: "T")
-      @batch.save
+      @batches = Bankserv::Transmission::UserSet::Credit.generate(rec_status: "T")
+      @batches.each {|x| x.save!}
     end
     
-    it "should return true when a batch needs to be processed" do
+    it "should return true when a set needs to be processed" do
       Bankserv::Transmission::UserSet::Credit.has_test_work?.should be_true
     end 
     
-    it "should create a batch with a header when the job begins" do
-      @batch.header.data.should == {
+    it "should create 2 sets with a header when the job begins" do
+
+      @batches.first.header.data.should == {
         rec_id: "020",
         rec_status: "T",
         bankserv_record_identifier: "04",
@@ -59,28 +60,64 @@ describe Bankserv::Transmission::UserSet::Credit do
         accepted_report: "Y",
         account_type_correct: "Y"
       }
+
+      @batches.second.header.data.should == {
+        rec_id: "020",
+        rec_status: "T",
+        bankserv_record_identifier: "04",
+        bankserv_user_code: "9534",
+        bankserv_creation_date: Time.now.strftime("%y%m%d"),
+        bankserv_purge_date: Time.now.strftime("%y%m%d"),
+        first_action_date: Time.now.strftime("%y%m%d"),
+        last_action_date: Time.now.strftime("%y%m%d"),
+        first_sequence_number: "5",
+        user_generation_number: "38",
+        type_of_service: "SAMEDAY",
+        accepted_report: "Y",
+        account_type_correct: "Y"
+      }
+
     end
     
-    it "should create a 2 batches of debit transactions when the job begins" do
-      @batch.contra_records.size.should == 2
+    it "should create a contra record for each set" do
+      @batches.each do |batch|
+        batch.contra_records.size.should == 1
+      end
     end
     
     it "should create a batch with a trailer when the job begins" do
-      @batch.trailer.data.should == {
+      @batches.first.trailer.data.should == {
         rec_id: "020",
         rec_status: "T",
         bankserv_record_identifier: "92",
         bankserv_user_code: "9534",
         first_sequence_number: "1",
+        last_sequence_number: "4",
+        first_action_date: Time.now.strftime("%y%m%d"),
+        last_action_date: Time.now.strftime("%y%m%d"),
+        no_debit_records: "1",
+        no_credit_records: "3",
+        no_contra_records: "1",
+        total_debit_value: "1000000",
+        total_credit_value: "1000000",
+        hash_total_of_homing_account_numbers: "138655402067"
+      }
+
+      @batches.second.trailer.data.should == {
+        rec_id: "020",
+        rec_status: "T",
+        bankserv_record_identifier: "92",
+        bankserv_user_code: "9534",
+        first_sequence_number: "5",
         last_sequence_number: "8",
         first_action_date: Time.now.strftime("%y%m%d"),
         last_action_date: Time.now.strftime("%y%m%d"),
-        no_debit_records: "2",
-        no_credit_records: "6",
-        no_contra_records: "2",
-        total_debit_value: "2500000",
-        total_credit_value: "2500000",
-        hash_total_of_homing_account_numbers: "277310804125"
+        no_debit_records: "1",
+        no_credit_records: "3",
+        no_contra_records: "1",
+        total_debit_value: "1500000",
+        total_credit_value: "1500000",
+        hash_total_of_homing_account_numbers: "138655402058"
       }
     end
     
@@ -88,5 +125,48 @@ describe Bankserv::Transmission::UserSet::Credit do
       Bankserv::DebitService.active.last.config[:generation_number].should == Bankserv::CreditService.active.last.config[:generation_number]
     end
   end
+
+  context "Building credit transmission with multiple sets" do
+    
+    before(:each) do
+      tear_it_down
+      
+      @credit_service = Bankserv::CreditService.register(client_code: '10', client_name: "LDC USER 10 AFRICA (PTY)", client_abbreviated_name: 'ALIMITTST', user_code: "9534", generation_number: 37, transmission_status: "T", transmission_number: "1")
+      debit_service = Bankserv::DebitService.register(client_code: '12346', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 37, transmission_status: "L", transmission_number: "1")
+      
+      @data = [{
+         debit: {
+           account_number: "907654321", branch_code: "632005", account_type: 'savings', id_number: '8207205263083', initials: "RC", account_name: "Rawson Milnerton", amount: 500000, user_ref: 234, action_date: Date.today },
+         credit:
+           { account_number: "13123123123", branch_code: "123123", account_type: "savings", id_number: "198273981723", initials: "WC", account_name: "Tenant", amount: 500000, action_date: Date.today, user_ref: "235"}
+      }]
+
+      @data2 = [{
+        debit: {
+          account_number: "907654321", branch_code: "632005", account_type: 'savings', id_number: '8207205263083', initials: "RC", account_name: "Rawson Milnerton", amount: 500000, user_ref: 234, action_date: Date.today },
+        credit:
+          { account_number: "13123123123", branch_code: "123123", account_type: "savings", id_number: "198273981723", initials: "WC", account_name: "Tenant", amount: 500000, action_date: Date.today, user_ref: "235"}
+      }]
+
+      @hash = {
+        type: 'credit',
+        data: { type_of_service: "BATCH", batches: @data }
+      }
+
+      @hash2 = {
+        type: 'credit',
+        data: { type_of_service: "BATCH", batches: @data2 }
+      }
+
+      @credit_service.request(@hash)
+      @credit_service.request(@hash2)
+    end
+
+    it "should build a transmission with 3 sets" do
+      document = Bankserv::InputDocument.generate!(@credit_service)
+      document.sets.size.should == 3
+    end
+
+  end
       
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000Z
+date: 2012-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70297965684020 !ruby/object:Gem::Requirement
+  requirement: &70160002412140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297965684020
+  version_requirements: *70160002412140
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70297965673820 !ruby/object:Gem::Requirement
+  requirement: &70160002411500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297965673820
+  version_requirements: *70160002411500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70297965673280 !ruby/object:Gem::Requirement
+  requirement: &70160002411000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297965673280
+  version_requirements: *70160002411000
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70297965672640 !ruby/object:Gem::Requirement
+  requirement: &70160002410280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70297965672640
+  version_requirements: *70160002410280
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70297965672020 !ruby/object:Gem::Requirement
+  requirement: &70160002409740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70297965672020
+  version_requirements: *70160002409740
 - !ruby/object:Gem::Dependency
   name: absa-notify-me
-  requirement: &70297965671460 !ruby/object:Gem::Requirement
+  requirement: &70160002409240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70297965671460
+  version_requirements: *70160002409240
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70297965670880 !ruby/object:Gem::Requirement
+  requirement: &70160002408640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70297965670880
+  version_requirements: *70160002408640
 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. "