wei · pull · May 23, 2025 · May 23, 2025 · May 23, 2025 · May 23, 2025
diff --git a/batchACK.go b/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

diff --git a/batchADV.go b/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)
 	}

diff --git a/batchARC.go b/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

diff --git a/batchATX.go b/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

diff --git a/batchBOC.go b/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

diff --git a/batchCCD.go b/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

diff --git a/batchCIE.go b/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

diff --git a/batchCOR.go b/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

diff --git a/batchCTX.go b/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

diff --git a/batchDNE.go b/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
 	}

diff --git a/batchENR.go b/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
 	}

diff --git a/batchHeader.go b/batchHeader.go
@@ -316,15 +316,27 @@ func (bh *BatchHeader) Validate() error {
 		if err := bh.isAlphanumeric(bh.CompanyName); err != nil {
 			return fieldError("CompanyName", err, bh.CompanyName)
 		}
+		if err := bh.isNonZero(bh.CompanyName); err != nil {
+			return fieldError("CompanyName", err, bh.CompanyName)
+		}
+
 		if err := bh.isAlphanumeric(bh.CompanyDiscretionaryData); err != nil {
 			return fieldError("CompanyDiscretionaryData", err, bh.CompanyDiscretionaryData)
 		}
+
 		if err := bh.isAlphanumeric(bh.CompanyIdentification); err != nil {
 			return fieldError("CompanyIdentification", err, bh.CompanyIdentification)
 		}
+		if err := bh.isNonZero(bh.CompanyIdentification); err != nil {
+			return fieldError("CompanyIdentification", err, bh.CompanyIdentification)
+		}
+
 		if err := bh.isAlphanumeric(bh.CompanyEntryDescription); err != nil {
 			return fieldError("CompanyEntryDescription", err, bh.CompanyEntryDescription)
 		}
+		if err := bh.isNonZero(bh.CompanyEntryDescription); err != nil {
+			return fieldError("CompanyEntryDescription", err, bh.CompanyEntryDescription)
+		}
 	}
 	return nil
 }

diff --git a/batchHeader_test.go b/batchHeader_test.go
@@ -269,6 +269,27 @@ func BenchmarkBatchHeaderFieldInclusion(b *testing.B) {
 	}
 }
 
+func TestBatchHeader_CompanyIdentificationZeros(t *testing.T) {
+	bh := mockBatchHeader()
+	bh.CompanyIdentification = strings.Repeat("0", 10)
+	err := bh.Validate()
+	require.ErrorContains(t, err, "CompanyIdentification 0000000000 contains only spaces and zeros")
+}
+
+func TestBatchHeader_CompanyNameZeros(t *testing.T) {
+	bh := mockBatchHeader()
+	bh.CompanyName = "000  000"
+	err := bh.Validate()
+	require.ErrorContains(t, err, "CompanyName 000  000 contains only spaces and zeros")
+}
+
+func TestBatchHeader_CompanyEntryDescriptionZeros(t *testing.T) {
+	bh := mockBatchHeader()
+	bh.CompanyEntryDescription = "  000  "
+	err := bh.Validate()
+	require.ErrorContains(t, err, "CompanyEntryDescription   000   contains only spaces and zeros")
+}
+
 // testBatchHeaderCompanyNameAlphaNumeric validates batch header company name is alphanumeric
 func testBatchHeaderCompanyNameAlphaNumeric(t testing.TB) {
 	bh := mockBatchHeader()

diff --git a/batchMTE.go b/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

diff --git a/batchPOP.go b/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

diff --git a/batchPOS.go b/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

diff --git a/batchPPD.go b/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

diff --git a/batchRCK.go b/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

diff --git a/batchSHR.go b/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

diff --git a/batchTEL.go b/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

diff --git a/batchTRC.go b/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

diff --git a/batchTRX.go b/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

diff --git a/batchWeb.go b/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

diff --git a/batchXCK.go b/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

diff --git a/fileErrors.go b/fileErrors.go
@@ -29,6 +29,8 @@ var (
 	ErrFileHeader = errors.New("none or more than one file headers exists")
 	// ErrFileControl is the error given if there is the wrong number of file control records
 	ErrFileControl = errors.New("none or more than one file control exists")
+	// ErrMisplacedFileHeader is the error given when a file header is the non-first record
+	ErrMisplacedFileHeader = errors.New("file header is not the first record")
 	// ErrFileEntryOutsideBatch is the error given if an entry is outside of a batch
 	ErrFileEntryOutsideBatch = errors.New("entry outside of batch")
 	// ErrFileAddendaOutsideBatch is the error given if an addenda is outside of a batch

diff --git a/reader.go b/reader.go
@@ -504,6 +504,10 @@ func (r *Reader) parseEDAddenda() error {
 
 // parseFileHeader takes the input record string and parses the FileHeaderRecord values
 func (r *Reader) parseFileHeader() error {
+	if r.currentBatch != nil || len(r.File.Batches) > 0 || len(r.File.IATBatches) > 0 {
+		return r.parseError(ErrMisplacedFileHeader)
+	}
+
 	r.recordName = "FileHeader"
 	// Pass through any ValidateOpts from the Reader for this comparison
 	// as we need to compare the other struct fields (e.g. origin, destination)

diff --git a/reader_test.go b/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())
 		}
 	}