bankserv 0.2.3 → 0.2.4

data/lib/bankserv.rb

@@ -14,7 +14,7 @@ module Bankserv
   
 end
 
-require "bankserv/configuration"
+require "bankserv/service"
 require "bankserv/eft"
 require "bankserv/request"
 require "bankserv/bank_account"

data/lib/bankserv/account_holder_verification.rb

@@ -1,7 +1,6 @@
 module Bankserv
   
   class AccountHolderVerification < ActiveRecord::Base
-    
     self.inheritance_column = :_type_disabled
     serialize :response
     
@@ -22,14 +21,9 @@ module Bankserv
     def self.generate_reference_number(ahv)
       "AHV#{ahv.id}"
     end
-  
-    def self.request(options = {})
-      options.merge!(type: 'ahv')
-      Request.create!(options)
-    end
     
-    def self.test_request(options)
-      Request.create!(options.merge(test: true))
+    def self.service
+      Bankserv::AHVService.where(active: true).last
     end
     
     def self.for_reference(reference)
@@ -42,7 +36,7 @@ module Bankserv
     
     def self.build!(options)
       bank_account = BankAccount.new options[:bank_account].filter_attributes(BankAccount)
-      is_internal = bank_account.branch_code == Bankserv::Configuration.internal_branch_code
+      is_internal = bank_account.branch_code == self.service.config[:internal_branch_code]
       options = options.filter_attributes(self).merge(bank_account: bank_account, internal: is_internal)
       
       create!(options)

data/lib/bankserv/credit.rb

@@ -11,6 +11,14 @@ module Bankserv
     
     after_create :generate_internal_user_ref
     
+    def self.bankserv_service
+      Bankserv::CreditService.where(active: true).last
+    end
+    
+    def bankserv_service
+      Bankserv::Credit.bankserv_service
+    end
+    
     def generate_internal_user_ref
       self.internal_user_ref = "CREDIT#{id}"
       save!
@@ -49,10 +57,13 @@ module Bankserv
     end
     
     def formatted_user_ref
+      abbreviated_name = bankserv_service.config[:client_abbreviated_name]
+      
       if contra?
-        Configuration.client_abbreviated_name.ljust(10, ' ') << "CONTRA#{user_ref}"
+        bankserv_service.config[:client_abbreviated_name]
+        abbreviated_name.ljust(10, ' ') << "CONTRA#{user_ref}"
       else
-        Configuration.client_abbreviated_name.ljust(10, ' ') << user_ref
+        abbreviated_name.ljust(10, ' ') << user_ref
       end
     end
     

data/lib/bankserv/debit.rb

@@ -11,6 +11,14 @@ module Bankserv
     
     after_create :generate_internal_user_ref
     
+    def self.bankserv_service
+      Bankserv::DebitService.where(active: true).last
+    end
+    
+    def bankserv_service
+      Bankserv::Debit.bankserv_service
+    end
+    
     def generate_internal_user_ref
       self.internal_user_ref = "DEBIT#{id}"
       save!  
@@ -25,10 +33,12 @@ module Bankserv
     end
     
     def formatted_user_ref
+      abbreviated_name = bankserv_service.config[:client_abbreviated_name]
+      
       if contra?
-        Configuration.client_abbreviated_name.ljust(10, ' ') << "CONTRA#{user_ref}"
+        abbreviated_name.ljust(10, ' ') << "CONTRA#{user_ref}"
       else
-        Configuration.client_abbreviated_name.ljust(10, ' ') << user_ref
+        abbreviated_name.ljust(10, ' ') << user_ref
       end
     end
     

data/lib/bankserv/eft.rb

@@ -4,14 +4,6 @@ module Bankserv
     # Any change here will ripple down...
     attr_accessor :request_id
     
-    def request(options)
-      Request.create!(options)
-    end
-    
-    def test_request(options)
-      Request.create!(options.merge(test: true))
-    end
-    
     def build!(options)
       @request_id = options[:bankserv_request_id]
       

data/lib/bankserv/engine.rb

@@ -66,23 +66,22 @@ module Bankserv
       end
     end
     
-    def process_input_files
-      unless self.expecting_reply_file?
+    def process_input_files        
+      Bankserv::Service.active.each do |bankserv_service|
         begin
-          document = Bankserv::InputDocument.generate!(
-            client_code: Bankserv::Configuration.client_code, 
-            client_name: Bankserv::Configuration.client_name, 
-            th_for_use_of_ld_user: ""
-          )
-          @logs[:input_files] << "Input Document created with id: #{document.id}"
+          next if self.expecting_reply_file? # TODO: expecting per service
+        
+          if document = Bankserv::InputDocument.generate!(bankserv_service)
+            @logs[:input_files] << "Input Document created with id: #{document.id}" if document
+          
+            if self.write_file!(document)
+              document.mark_processed!
+            end
+          end
         rescue Exception => e
           @logs[:input_files] << "Error occured! #{e.message}"
           @success = false
         end
-        
-        if self.write_file!(document)
-          document.mark_processed!
-        end      
       end
     end
     

data/lib/bankserv/request.rb

@@ -1,6 +1,7 @@
 module Bankserv
   
   class Request < ActiveRecord::Base
+    belongs_to :service
     serialize :data
     
     self.inheritance_column = :_type_disabled

data/lib/bankserv/service.rb

@@ -0,0 +1,88 @@
+module Bankserv
+  
+  class Service < ActiveRecord::Base
+    
+    has_many :requests
+    serialize :config
+    
+    def self.register(params)
+      s = new
+      s.active = true
+      s.client_code = params.delete(:client_code)
+      s.config = params
+      s.save!
+      s
+    end
+    
+    def self.active
+      where(active: true)
+    end
+    
+    def set_generation_number!(number)
+      self.config[:generation_number] = number
+      save!
+    end
+    
+    def reserve_generation_number!
+      reserved = config[:generation_number] || 1
+      set_generation_number!(reserved + 1)
+      reserved
+    end
+    
+    def sequence_number
+      sequence_number = config[:sequence_number] || 1
+      sequence_number = 1 unless (config[:sequence_number_updated_at] || Time.now).to_date == Date.today
+      sequence_number
+    end
+    
+    def set_sequence_number!(number)
+      self.config[:sequence_number] = number
+      self.config[:sequence_number_updated_at] = Time.now
+      save!
+    end
+    
+    def reserve_sequence_number!(reserved = nil)
+      reserved ||= sequence_number
+      set_sequence_number!(reserved.to_i + 1)
+      reserved
+    end
+    
+    def is_test_env?
+      config[:transmission_status] == "T"
+    end
+  
+  end
+  
+  class DebitService < Service
+    def request(params)
+      params.merge!(type: 'debit', service_id: id)
+      params.merge!(test: true) if is_test_env?
+      Request.create!(params)
+    end
+  end
+  
+  class CreditService < Service
+    def request(params)
+      params.merge!(type: 'credit', service_id: id)
+      params.merge!(test: true) if is_test_env?
+      Request.create!(params)
+    end  
+  end
+  
+  class AHVService < Service
+    def request(params)
+      params.merge!(type: 'ahv', service_id: id)
+      params.merge!(test: true) if is_test_env?
+      Request.create!(params)
+    end  
+  end
+  
+  class StatementService < Service
+    def request(params)
+      params.merge!(type: 'statement', service_id: id)
+      params.merge!(test: true) if is_test_env?
+      Request.create!(params)
+    end
+  end
+  
+end

data/lib/bankserv/transmission/input_document.rb

@@ -16,11 +16,6 @@ class Bankserv::InputDocument < Bankserv::Document
     document      
   end
   
-  def self.fetch_next_transmission_number
-    transmission_status = Bankserv::Configuration.live_env? ? "L" : "T"
-    where(type: 'input', reply_status: 'ACCEPTED', transmission_status: transmission_status).maximum(:transmission_number) or "1"
-  end
-  
   def self.sets_with_work
     defined_input_sets.select(&:has_work?)
   end
@@ -37,18 +32,22 @@ class Bankserv::InputDocument < Bankserv::Document
     sets_with_test_work.any?
   end
   
-  def self.generate_test!(options = {})
-    build!(options.merge(rec_status: "T")) if has_test_work?
-  end
-  
-  def self.generate!(options = {})
-    build!(options.merge(rec_status: "L")) if has_work?
-  end
-  
-  def self.build!(options = {}) # move to private      
-    options[:transmission_no] ||= fetch_next_transmission_number
+  def self.generate!(bankserv_service)
+    if bankserv_service.is_test_env?
+      return unless has_test_work?
+    else
+      return unless has_work?
+    end
     
-    transmission_status = Bankserv::Configuration.live_env? ? "L" : "T"
+    options = {}
+    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: ""
+    
+    transmission_status = bankserv_service.config[:transmission_status]
+    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.set = Bankserv::Transmission::UserSet::Document.generate(options.merge(rec_status: document.rec_status))
@@ -60,6 +59,9 @@ class Bankserv::InputDocument < Bankserv::Document
       sets_with_test_work
     end
     
+    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)
       document.set.sets[-1].set = document.set # whaaaaaa?

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

@@ -61,11 +61,31 @@ module Bankserv
       end
    
       private
+      
+      # def bankserv_service
+      #   Bankserv::Service.where(active: true, type: 'ahv').last
+      # end
+      # 
+      # def self.bankserv_service
+      #   Bankserv::Service.where(active: true, type: 'ahv').last
+      # end
+      
+      def bankserv_service
+        self.class.bankserv_service
+        #Bankserv::Transmission::UserSet::AccountHolderVerification.bankserv_service
+        #Bankserv::Service.where(active: true, type: 'debit').last
+      end
+      
+
+      def self.bankserv_service
+        Bankserv::AHVService.where(active: true).last
+        #Bankserv::Service.where(active: true, type: 'debit').last
+      end
     
       def set_header
-        self.generation_number = Bankserv::Configuration.reserve_user_generation_number!.to_s
+        self.generation_number = bankserv_service.reserve_generation_number!.to_s
         header.data[:gen_no] = generation_number
-        header.data[:dept_code] = Bankserv::Configuration.department_code
+        header.data[:dept_code] = bankserv_service.config[:department_code]
         header.save!
       end
     

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

@@ -38,6 +38,14 @@ module Bankserv
       def credit_records
         standard_records
       end
+      
+      def bankserv_service
+        Bankserv::Transmission::UserSet::Credit.bankserv_service
+      end
+
+      def self.bankserv_service
+        Bankserv::CreditService.where(active: true).last
+      end
           
     end
   end

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

@@ -38,6 +38,17 @@ module Bankserv
       def credit_records
         contra_records
       end
+      
+      def bankserv_service
+        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
 
     end
   end

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

@@ -15,8 +15,8 @@ module Bankserv
     
         def build_header(options = {})
           defaults = {
-            client_code: Bankserv::Configuration.active.client_code,
-            client_name: Bankserv::Configuration.active.client_name,
+            client_code: options[:client_code],
+            client_name: options[:client_name],
             date: Date.today.strftime("%Y%m%d"),
             destination: "0"
           }

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

@@ -27,7 +27,7 @@ module Bankserv
         efts = self.unprocessed_efts(options[:rec_status])
         
         if efts.count > 0
-          set = self.new
+          set = self.new 
           set.type_of_service = efts.first.request.data[:type_of_service]
           set.accepted_report = efts.first.request.data[:accepted_report] || ""
           set.account_type_correct = efts.first.request.data[:account_type_correct] || ""
@@ -56,7 +56,7 @@ module Bankserv
       end
       
       def get_user_generation_number
-        Bankserv::Configuration.reserve_user_generation_number!.to_s #Equal to the last accepted user gen number + 1
+        bankserv_service.reserve_generation_number!.to_s #Equal to the last accepted user gen number + 1
       end
       
       def build_header(options = {})
@@ -100,7 +100,7 @@ module Bankserv
           rec_id: rec_id,
           user_nominated_account: transaction.contra_bank_details.account_number, 
           user_branch: transaction.contra_bank_details.branch_code, 
-          user_code: Bankserv::Configuration.active.user_code,
+          user_code: bankserv_service.config[:user_code],
           bankserv_record_identifier: standard_bankserv_record_identifier,
           homing_branch: homing_branch_code,
           homing_account_number: homing_account_number.length <= 11 ? homing_account_number : "0",
@@ -125,7 +125,7 @@ module Bankserv
           bankserv_record_identifier: contra_bankserv_record_identifier,
           user_branch: transaction.bank_account.branch_code,
           user_nominated_account: transaction.bank_account.account_number.to_i.to_s,
-          user_code: Bankserv::Configuration.active.user_code,
+          user_code: bankserv_service.config[:user_code],
           homing_branch: transaction.bank_account.branch_code,
           homing_account_number: transaction.bank_account.account_number,
           type_of_account: "1",
@@ -180,7 +180,7 @@ module Bankserv
       private
       
       def set_sequence_numbers
-        sequence_number = (header.data[:first_sequence_number] || Bankserv::Configuration.reserve_eft_sequence_number!).to_i
+        sequence_number = (header.data[:first_sequence_number] || bankserv_service.reserve_sequence_number!).to_i
         
         header.data[:first_sequence_number] = sequence_number.to_s
         trailer.data[:first_sequence_number] = sequence_number.to_s
@@ -191,11 +191,12 @@ module Bankserv
         end
         
         trailer.data[:last_sequence_number] = (sequence_number - 1).to_s
-        Bankserv::Configuration.reserve_eft_sequence_number!(sequence_number - 1)
+        
+        bankserv_service.reserve_sequence_number!(sequence_number - 1)
       end
       
       def decorate_header
-        header.data[:bankserv_user_code] = Bankserv::Configuration.active.user_code
+        header.data[:bankserv_user_code] = bankserv_service.config[:user_code]
         header.data[:bankserv_purge_date] = purge_date
         header.data[:first_action_date] = first_action_date
         header.data[:last_action_date] = last_action_date
@@ -203,7 +204,7 @@ module Bankserv
       end
       
       def decorate_trailer  
-        trailer.data[:bankserv_user_code] = Bankserv::Configuration.active.user_code
+        trailer.data[:bankserv_user_code] = header.data[:bankserv_user_code]
         trailer.data[:first_action_date] = first_action_date
         trailer.data[:last_action_date] = last_action_date
         trailer.data[:no_debit_records] = no_debit_records