bankserv 0.1.6 → 0.1.7

data/lib/bankserv/transmission/set.rb

@@ -115,6 +115,15 @@ module Bankserv
       transactions.select{|rec| rec.data[:user_sequence_number] == sequence_number}.first
     end
     
+    def base_set
+      return parent.base_set if parent
+      self
+    end
+    
+    def get_document
+      base_set.document
+    end
+    
   end
     
 end

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

@@ -47,13 +47,17 @@ module Bankserv
         date.strftime("%y%m%d")
       end
       
-      def last_sequence_number_today
-        last = Record.where("date(created_at) = ? AND record_type = 'standard_record'", Date.today).last
+      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 user_sequence_number
-        (last_sequence_number_today + transactions.count + 1).to_s
+        (Bankserv::Transmission::UserSet::Eft::last_sequence_number_today + transactions.count + 1).to_s
       end
       
       def contra_records
@@ -75,7 +79,7 @@ module Bankserv
         record_data.merge!(
           rec_id: rec_id,
           bankserv_creation_date: Time.now.strftime("%y%m%d"),
-          first_sequence_number: (last_sequence_number_today + 1).to_s,
+          first_sequence_number: (Bankserv::Transmission::UserSet::Eft.last_sequence_number_today + 1).to_s,
           user_generation_number: generation_number,
           type_of_service: @type_of_service,
           accepted_report: @accepted_report.nil? ? "" : @accepted_report,

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

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

@@ -116,7 +116,7 @@ describe Bankserv::Engine do
       
       Bankserv::Configuration.stub!(:live_env?).and_return(true)
       Bankserv::InputDocument.stub!(:fetch_next_transmission_number).and_return("846")
-      Bankserv::Record.create! record_type:"standard_record", data: {user_sequence_number: 77}, set_id: 76876
+      Bankserv::Transmission::UserSet::Eft.stub!(:last_sequence_number_today).and_return(77)
       
       Bankserv::Engine.output_directory = Dir.pwd + "/spec/examples/host2host"
       Bankserv::Engine.input_directory = Dir.pwd + "/spec/examples/host2host"

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

@@ -185,10 +185,11 @@ describe Bankserv::InputDocument do
     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")
       
-      Bankserv::Record.create! record_type:"standard_record", data: {user_sequence_number: 77}, set_id: 76876
+      #Bankserv::Record.create! record_type:"standard_record", data: {user_sequence_number: 77}, set_id: 76876
         
       Bankserv::InputDocument.generate!(
         th_for_use_of_ld_user: ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankserv
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000Z
+date: 2012-04-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70348632669320 !ruby/object:Gem::Requirement
+  requirement: &70135436090400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632669320
+  version_requirements: *70135436090400
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70348632649320 !ruby/object:Gem::Requirement
+  requirement: &70135436089760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632649320
+  version_requirements: *70135436089760
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70348632648800 !ruby/object:Gem::Requirement
+  requirement: &70135436089260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348632648800
+  version_requirements: *70135436089260
 - !ruby/object:Gem::Dependency
   name: absa-h2h
-  requirement: &70348632648220 !ruby/object:Gem::Requirement
+  requirement: &70135436088560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70348632648220
+  version_requirements: *70135436088560
 - !ruby/object:Gem::Dependency
   name: absa-esd
-  requirement: &70348632647700 !ruby/object:Gem::Requirement
+  requirement: &70135436087960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348632647700
+  version_requirements: *70135436087960
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70348632647240 !ruby/object:Gem::Requirement
+  requirement: &70135436087380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70348632647240
+  version_requirements: *70135436087380
 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. "