bankserv 0.2.3 → 0.2.4

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

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

@@ -16,20 +16,26 @@ class CreateBankservTables < ActiveRecord::Migration
       t.timestamps
     end
     
-    create_table :bankserv_configurations, :force => true do |t|
+    create_table :bankserv_services, :force => true do |t|
       t.boolean :active, :default => false
+      t.string :service_type
       t.string :client_code
-      t.string :client_name
-      t.string :client_abbreviated_name
-      t.string :user_code
-      t.string :department_code
-      t.integer :transmission_number
-      t.integer :user_generation_number
-      t.string :internal_branch_code
-      t.boolean :live_env, :default => false
+      t.text :config
       t.timestamps
-      t.integer :eft_sequence_number
-      t.datetime :eft_sequence_number_updated_at #refactor later
+          # 
+          # t.boolean :active, :default => false
+          # t.string :client_code
+          # t.string :client_name
+          # t.string :client_abbreviated_name
+          # t.string :user_code
+          # t.string :department_code
+          # t.integer :transmission_number
+          # t.integer :user_generation_number
+          # t.string :internal_branch_code
+          # t.boolean :live_env, :default => false
+          # t.timestamps
+          # t.integer :eft_sequence_number
+          # t.datetime :eft_sequence_number_updated_at #refactor later
     end
     
     create_table :bankserv_requests do |t|

data/spec/examples/INPUT.120411110604.txt

@@ -1,4 +1,4 @@
-000L2012041012345TESTTEST                      000000100000                                                                                                                                           
+000L2012041012346TESTTEST                      000000100000                                                                                                                                           
 001L0499991204101204111204111204110000010001TWO DAY                                                                                                                                                   
 001L5025025504530495834999900000125065562097363670100000301400120411440   TESTTEST  544                 DOUGLAS ANDERSON              00000000000000000000                21                          
 001L5025025504530495834999900000263200509076546281200000315000120411440   TESTTEST  545                 JEFFREY VAN ASWEGEN           00000000000000000000                21                          

data/spec/examples/INPUT.120411124123.txt

@@ -0,0 +1,8 @@
+000L2012041012347TESTTEST                      000000100000                                                                                                                                           
+020L0499991204101204111204111204110000010001BATCH                                                                                                                                                     
+020L1025025504530495834999900000125065562097363670100000406700120411880   TESTTEST  260                 DOUGLAS ANDERSON              00000000000000000000                21                          
+020L1025025504530495834999900000263200509076546281200000427300120411880   TESTTEST  261                 JEFFREY VAN ASWEGEN           00000000000000000000                21                          
+020L1025025504530495834999900000302000900070440213100000418000120411880   TESTTEST  262                 PETER DE VILLIERS             00000000000000000000                21                          
+020L1225025504530495834999900000425025504530495834100001252000120411100000TESTTEST  CONTRA03493                                                                                                       
+020L929999000001000004120411120411000001000003000001000001252000000001252000075774845998                                                                                                              
+999L000000008                                                                                                                                                                                         

data/spec/factories.rb

@@ -1,20 +1,5 @@
 FactoryGirl.define do
   
-  Bankserv::Configuration.create! active: true, client_code: "234234", client_name: "RENTCONN", user_code: "054324", department_code: "A12345", user_generation_number: 10
-  
-  factory :configuration, :class => "Bankserv::Configuration" do
-    active true
-    client_code { Faker::Base::numerify('#####') }
-    client_name { Faker::Base::letterify('???????????????') }
-    user_code { Faker::Base::letterify('????') }
-    department_code { Faker::Base::letterify('??????') }
-    transmission_number { Faker::Base::numerify('####')}
-    user_generation_number { Faker::Base::numerify('####')}
-    internal_branch_code '632005'
-    eft_sequence_number 1
-    eft_sequence_number_updated_at Time.now
-  end
-  
   factory :bank_account, :class => "Bankserv::BankAccount" do
     branch_code { Faker::Base::numerify('######') }
     account_number { Faker::Base::numerify('############') }

data/spec/internal/db/schema.rb

@@ -15,23 +15,16 @@ ActiveRecord::Schema.define do
     t.timestamps
   end
   
-  create_table :bankserv_configurations, :force => true do |t|
+  create_table :bankserv_services, :force => true do |t|
     t.boolean :active, :default => false
+    t.string :type
     t.string :client_code
-    t.string :client_name
-    t.string :client_abbreviated_name
-    t.string :user_code
-    t.integer :transmission_number
-    t.integer :user_generation_number
-    t.string :department_code
-    t.string :internal_branch_code
-    t.boolean :live_env, :default => false
+    t.text :config
     t.timestamps
-    t.integer :eft_sequence_number
-    t.datetime :eft_sequence_number_updated_at
   end
   
   create_table :bankserv_requests, :force => true do |t|
+    t.integer :service_id
     t.string :type
     t.text :data
     t.boolean :processed, :default => false

data/spec/lib/bankserv/account_holder_verification_spec.rb

@@ -5,7 +5,8 @@ describe Bankserv::AccountHolderVerification do
   
   before(:each) do    
     tear_it_down
-    create(:configuration)
+    
+    @ahv_service = Bankserv::AHVService.register(client_code: 12345, internal_branch_code: '632005', transmission_status: "L", transmission_number: "1")
        
     @hash = attributes_for(:ahv_bankserv_request)
     @hash[:data][:bank_account] = attributes_for(:bank_account)
@@ -14,7 +15,7 @@ describe Bankserv::AccountHolderVerification do
   context "requesting an account holder verification" do
   
     it "should be able to queue a request for an account holder verification" do
-      Bankserv::AccountHolderVerification.test_request(@hash).should be_true
+      @ahv_service.request(@hash).should be_true
     
       request = Bankserv::Request.last
       request.type.should == "ahv"
@@ -26,12 +27,12 @@ describe Bankserv::AccountHolderVerification do
   context "when creating a new account holder verification" do
     
     it "should be marked as new" do
-      Bankserv::AccountHolderVerification.request(@hash)
+      @ahv_service.request(@hash)
       Bankserv::AccountHolderVerification.last.new?.should be_true
     end
   
     it "should create an account holder verification record, with associated bank account" do
-      Bankserv::AccountHolderVerification.request(@hash).should be_true
+      @ahv_service.request(@hash).should be_true
     
       ahv = Bankserv::AccountHolderVerification.for_reference(@hash[:data][:user_ref]).first
       ahv.new?.should be_true
@@ -41,7 +42,7 @@ describe Bankserv::AccountHolderVerification do
   
     it "should mark verifications with an absa branch code as internal" do
       @hash[:data][:bank_account].merge!(attributes_for(:internal_bank_account))
-      Bankserv::AccountHolderVerification.request(@hash).should be_true
+      @ahv_service.request(@hash).should be_true
       
       ahv = Bankserv::AccountHolderVerification.for_reference(@hash[:data][:user_ref]).first
       ahv.should be_internal
@@ -49,14 +50,14 @@ describe Bankserv::AccountHolderVerification do
   
     it "should mark verifications with a non-absa branch code as external" do
       @hash[:data][:bank_account].merge!(attributes_for(:external_bank_account))
-      Bankserv::AccountHolderVerification.request(@hash).should be_true
+      @ahv_service.request(@hash).should be_true
     
       ahv = Bankserv::AccountHolderVerification.for_reference(@hash[:data][:user_ref]).first
       ahv.should be_external
     end
     
     it "should generate a unique internal reference" do
-      Bankserv::AccountHolderVerification.request(@hash)
+      @ahv_service.request(@hash)
       Bankserv::AccountHolderVerification.last.internal_user_ref.should match /AHV[0-9]+/
     end
     

data/spec/lib/bankserv/credit_spec.rb

@@ -37,16 +37,18 @@ describe Bankserv::Debit do
         type: 'credit',
         data: { batches: @data, type_of_service: "SAMEDAY"}
       }
+      
+      @credit_service = Bankserv::CreditService.register(client_code: '12345', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", transmission_status: "L", transmission_number: "1")
     end
     
     it "should be able to queue a request of credit orders" do
-      Bankserv::Credit.request(@hash).should be_true
+      @credit_service.request(@hash).should be_true
       Bankserv::Credit.all.each {|db| db.completed?.should be_false }
       Bankserv::Credit.all.each {|db| db.new?.should be_true }
     end
   
     it "should link all debit order to the credit record" do
-      Bankserv::Credit.request(@hash)
+      @credit_service.request(@hash)
       Bankserv::Credit.all.map(&:batch_id).uniq.length.should == 1
     end
     
@@ -54,6 +56,8 @@ describe Bankserv::Debit do
   
   context "queuing a batch of batched credit orders" do    
     before(:each) do
+      @credit_service = Bankserv::CreditService.register(client_code: '12345', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", 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: 1000000, user_ref: 234, action_date: Date.today },
@@ -79,13 +83,13 @@ describe Bankserv::Debit do
     end
     
     it "should be able to queue a batched request of credit orders" do
-      Bankserv::Credit.request(@hash).should be_true
+      @credit_service.request(@hash).should be_true
       Bankserv::Credit.all.each {|db| db.completed?.should be_false }
       Bankserv::Credit.all.each {|db| db.new?.should be_true }
     end
   
     it "should link all debit order to their respective credit record" do
-      Bankserv::Credit.request(@hash)
+      @credit_service.request(@hash)
       Bankserv::Credit.all.map(&:batch_id).uniq.length.should == 2
     end
   end

data/spec/lib/bankserv/debit_spec.rb

@@ -14,8 +14,6 @@ describe Bankserv::Debit do
   context "queuing a batch of debit orders" do
     
     before(:all) do
-      
-      create(:configuration, client_code: "10", client_name: "LDC USER 10 AFRICA (PTY)", user_code: "9534", client_abbreviated_name: "ALIMITTST")
       @data = [{
         credit: {
           account_number: "907654321",
@@ -39,16 +37,18 @@ describe Bankserv::Debit do
         type: 'debit',
         data: { type_of_service: "SAMEDAY", batches: @data }
       }
+      
+      @debit_service = 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")
     end
     
     it "should be able to queue a request of debit orders" do
-      Bankserv::Debit.request(@hash).should be_true
+      @debit_service.request(@hash).should be_true
       Bankserv::Debit.all.each {|db| db.completed?.should be_false }
       Bankserv::Debit.all.each {|db| db.new?.should be_true }
     end
   
     it "should link all debit order to the credit record" do
-      Bankserv::Debit.request(@hash)
+      @debit_service.request(@hash)
       Bankserv::Debit.all.map(&:batch_id).uniq.length.should == 1
     end
     
@@ -78,16 +78,18 @@ describe Bankserv::Debit do
         type: 'debit',
         data: {type_of_service: "ONE DAY", batches: @data}
       }
+      
+      @debit_service = 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")
     end
     
     it "should be able to queue a batched request of debit orders" do
-      Bankserv::Debit.request(@hash).should be_true
+      @debit_service.request(@hash).should be_true
       Bankserv::Debit.all.each {|db| db.completed?.should be_false }
       Bankserv::Credit.all.each {|db| db.new?.should be_true }
     end
   
     it "should link all debit order to their respective credit record" do
-      Bankserv::Debit.request(@hash)
+      @debit_service.request(@hash)
       Bankserv::Debit.all.map(&:batch_id).uniq.length.should == 2
     end
     

data/spec/lib/bankserv/engine/engine_spec.rb

@@ -18,6 +18,7 @@ describe Bankserv::Engine do
     FileUtils.rm_rf(Dir.pwd + "/spec/examples/host2host/archives", secure: true)
     File.delete(Dir.pwd + "/spec/tmp/harry.txt")
     File.delete(Dir.pwd + "/spec/tmp/sally.txt")
+    File.delete(Dir.pwd + "/spec/tmp/molly.txt")
   end
   
   context "Prepare engine" do
@@ -42,7 +43,7 @@ describe Bankserv::Engine do
   context "Testing individual methods of engine" do
     
     before(:all) do
-      create(:configuration, client_code: "986", client_name: "TESTTEST", user_code: "9999", user_generation_number: 846, client_abbreviated_name: "TESTTEST")
+      Bankserv::DebitService.register(client_code: '12345', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", transmission_status: "L", transmission_number: "1")
       t = Time.local(2012, 1, 23, 10, 5, 0)
       Timecop.travel(t)
       file_contents = File.open("./spec/examples/eft_input_with_2_sets.txt", "rb").read
@@ -54,19 +55,19 @@ describe Bankserv::Engine do
       Bankserv::Engine.input_directory = Dir.pwd + "/spec/examples/host2host"
       Bankserv::Engine.archive_directory = Dir.pwd + "/spec/examples/host2host/archives"
       
-      @queue = Bankserv::Engine.new
+      @engine = Bankserv::Engine.new
     end
     
     it "should be able to start processing work" do
-      @queue.start!.should be_true
+      @engine.start!.should be_true
     end
     
     it "should be set to running" do
-      @queue.running?.should be_true
+      @engine.running?.should be_true
     end
     
     it "should be expecting a reply file" do
-      @queue.expecting_reply_file?.should be_true
+      @engine.expecting_reply_file?.should be_true
     end
     
     it "should be able to return a list of reply files" do
@@ -78,19 +79,19 @@ describe Bankserv::Engine do
     end
     
     it "should be able to process reply files" do
-      @queue.process_reply_files
+      @engine.process_reply_files
       Bankserv::Document.first.reply_status.should == "ACCEPTED"
-      @queue.expecting_reply_file?.should be_false
+      @engine.expecting_reply_file?.should be_false
     end
     
     it "should be able to process output files" do
-      @queue.process_output_files
+      @engine.process_output_files
     end
     
     it "should be able to set the process to finished" do
-      @queue.finish!.should be_true
-      @queue.running?.should be_false
-      @queue.process.success.should be_true
+      @engine.finish!.should be_true
+      @engine.running?.should be_false
+      @engine.process.success.should be_true
     end
     
     it "should not have any processes running" do
@@ -106,27 +107,23 @@ describe Bankserv::Engine do
       
       Timecop.travel(Time.local(2008, 8, 8, 10, 5, 0))
       Bankserv::EngineConfiguration.create!(interval_in_minutes: 15, input_directory: "/tmp", output_directory: "/tmp", archive_directory: "/tmp")
-      create(:configuration, client_code: "986", client_name: "TESTTEST", user_code: "9999", user_generation_number: 846, client_abbreviated_name: "TESTTEST")
+      @service = Bankserv::CreditService.register(client_code: '12345', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", transmission_status: "L", transmission_number: "1")
       
-      create_credit_request
-      
-      Bankserv::Configuration.stub!(:live_env?).and_return(true)
-      Bankserv::InputDocument.stub!(:fetch_next_transmission_number).and_return("846")
-      Bankserv::Transmission::UserSet::Eft.stub!(:last_sequence_number_today).and_return(77)
+      create_credit_request(@service)
       
       Bankserv::Engine.output_directory = Dir.pwd + "/spec/examples/host2host"
       Bankserv::Engine.input_directory = Dir.pwd + "/spec/examples/host2host"
       Bankserv::Engine.archive_directory = Dir.pwd + "/spec/examples/host2host/archives"
       
-      @queue = Bankserv::Engine.new
-      @queue.start! # create a process
+      @engine = Bankserv::Engine.new
+      @engine.start! # create a process
     end
      
     it "should process the document" do
-      @queue.process_input_files
+      @engine.process_input_files
       @document = Bankserv::Document.last
       @document.processed.should be_true
-      @queue.expecting_reply_file?.should be_true
+      @engine.expecting_reply_file?.should be_true
     end
     
     it "should write a file to the input directory" do
@@ -137,17 +134,19 @@ describe Bankserv::Engine do
   
   context "integration testing" do
     
-    before(:each) do
+    before(:all) do
+      tear_it_down
       Timecop.travel(Time.local(2012, 4, 10, 10, 5, 0))
       @tmpdir = Dir.pwd + "/spec/tmp"
-      tear_it_down
-      create(:configuration, client_code: "12345", client_name: "TESTTEST", user_code: "9999", user_generation_number: 1, client_abbreviated_name: "TESTTEST", department_code: "506")
+      @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: "L", transmission_number: "1")
+      @debit_service = 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")
+      @credit_service = Bankserv::CreditService.register(client_code: '12347', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
       Bankserv::EngineConfiguration.create!(interval_in_minutes: 15, input_directory: @tmpdir, output_directory: @tmpdir, archive_directory: @tmpdir)
     end
   
     it "should process ahv requests" do
       Bankserv::AccountHolderVerification.should_receive(:generate_reference_number).exactly(8).times.and_return("AHV67","AHV68","AHV69","AHV70","AHV71","AHV72","AHV73","AHV74")
-      create_ahv_requests_scenario
+      create_ahv_requests_scenario(@ahv_service)
       e = Bankserv::Engine.new
       e.should_receive(:generate_input_file_name).and_return("harry.txt")
       e.process!
@@ -159,12 +158,11 @@ describe Bankserv::Engine do
     end
   
     it "should process debit requests" do
-      create_debit_requests_scenario
+      create_debit_requests_scenario(@debit_service)
       
       e = Bankserv::Engine.new
       e.should_receive(:generate_input_file_name).and_return("sally.txt")
       e.process!
-      puts e.inspect
     
       expected_string = File.open("./spec/examples/INPUT.120411110604.txt", "rb").read
       got_string = File.open(@tmpdir + '/sally.txt', "rb").read
@@ -173,7 +171,16 @@ describe Bankserv::Engine do
     end
   
     it "should process credit requests" do
-      pending
+      create_credit_requests_scenario(@credit_service)
+      
+      e = Bankserv::Engine.new
+      e.should_receive(:generate_input_file_name).and_return("molly.txt")
+      e.process!
+    
+      expected_string = File.open("./spec/examples/INPUT.120411124123.txt", "rb").read
+      got_string = File.open(@tmpdir + '/molly.txt', "rb").read
+    
+      got_string.should == expected_string
     end
   
   end

data/spec/lib/bankserv/service_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Bankserv::Service do
+  include Helpers
+  
+  before(:each) do
+    tear_it_down
+  end
+  
+  it "should allow a service to be registered" do
+    params = {
+      client_code: '1234',
+      client_name: 'RCTEST',
+      transmission_status: "L",
+      transmission_number: "1"
+    }
+    
+    bankserv_service = Bankserv::AHVService.register(params)
+    
+    bankserv_service.is_a?(Bankserv::AHVService).should be_true
+    bankserv_service.client_code.should == '1234'
+    bankserv_service.config[:client_name].should == 'RCTEST'
+    bankserv_service.config[:transmission_status].should == "L"
+    bankserv_service.config[:transmission_number].should == "1"
+  end
+  
+end