From b69204f65629261558048daac8cb544dbf473ddc Mon Sep 17 00:00:00 2001
From: Adam Shannon <adamkshannon@gmail.com>
Date: Thu, 7 Mar 2024 10:36:51 -0600
Subject: [PATCH] fix: Allow {6100} for CTP, but reject {6110} (matches
 specification)

See: https://moov-io.slack.com/archives/CJV1WSCKF/p1709756468901419
---
 fedWireMessage.go      |  4 ++--
 fedWiremessage_test.go | 45 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/fedWireMessage.go b/fedWireMessage.go
index ce3e358a..10f9bee0 100644
--- a/fedWireMessage.go
+++ b/fedWireMessage.go
@@ -618,8 +618,8 @@ func (fwm *FEDWireMessage) checkProhibitedCustomerTransferPlusTags() error {
 	if fwm.AccountCreditedDrawdown != nil {
 		return fieldError("AccountCreditedDrawdown", ErrInvalidProperty, fwm.AccountCreditedDrawdown)
 	}
-	if fwm.FIReceiverFI != nil {
-		return fieldError("FIReceiverFI", ErrInvalidProperty, fwm.FIReceiverFI)
+	if fwm.FIDrawdownDebitAccountAdvice != nil {
+		return fieldError("FIDrawdownDebitAccountAdvice", ErrInvalidProperty, fwm.FIDrawdownDebitAccountAdvice)
 	}
 
 	if fwm.LocalInstrument != nil {
diff --git a/fedWiremessage_test.go b/fedWiremessage_test.go
index 992b78a1..f57f62b1 100644
--- a/fedWiremessage_test.go
+++ b/fedWiremessage_test.go
@@ -2,6 +2,7 @@ package wire
 
 import (
 	"encoding/json"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -1214,6 +1215,50 @@ func TestInvalidAccountCreditedDrawdownForCustomerTransferPlus(t *testing.T) {
 	require.EqualError(t, err, expected)
 }
 
+func TestInvalidFIDrawdownDebitAccountAdviceForCustomerTransferPlus(t *testing.T) {
+	fwm := new(FEDWireMessage)
+	bfc := mockBusinessFunctionCode()
+	bfc.BusinessFunctionCode = CustomerTransferPlus
+	fwm.BusinessFunctionCode = bfc
+	fwm.FIDrawdownDebitAccountAdvice = mockFIDrawdownDebitAccountAdvice()
+
+	err := fwm.checkProhibitedCustomerTransferPlusTags()
+
+	expected := fieldError("FIDrawdownDebitAccountAdvice", ErrInvalidProperty, fwm.FIDrawdownDebitAccountAdvice).Error()
+	require.EqualError(t, err, expected)
+}
+
+func TestAllowFIReceiverFIForCustomerTransferPlus(t *testing.T) {
+	// Reported in the #wire slack channel. {6100} tag was being rejected when specifications allow it.
+	// {6110} is rejected however, so added TestInvalidFIDrawdownDebitAccountAdviceForCustomerTransferPlus
+
+	input := `{1100}30P N
+{1110}12345678FT01
+{1120}20240306I1B78Q1C00057312345678FT01
+{1510}1000
+{1520}20240306MMQFMPYZ012345
+{2000}000005000000
+{3100}021000000CITIBANK NA*
+{3320}D0440000000001*
+{3400}000000000AAA ABC BAN*
+{3600}CTP
+{3620}3*A1234567-1234-4567-7890-C1234A12DD34*
+{3700}SUSD0,00*
+{4200}D1234567*FBO ABC INC*XXX, YYY*051*US*
+{5000}D12345678*Hello World*A, B,*C 10*5000*
+{5100}BCITIUS33XXX*
+{6000}FFC ABC ACCT 800000*YYYY     HELLLLL*/POP:XXYY*
+{6100}AAA BBB*CCC. DDD*FW123456789 FOR ACCOUNT 780000000*17*`
+
+	opts := &ValidateOpts{
+		AllowMissingSenderSupplied: true,
+	}
+
+	file, err := NewReader(strings.NewReader(input)).ReadWithOpts(opts)
+	require.NoError(t, err)
+	require.NotNil(t, file)
+}
+
 func TestFEDWireMessage_skipIMAD(t *testing.T) {
 	file := NewFile()
 	fwm := mockCustomerTransferData()