batch: check SkipAll inside Validate()

Author: adamdecaf

batchACK.go

@@ -38,6 +38,10 @@ func NewBatchACK(bh *BatchHeader) *BatchACK {
 //
 // Validate will never modify the batch.
 func (batch *BatchACK) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchADV.go

@@ -40,6 +40,10 @@ func NewBatchADV(bh *BatchHeader) *BatchADV {
 //
 // Validate will never modify the batch.
 func (batch *BatchADV) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	if batch.Header.StandardEntryClassCode != ADV {
 		return batch.Error("StandardEntryClassCode", ErrBatchSECType, ADV)
 	}

batchARC.go

@@ -48,6 +48,10 @@ func NewBatchARC(bh *BatchHeader) *BatchARC {
 //
 // Validate will never modify the batch.
 func (batch *BatchARC) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchATX.go

@@ -44,6 +44,10 @@ func NewBatchATX(bh *BatchHeader) *BatchATX {
 //
 // Validate will never modify the batch.
 func (batch *BatchATX) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchBOC.go

@@ -53,6 +53,10 @@ func NewBatchBOC(bh *BatchHeader) *BatchBOC {
 //
 // Validate will never modify the batch.
 func (batch *BatchBOC) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchCCD.go

@@ -35,6 +35,10 @@ func NewBatchCCD(bh *BatchHeader) *BatchCCD {
 
 // Validate ensures the batch meets NACHA rules specific to this batch type.
 func (batch *BatchCCD) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchCIE.go

@@ -44,6 +44,10 @@ func NewBatchCIE(bh *BatchHeader) *BatchCIE {
 //
 // Validate will never modify the batch.
 func (batch *BatchCIE) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchCOR.go

@@ -35,6 +35,10 @@ func NewBatchCOR(bh *BatchHeader) *BatchCOR {
 
 // Validate ensures the batch meets NACHA rules specific to this batch type.
 func (batch *BatchCOR) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchCTX.go

@@ -45,6 +45,10 @@ func NewBatchCTX(bh *BatchHeader) *BatchCTX {
 //
 // Validate will never modify the batch.
 func (batch *BatchCTX) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchDNE.go

@@ -46,6 +46,10 @@ func NewBatchDNE(bh *BatchHeader) *BatchDNE {
 
 // Validate ensures the batch meets NACHA rules specific to this batch type.
 func (batch *BatchDNE) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	if err := batch.verify(); err != nil {
 		return err
 	}

batchENR.go

@@ -43,6 +43,10 @@ func NewBatchENR(bh *BatchHeader) *BatchENR {
 
 // Validate ensures the batch meets NACHA rules specific to this batch type.
 func (batch *BatchENR) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	if err := batch.verify(); err != nil {
 		return err
 	}

batchMTE.go

@@ -45,6 +45,10 @@ func NewBatchMTE(bh *BatchHeader) *BatchMTE {
 //
 // Validate will never modify the batch.
 func (batch *BatchMTE) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchPOP.go

@@ -50,6 +50,10 @@ func NewBatchPOP(bh *BatchHeader) *BatchPOP {
 //
 // Validate will never modify the batch.
 func (batch *BatchPOP) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchPOS.go

@@ -53,6 +53,10 @@ func NewBatchPOS(bh *BatchHeader) *BatchPOS {
 //
 // Validate will never modify the batch.
 func (batch *BatchPOS) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchPPD.go

@@ -36,6 +36,10 @@ func NewBatchPPD(bh *BatchHeader) *BatchPPD {
 //
 // Validate will never modify the batch.
 func (batch *BatchPPD) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchRCK.go

@@ -39,6 +39,10 @@ func NewBatchRCK(bh *BatchHeader) *BatchRCK {
 //
 // Validate will never modify the batch.
 func (batch *BatchRCK) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchSHR.go

@@ -48,6 +48,10 @@ func NewBatchSHR(bh *BatchHeader) *BatchSHR {
 //
 // Validate will never modify the batch.
 func (batch *BatchSHR) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchTEL.go

@@ -37,6 +37,10 @@ func NewBatchTEL(bh *BatchHeader) *BatchTEL {
 
 // Validate ensures the batch meets NACHA rules specific to the SEC type TEL
 func (batch *BatchTEL) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchTRC.go

@@ -38,6 +38,10 @@ func NewBatchTRC(bh *BatchHeader) *BatchTRC {
 //
 // Validate will never modify the batch.
 func (batch *BatchTRC) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchTRX.go

@@ -42,6 +42,10 @@ func NewBatchTRX(bh *BatchHeader) *BatchTRX {
 //
 // Validate will never modify the batch.
 func (batch *BatchTRX) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchWeb.go

@@ -35,6 +35,10 @@ func NewBatchWEB(bh *BatchHeader) *BatchWEB {
 
 // Validate ensures the batch meets NACHA rules specific to this batch type.
 func (batch *BatchWEB) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

batchXCK.go

@@ -38,6 +38,10 @@ func NewBatchXCK(bh *BatchHeader) *BatchXCK {
 //
 // Validate will never modify the batch.
 func (batch *BatchXCK) Validate() error {
+	if batch.validateOpts != nil && batch.validateOpts.SkipAll {
+		return nil
+	}
+
 	// basic verification of the batch before we validate specific rules.
 	if err := batch.verify(); err != nil {
 		return err

reader_test.go

@@ -2163,7 +2163,7 @@ func TestReadFile_SkipValidation(t *testing.T) {
 		t.Errorf("got: %v, want: %v (batched length)", len(f.Batches), 3)
 	} else {
 		for _, batch := range f.Batches {
-			require.Error(t, batch.Validate())
+			require.NoError(t, batch.Validate())
 		}
 	}