changed length verification logic, stripping new lines

moov-io · Jun 13, 2022 · cb710dd · cb710dd
1 parent d8ee14a
commit cb710dd
Show file tree

Hide file tree

Showing 89 changed files with 133 additions and 97 deletions.
diff --git a/accountCreditedDrawdown.go b/accountCreditedDrawdown.go
@@ -50,7 +50,7 @@ func (creditDD *AccountCreditedDrawdown) Parse(record string) error {
 	creditDD.DrawdownCreditAccountNumber = value
 	length += read
 
-	if len(record) != length {
+	if !creditDD.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/accountDebitedDrawdown.go b/accountDebitedDrawdown.go
@@ -84,7 +84,7 @@ func (debitDD *AccountDebitedDrawdown) Parse(record string) error {
 	debitDD.Address.AddressLineThree = value
 	length += read
 
-	if len(record) != length {
+	if !debitDD.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/actualAmountPaid.go b/actualAmountPaid.go
@@ -57,7 +57,7 @@ func (aap *ActualAmountPaid) Parse(record string) error {
 	aap.RemittanceAmount.Amount = value
 	length += read
 
-	if len(record) != length {
+	if !aap.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/actualAmountPaid_test.go b/actualAmountPaid_test.go
@@ -117,7 +117,7 @@ func TestStringActualAmountPaidVariableLength(t *testing.T) {
 	err = r.parseActualAmountPaid()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{8450}***"
+	line = "{8450}****"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/adjustment.go b/adjustment.go
@@ -84,7 +84,7 @@ func (adj *Adjustment) Parse(record string) error {
 	adj.AdditionalInfo = value
 	length += read
 
-	if len(record) != length {
+	if !adj.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/adjustment_test.go b/adjustment_test.go
@@ -160,7 +160,7 @@ func TestStringAdjustmentVariableLength(t *testing.T) {
 	err = r.parseAdjustment()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{8600}01CRDTUSD1234.56***"
+	line = "{8600}01CRDTUSD1234.56****"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/amountNegotiatedDiscount.go b/amountNegotiatedDiscount.go
@@ -57,7 +57,7 @@ func (nd *AmountNegotiatedDiscount) Parse(record string) error {
 	nd.RemittanceAmount.Amount = value
 	length += read
 
-	if len(record) != length {
+	if !nd.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/amountNegotiatedDiscount_test.go b/amountNegotiatedDiscount_test.go
@@ -117,7 +117,7 @@ func TestStringAmountNegotiatedDiscountVariableLength(t *testing.T) {
 	err = r.parseAmountNegotiatedDiscount()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{8550}USD1234.56**"
+	line = "{8550}USD1234.56***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/beneficiary.go b/beneficiary.go
@@ -79,7 +79,7 @@ func (ben *Beneficiary) Parse(record string) error {
 	ben.Personal.Address.AddressLineThree = value
 	length += read
 
-	if len(record) != length {
+	if !ben.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/beneficiaryCustomer.go b/beneficiaryCustomer.go
@@ -85,7 +85,7 @@ func (bc *BeneficiaryCustomer) Parse(record string) error {
 	bc.CoverPayment.SwiftLineFive = value
 	length += read
 
-	if len(record) != length {
+	if !bc.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/beneficiaryCustomer_test.go b/beneficiaryCustomer_test.go
@@ -150,7 +150,7 @@ func TestStringBeneficiaryCustomerVariableLength(t *testing.T) {
 	err = r.parseBeneficiaryCustomer()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{7059}*******"
+	line = "{7059}********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/beneficiaryFI.go b/beneficiaryFI.go
@@ -79,7 +79,7 @@ func (bfi *BeneficiaryFI) Parse(record string) error {
 	bfi.FinancialInstitution.Address.AddressLineThree = value
 	length += read
 
-	if len(record) != length {
+	if !bfi.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/beneficiaryFI_test.go b/beneficiaryFI_test.go
@@ -171,7 +171,7 @@ func TestStringBeneficiaryFIVariableLength(t *testing.T) {
 	err = r.parseBeneficiaryFI()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{4100}D123456789******"
+	line = "{4100}D123456789*******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/beneficiaryIntermediaryFI.go b/beneficiaryIntermediaryFI.go
@@ -79,7 +79,7 @@ func (bifi *BeneficiaryIntermediaryFI) Parse(record string) error {
 	bifi.FinancialInstitution.Address.AddressLineThree = value
 	length += read
 
-	if len(record) != length {
+	if !bifi.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/beneficiaryIntermediaryFI_test.go b/beneficiaryIntermediaryFI_test.go
@@ -174,7 +174,7 @@ func TestStringBeneficiaryIntermediaryFIVariableLength(t *testing.T) {
 	err = r.parseBeneficiaryIntermediaryFI()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{4000}D123456789******"
+	line = "{4000}D123456789*******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/beneficiaryReference.go b/beneficiaryReference.go
@@ -50,7 +50,7 @@ func (br *BeneficiaryReference) Parse(record string) error {
 	br.BeneficiaryReference = value
 	length += read
 
-	if len(record) != length {
+	if !br.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/beneficiaryReference_test.go b/beneficiaryReference_test.go
@@ -85,7 +85,7 @@ func TestStringBeneficiaryReferenceVariableLength(t *testing.T) {
 	err = r.parseBeneficiaryReference()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{4320}**"
+	line = "{4320}***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/beneficiary_test.go b/beneficiary_test.go
@@ -161,7 +161,7 @@ func TestStringBeneficiaryVariableLength(t *testing.T) {
 	err = r.parseBeneficiary()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{4200}31234******"
+	line = "{4200}31234*******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/businessFunctionCode.go b/businessFunctionCode.go
@@ -53,7 +53,7 @@ func (bfc *BusinessFunctionCode) Parse(record string) error {
 	bfc.TransactionTypeCode = value
 	length += read
 
-	if len(record) != length {
+	if !bfc.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/businessFunctionCode_test.go b/businessFunctionCode_test.go
@@ -97,7 +97,7 @@ func TestStringBusinessFunctionCodeVariableLength(t *testing.T) {
 	err = r.parseBusinessFunctionCode()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{3600}BTR**"
+	line = "{3600}BTR***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/charges.go b/charges.go
@@ -88,7 +88,7 @@ func (c *Charges) Parse(record string) error {
 	c.SendersChargesFour = value
 	length += read
 
-	if len(record) != length {
+	if !c.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/charges_test.go b/charges_test.go
@@ -60,7 +60,7 @@ func TestStringChargesVariableLength(t *testing.T) {
 	err = r.parseCharges()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{3700}B*****"
+	line = "{3700}B******"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/converters.go b/converters.go
@@ -142,3 +142,16 @@ func (c *converters) stripDelimiters(data string) string {
 
 	return data[:index]
 }
+
+// verify input data with read length
+func (c *converters) verifyDataWithReadLength(data string, read int) bool {
+	if len(data) == read {
+		return true
+	}
+
+	if len(data) > read && data[read:] == "*" {
+		return true
+	}
+
+	return false
+}
diff --git a/currencyInstructedAmount.go b/currencyInstructedAmount.go
@@ -60,7 +60,7 @@ func (cia *CurrencyInstructedAmount) Parse(record string) error {
 	cia.Amount = cia.parseStringField(record[length : length+18])
 	length += 18
 
-	if len(record) != length {
+	if !cia.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/errorWire.go b/errorWire.go
@@ -68,7 +68,7 @@ func (ew *ErrorWire) Parse(record string) error {
 	ew.ErrorDescription = value
 	length += read
 
-	if len(record) != length {
+	if !ew.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/errorWire_test.go b/errorWire_test.go
@@ -65,7 +65,7 @@ func TestStringErrorWireAmountVariableLength(t *testing.T) {
 	err = r.parseErrorWire()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{1130}1XYZData Error**"
+	line = "{1130}1XYZData Error***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/exchangeRate.go b/exchangeRate.go
@@ -51,7 +51,7 @@ func (eRate *ExchangeRate) Parse(record string) error {
 	eRate.ExchangeRate = value
 	length += read
 
-	if len(record) != length {
+	if !eRate.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/exchangeRate_test.go b/exchangeRate_test.go
@@ -87,7 +87,7 @@ func TestStringErrorExchangeRateVariableLength(t *testing.T) {
 	err = r.parseExchangeRate()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{3720}123**"
+	line = "{3720}123***"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fIBeneficiaryFIAdvice.go b/fIBeneficiaryFIAdvice.go
@@ -86,7 +86,7 @@ func (fibfia *FIBeneficiaryFIAdvice) Parse(record string) error {
 	fibfia.Advice.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fibfia.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fIBeneficiaryFIAdvice_test.go b/fIBeneficiaryFIAdvice_test.go
@@ -151,7 +151,7 @@ func TestStringFIBeneficiaryFIAdviceVariableLength(t *testing.T) {
 	err = r.parseFIBeneficiaryFIAdvice()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6310}HLD*******"
+	line = "{6310}HLD********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fiAdditionalFIToFI.go b/fiAdditionalFIToFI.go
@@ -85,7 +85,7 @@ func (fifi *FIAdditionalFIToFI) Parse(record string) error {
 	fifi.AdditionalFIToFI.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fifi.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiAdditionalFIToFI_test.go b/fiAdditionalFIToFI_test.go
@@ -139,7 +139,7 @@ func TestStringFIAdditionalFIToFIVariableLength(t *testing.T) {
 	err = r.parseFIAdditionalFIToFI()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6500}*******"
+	line = "{6500}********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fiBeneficiary.go b/fiBeneficiary.go
@@ -85,7 +85,7 @@ func (fib *FIBeneficiary) Parse(record string) error {
 	fib.FIToFI.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fib.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiBeneficiaryAdvice.go b/fiBeneficiaryAdvice.go
@@ -86,7 +86,7 @@ func (fiba *FIBeneficiaryAdvice) Parse(record string) error {
 	fiba.Advice.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fiba.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiBeneficiaryAdvice_test.go b/fiBeneficiaryAdvice_test.go
@@ -142,7 +142,7 @@ func TestStringFIBeneficiaryAdviceVariableLength(t *testing.T) {
 	err = r.parseFIBeneficiaryAdvice()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6410}HLD*******"
+	line = "{6410}HLD********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fiBeneficiaryFI.go b/fiBeneficiaryFI.go
@@ -85,7 +85,7 @@ func (fibfi *FIBeneficiaryFI) Parse(record string) error {
 	fibfi.FIToFI.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fibfi.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiBeneficiaryFI_test.go b/fiBeneficiaryFI_test.go
@@ -140,7 +140,7 @@ func TestStringFIBeneficiaryFIVariableLength(t *testing.T) {
 	err = r.parseFIBeneficiaryFI()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6300}*******"
+	line = "{6300}********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fiBeneficiary_test.go b/fiBeneficiary_test.go
@@ -139,7 +139,7 @@ func TestStringFIBeneficiaryVariableLength(t *testing.T) {
 	err = r.parseFIBeneficiary()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6400}*******"
+	line = "{6400}********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fiDrawdownDebitAccountAdvice.go b/fiDrawdownDebitAccountAdvice.go
@@ -86,7 +86,7 @@ func (debitDDAdvice *FIDrawdownDebitAccountAdvice) Parse(record string) error {
 	debitDDAdvice.Advice.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !debitDDAdvice.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiDrawdownDebitAccountAdvice_test.go b/fiDrawdownDebitAccountAdvice_test.go
@@ -151,7 +151,7 @@ func TestStringFIDrawdownDebitAccountAdviceVariableLength(t *testing.T) {
 	err = r.parseFIDrawdownDebitAccountAdvice()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6110}HLD*******"
+	line = "{6110}HLD********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line
 

diff --git a/fiIntermediaryFI.go b/fiIntermediaryFI.go
@@ -85,7 +85,7 @@ func (fiifi *FIIntermediaryFI) Parse(record string) error {
 	fiifi.FIToFI.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fiifi.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiIntermediaryFIAdvice.go b/fiIntermediaryFIAdvice.go
@@ -86,7 +86,7 @@ func (fiifia *FIIntermediaryFIAdvice) Parse(record string) error {
 	fiifia.Advice.LineSix = value
 	length += read
 
-	if len(record) != length {
+	if !fiifia.verifyDataWithReadLength(record, length) {
 		return NewTagMaxLengthErr()
 	}
 

diff --git a/fiIntermediaryFIAdvice_test.go b/fiIntermediaryFIAdvice_test.go
@@ -150,7 +150,7 @@ func TestStringFIIntermediaryFIAdviceVariableLength(t *testing.T) {
 	err = r.parseFIIntermediaryFIAdvice()
 	require.EqualError(t, err, r.parseError(NewTagMaxLengthErr()).Error())
 
-	line = "{6210}HLD*******"
+	line = "{6210}HLD********"
 	r = NewReader(strings.NewReader(line))
 	r.line = line