Merge pull request #1699 from moov-io/fix-issue-1697

fix: read C06 by length first

Author: adamdecaf

addenda98.go

@@ -308,10 +308,12 @@ func (addenda98 *Addenda98) ParseCorrectedData() *CorrectedData {
 		if v := first(17, data); v != "" {
 			return &CorrectedData{AccountNumber: v}
 		}
+
 	case "C02": // Incorrect Routing Number
 		if v := first(9, data); v != "" {
 			return &CorrectedData{RoutingNumber: v}
 		}
+
 	case "C03": // Incorrect Routing Number and Incorrect DFI Account Number
 		parts := strings.Fields(data)
 		if len(parts) == 2 {
@@ -320,24 +322,40 @@ func (addenda98 *Addenda98) ParseCorrectedData() *CorrectedData {
 				AccountNumber: parts[1],
 			}
 		}
+
 	case "C04": // Incorrect Individual Name
 		if v := first(22, data); v != "" {
 			return &CorrectedData{Name: v}
 		}
+
 	case "C05": // Incorrect Transaction Code
 		if n, err := strconv.Atoi(first(2, data)); err == nil {
 			return &CorrectedData{TransactionCode: n}
 		}
+
 	case "C06": // Incorrect DFI Account Number and Incorrect Transaction Code
-		parts := strings.Fields(data)
-		if len(parts) == 2 {
-			if n, err := strconv.Atoi(parts[1]); err == nil {
-				return &CorrectedData{
-					AccountNumber:   parts[0],
-					TransactionCode: n,
+		var out CorrectedData
+		if utf8.RuneCountInString(data) > 17 {
+			out.AccountNumber = first(17, data)
+
+			n, err := strconv.Atoi(strings.TrimSpace(data[17:]))
+			if err == nil {
+				out.TransactionCode = n
+				return &out
+			}
+		} else {
+			parts := strings.Fields(data)
+			if len(parts) == 2 {
+				out.AccountNumber = parts[0]
+
+				if n, err := strconv.Atoi(parts[1]); err == nil {
+					out.TransactionCode = n
+					return &out
 				}
 			}
 		}
+		return nil
+
 	case "C07": // Incorrect Routing Number, Incorrect DFI Account Number, and Incorrect Tranaction Code
 		var cd CorrectedData
 		if n := len(data); n > 9 {
@@ -355,6 +373,7 @@ func (addenda98 *Addenda98) ParseCorrectedData() *CorrectedData {
 		} else {
 			return nil
 		}
+
 	case "C09": // Incorrect Individual Identification Number
 		if v := first(22, data); v != "" {
 			return &CorrectedData{Identification: v}

test/issues/issue1697_test.go

@@ -0,0 +1,24 @@
+package issues
+
+import (
+	"testing"
+
+	"github.com/moov-io/ach"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestIssue1697(t *testing.T) {
+	correction := ach.NewAddenda98()
+	correction.ChangeCode = "C06"
+	correction.CorrectedData = "123456789 111            22"
+
+	data := correction.ParseCorrectedData()
+	require.NotNil(t, data)
+
+	require.Equal(t, "123456789 111", data.AccountNumber)
+	require.Empty(t, data.RoutingNumber)
+	require.Empty(t, data.Name)
+	require.Equal(t, ach.CheckingCredit, data.TransactionCode)
+	require.Empty(t, data.Identification)
+}