bankserv 0.2.4 → 0.2.5

data/lib/bankserv/engine.rb

@@ -67,9 +67,9 @@ module Bankserv
     end
     
     def process_input_files        
-      Bankserv::Service.active.each do |bankserv_service|
+      input_services.each do |bankserv_service|
         begin
-          next if self.expecting_reply_file? # TODO: expecting per service
+          next if self.expecting_reply_file?(bankserv_service)
         
           if document = Bankserv::InputDocument.generate!(bankserv_service)
             @logs[:input_files] << "Input Document created with id: #{document.id}" if document
@@ -85,6 +85,10 @@ module Bankserv
       end
     end
     
+    def input_services
+      Bankserv::Service.active.select(&:can_transmit?)
+    end
+    
     def write_file!(document)
       begin
         transmission = Absa::H2h::Transmission::Document.build([document.to_hash])
@@ -113,8 +117,8 @@ module Bankserv
       FileUtils.mv(file, "#{Bankserv::Engine.archive_directory}/#{year}/#{month}/")
     end
     
-    def expecting_reply_file?
-      Bankserv::Document.where(type: 'input', reply_status: nil, processed: true).count > 0
+    def expecting_reply_file?(bankserv_service)
+      Bankserv::Document.where(type: 'input', reply_status: nil, processed: true, client_code: bankserv_service.client_code).count > 0
     end
     
     def finish!

data/lib/bankserv/service.rb

@@ -50,6 +50,10 @@ module Bankserv
     def is_test_env?
       config[:transmission_status] == "T"
     end
+    
+    def can_transmit?
+      false
+    end
   
   end
   
@@ -59,6 +63,10 @@ module Bankserv
       params.merge!(test: true) if is_test_env?
       Request.create!(params)
     end
+    
+    def can_transmit?
+      true
+    end
   end
   
   class CreditService < Service
@@ -66,7 +74,11 @@ module Bankserv
       params.merge!(type: 'credit', service_id: id)
       params.merge!(test: true) if is_test_env?
       Request.create!(params)
-    end  
+    end
+    
+    def can_transmit?
+      true
+    end
   end
   
   class AHVService < Service
@@ -74,6 +86,10 @@ module Bankserv
       params.merge!(type: 'ahv', service_id: id)
       params.merge!(test: true) if is_test_env?
       Request.create!(params)
+    end
+    
+    def can_transmit?
+      true
     end  
   end
   

data/lib/bankserv/transmission/input_document.rb

@@ -9,7 +9,13 @@ class Bankserv::InputDocument < Bankserv::Document
     
     raise "Expected a document set" unless options[:type] == "document"
     
-    document = new(type: 'input', transmission_number: options[:data][0][:data][:transmission_no], transmission_status: options[:data][0][:data][:rec_status])
+    document = new(
+      type: 'input', 
+      transmission_number: options[:data][0][:data][:transmission_no], 
+      transmission_status: options[:data][0][:data][:rec_status],
+      client_code: options[:data][0][:data][:client_code]
+    )
+    
     document.set = Bankserv::Set.from_hash(options)
     document.set.document = document # whaaaaaa?
     document.save!
@@ -49,7 +55,14 @@ class Bankserv::InputDocument < Bankserv::Document
     raise "Transmission status not specified" if transmission_status.nil?
     options[:transmission_no] ||= bankserv_service.config[:transmission_number]
     
-    document = new(transmission_status: transmission_status, rec_status: options[:rec_status], type: 'input', transmission_number: options[:transmission_no])
+    document = new(
+      transmission_status: transmission_status, 
+      rec_status: options[:rec_status], 
+      type: 'input', 
+      transmission_number: options[:transmission_no],
+      client_code: bankserv_service.client_code
+    )
+    
     document.set = Bankserv::Transmission::UserSet::Document.generate(options.merge(rec_status: document.rec_status))
     document.set.document = document # whaaaaaa?
     

data/lib/bankserv/version.rb

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

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

@@ -22,23 +22,10 @@ class CreateBankservTables < ActiveRecord::Migration
       t.string :client_code
       t.text :config
       t.timestamps
-          # 
-          # 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|
+      t.integer :service_id
       t.string :type
       t.text :data
       t.boolean :processed, :default => false
@@ -98,6 +85,7 @@ class CreateBankservTables < ActiveRecord::Migration
     end
     
     create_table :bankserv_documents do |t|
+      t.string :client_code
       t.string :type
       t.references :set
       t.boolean :processed, :default => false

data/spec/internal/db/schema.rb

@@ -84,6 +84,7 @@ ActiveRecord::Schema.define do
   end
   
   create_table :bankserv_documents, :force => true do |t|
+    t.string :client_code
     t.string :type
     t.references :set
     t.boolean :processed, :default => false

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

@@ -40,10 +40,23 @@ describe Bankserv::Engine do
     
   end
   
+  it "should retrieve services which can transmit input documents" do
+    debit_service = Bankserv::DebitService.register(client_code: '10', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", transmission_status: "L", transmission_number: "1")
+    credit_service = Bankserv::CreditService.register(client_code: '12345', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", transmission_status: "L", 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: "L", transmission_number: "1")
+    statement_service = Bankserv::StatementService.register(client_code: '12346', client_name: "TESTTEST", client_abbreviated_name: 'TESTTEST', user_code: "9999", generation_number: 1, transmission_status: "L", transmission_number: "1")
+    
+    input_services = Bankserv::Engine.new.input_services
+    input_services.include?(debit_service).should be_true
+    input_services.include?(credit_service).should be_true
+    input_services.include?(ahv_service).should be_true
+    input_services.include?(statement_service).should be_false
+  end
+  
   context "Testing individual methods of engine" do
     
     before(:all) do
-      Bankserv::DebitService.register(client_code: '12345', client_name: "RCTEST", client_abbreviated_name: 'RCTEST', user_code: "9534", transmission_status: "L", transmission_number: "1")
+      @debit_service = Bankserv::DebitService.register(client_code: '10', 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
@@ -67,7 +80,7 @@ describe Bankserv::Engine do
     end
     
     it "should be expecting a reply file" do
-      @engine.expecting_reply_file?.should be_true
+      @engine.expecting_reply_file?(@debit_service).should be_true
     end
     
     it "should be able to return a list of reply files" do
@@ -81,7 +94,7 @@ describe Bankserv::Engine do
     it "should be able to process reply files" do
       @engine.process_reply_files
       Bankserv::Document.first.reply_status.should == "ACCEPTED"
-      @engine.expecting_reply_file?.should be_false
+      @engine.expecting_reply_file?(@debit_service).should be_false
     end
     
     it "should be able to process output files" do
@@ -123,7 +136,7 @@ describe Bankserv::Engine do
       @engine.process_input_files
       @document = Bankserv::Document.last
       @document.processed.should be_true
-      @engine.expecting_reply_file?.should be_true
+      @engine.expecting_reply_file?(@service).should be_true
     end
     
     it "should write a file to the input directory" do
@@ -142,44 +155,33 @@ describe Bankserv::Engine do
       @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
+      
+      # test that engine can process different service types at once (generate 3 files with one run)
       Bankserv::AccountHolderVerification.should_receive(:generate_reference_number).exactly(8).times.and_return("AHV67","AHV68","AHV69","AHV70","AHV71","AHV72","AHV73","AHV74")
       create_ahv_requests_scenario(@ahv_service)
+      create_debit_requests_scenario(@debit_service)
+      create_credit_requests_scenario(@credit_service)
+      
       e = Bankserv::Engine.new
-      e.should_receive(:generate_input_file_name).and_return("harry.txt")
+      e.should_receive(:generate_input_file_name).and_return("harry.txt", "sally.txt", "molly.txt")
       e.process!
-    
+    end
+  
+    it "should process ahv requests" do
       expected_string = File.open("./spec/examples/INPUT.120410144410.txt", "rb").read
       got_string = File.open(@tmpdir + '/harry.txt', "rb").read
-    
       got_string.should == expected_string
     end
   
     it "should process debit requests" do
-      create_debit_requests_scenario(@debit_service)
-      
-      e = Bankserv::Engine.new
-      e.should_receive(:generate_input_file_name).and_return("sally.txt")
-      e.process!
-    
       expected_string = File.open("./spec/examples/INPUT.120411110604.txt", "rb").read
       got_string = File.open(@tmpdir + '/sally.txt', "rb").read
-    
       got_string.should == expected_string
     end
   
     it "should process credit requests" do
-      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
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70253469356280 !ruby/object:Gem::Requirement
+  requirement: &70306756830520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253469356280
+  version_requirements: *70306756830520
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70253469355680 !ruby/object:Gem::Requirement
+  requirement: &70306756829960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253469355680
+  version_requirements: *70306756829960
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70253469347540 !ruby/object:Gem::Requirement
+  requirement: &70306756829340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253469347540
+  version_requirements: *70306756829340
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70253469346880 !ruby/object:Gem::Requirement
+  requirement: &70306756828780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70253469346880
+  version_requirements: *70306756828780
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70253469346260 !ruby/object:Gem::Requirement
+  requirement: &70306756828140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70253469346260
+  version_requirements: *70306756828140
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70253469345680 !ruby/object:Gem::Requirement
+  requirement: &70306756827560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70253469345680
+  version_requirements: *70306756827560
 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. "