bankserv 0.1.8 → 0.1.9

data/lib/bankserv/configuration.rb

@@ -63,21 +63,20 @@ module Bankserv
     end
     
     def self.eft_sequence_number
-      self.active.eft_sequence_number or 1
+      sequence_number = self.active.eft_sequence_number || 1
+      sequence_number = 1 unless self.active.eft_sequence_number_updated_at.to_date == Date.today
+      sequence_number
     end
     
     def self.set_eft_sequence_number!(number)
       self.active.update_attributes!(eft_sequence_number: number, eft_sequence_number_updated_at: Time.now)
     end
     
-    def self.reserve_eft_sequence_number!(reserved=nil)
+    def self.reserve_eft_sequence_number!(reserved = nil)
       reserved ||= self.eft_sequence_number
-      reserved ||= 1
-      reserved = 1 if self.active.eft_sequence_number_updated_at < Date.today.beginning_of_day
       self.set_eft_sequence_number!(reserved.to_i + 1)
       reserved
     end
-    
   
   end
   

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

@@ -47,24 +47,6 @@ module Bankserv
         date.strftime("%y%m%d")
       end
       
-      def self.last_sequence_number_today
-        if last = Record.where("date(created_at) = ? AND record_type = 'standard_record'", Date.today).last
-          document = last.set.get_document
-          raise "Cannot determine sequence number" if ((document) && (document.reply_status != 'ACCEPTED'))
-        end
-        
-        last.nil? ? 0 : last.data[:user_sequence_number].to_i
-      end
-      
-      def self.user_sequence_number(transactions)
-        # (Bankserv::Configuration.eft_sequence_number + transactions.count).to_s
-        (Bankserv::Transmission::UserSet::Eft.last_sequence_number_today + transactions.count + 1).to_s
-      end
-      
-      def user_sequence_number
-        Bankserv::Transmission::UserSet::Eft.user_sequence_number(transactions)
-      end
-      
       def contra_records
         records.where(record_type: "contra_record")
       end
@@ -77,10 +59,6 @@ module Bankserv
         Bankserv::Configuration.reserve_user_generation_number!.to_s #Equal to the last accepted user gen number + 1
       end
       
-      def reserve_eft_sequence_number(number=nil)
-        Bankserv::Configuration.reserve_eft_sequence_number!(number).to_s
-      end
-      
       def build_header(options = {})
         self.generation_number = options[:user_generation_number] || get_user_generation_number
         record_data = Absa::H2h::Transmission::Eft.record_type('header').template_options
@@ -94,6 +72,8 @@ module Bankserv
           account_type_correct: @account_type_correct
         )
         
+        record_data.merge!(first_sequence_number: options[:first_sequence_number]) if options[:first_sequence_number]
+        
         records.build(record_type: "header", data: record_data)
       end
       
@@ -118,7 +98,6 @@ module Bankserv
         
         record_data.merge!(
           rec_id: rec_id,
-          user_sequence_number: user_sequence_number,
           user_nominated_account: transaction.contra_bank_details.account_number, 
           user_branch: transaction.contra_bank_details.branch_code, 
           user_code: Bankserv::Configuration.active.user_code,
@@ -143,7 +122,6 @@ module Bankserv
         
         record_data.merge!(
           rec_id: rec_id,
-          user_sequence_number: user_sequence_number,
           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,
@@ -214,7 +192,8 @@ module Bankserv
       private
       
       def set_sequence_numbers
-        sequence_number = (header.data[:first_sequence_number] || reserve_eft_sequence_number).to_i
+        sequence_number = (header.data[:first_sequence_number] || Bankserv::Configuration.reserve_eft_sequence_number!).to_i
+        
         header.data[:first_sequence_number] = sequence_number.to_s
         trailer.data[:first_sequence_number] = sequence_number.to_s
         
@@ -224,6 +203,7 @@ module Bankserv
         end
         
         trailer.data[:last_sequence_number] = (sequence_number - 1).to_s
+        Bankserv::Configuration.reserve_eft_sequence_number!(sequence_number - 1)
       end
       
       def decorate_header

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/examples/eft_input_with_2_sets.txt

@@ -2,7 +2,7 @@
 001T0495340405240405310405240405270000010037CORPSSV                                                                                                                                                   
 001T5063200504053538939953400000163200501019611899100000001000040524440000ALIMITTST SPP   1040524 01    HENNIE DU TOIT                00000000000000000000                21                          
 001T929534000001000016040524040527000014000002000002000020308000000020308000036311034141                                                                                                          
-001T0495340405240405310405240405270000010038CORPSSV                                                                                                                                                   
+001T0495340405240405310405240405270000020038CORPSSV                                                                                                                                                   
 001T5063200504053538939953400000263200501019611899100000001000040524440000ALIMITTST SPP   1040524 01    HENNIE DU TOIT                00000000000000000000                21                          
 001T929534000001000016040524040527000014000002000002000020308000000020308000036311034141                                                                                                                  
 999T000000020

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

@@ -172,13 +172,12 @@ describe Bankserv::InputDocument do
 
       t = Time.local(2008, 8, 8, 10, 5, 0)
       Timecop.travel(t)
-      create(:configuration, client_code: "986", client_name: "TESTTEST", user_code: "9999", user_generation_number: 846, client_abbreviated_name: "TESTTEST", eft_sequence_number: 78, eft_sequence_number_updated_at: Time.now)
       
+      create(:configuration, client_code: "986", client_name: "TESTTEST", user_code: "9999", user_generation_number: 846, client_abbreviated_name: "TESTTEST", eft_sequence_number: 78, eft_sequence_number_updated_at: Time.now)
       create_credit_request
     end
     
     it "should build a new document with a credit set" do
-      Bankserv::Transmission::UserSet::Eft.stub!(:last_sequence_number_today).and_return(77)
       Bankserv::Configuration.stub!(:live_env?).and_return(true)
       Bankserv::InputDocument.stub!(:fetch_next_transmission_number).and_return("846")
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70292450761780 !ruby/object:Gem::Requirement
+  requirement: &70340533489260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292450761780
+  version_requirements: *70340533489260
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70292450761280 !ruby/object:Gem::Requirement
+  requirement: &70340533488720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292450761280
+  version_requirements: *70340533488720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70292450760860 !ruby/object:Gem::Requirement
+  requirement: &70340533488260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292450760860
+  version_requirements: *70340533488260
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70292450760280 !ruby/object:Gem::Requirement
+  requirement: &70340533487680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70292450760280
+  version_requirements: *70340533487680
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70292450759780 !ruby/object:Gem::Requirement
+  requirement: &70340533487160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70292450759780
+  version_requirements: *70340533487160
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70292450759320 !ruby/object:Gem::Requirement
+  requirement: &70340533486680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70292450759320
+  version_requirements: *70340533486680
 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. "