Merge pull request #572 from alexppxela/validation/fixt-reject-invalid-message

ackleymi · web-flow · commit ab15e5806737 · 2023-08-06T22:27:32.000-05:00
Check RejectInvalidMessage on FIXT validation
diff --git a/_test/definitions/server/fix50sp1/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix50sp1/14i_RepeatingGroupCountNotEqual.def
@@ -11,7 +11,7 @@ E8=FIXT.1.19=6735=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=2113
 #------------------------
 
 #New order message with incorrect repeating group "count". NoTradingSessions (386)
-I8=FIXT.1.135=D34=249=TW52=<TIME>56=ISLD11=ID21=140=154=138=200.0055=INTC386=3336=PRE-OPEN336=AFTER-HOURS60=<TIME>
+I8=FIXT.1.135=D34=249=TW52=<TIME>56=ISLD11=ID21=140=154=138=200.0055=INTC386=3336=3336=660=<TIME>
 # expect a reject
 E8=FIXT.1.19=12535=334=249=ISLD52=00000000-00:00:00.00056=TW45=258=Incorrect NumInGroup count for repeating group371=386372=D373=1610=0
 
@@ -23,4 +23,4 @@ E8=FIXT.1.19=12535=334=249=ISLD52=00000000-00:00:00.00056=TW45=258=Incor
 I8=FIXT.1.135=534=349=TW52=<TIME>56=ISLD
 E8=FIXT.1.19=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 
-eDISCONNECT
+eDISCONNECT
diff --git a/_test/definitions/server/fix50sp2/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix50sp2/14i_RepeatingGroupCountNotEqual.def
@@ -11,7 +11,7 @@ E8=FIXT.1.19=6735=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=2113
 #------------------------
 
 #New order message with incorrect repeating group "count". NoTradingSessions (386)
-I8=FIXT.1.135=D34=249=TW52=<TIME>56=ISLD11=ID21=140=154=138=200.0055=INTC386=3336=PRE-OPEN336=AFTER-HOURS60=<TIME>
+I8=FIXT.1.135=D34=249=TW52=<TIME>56=ISLD11=ID21=140=154=138=200.0055=INTC386=3336=3336=660=<TIME>
 # expect a reject
 E8=FIXT.1.19=12535=334=249=ISLD52=00000000-00:00:00.00056=TW45=258=Incorrect NumInGroup count for repeating group371=386372=D373=1610=0
 
@@ -23,4 +23,4 @@ E8=FIXT.1.19=12535=334=249=ISLD52=00000000-00:00:00.00056=TW45=258=Incor
 I8=FIXT.1.135=534=349=TW52=<TIME>56=ISLD
 E8=FIXT.1.19=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 
-eDISCONNECT
+eDISCONNECT
diff --git a/validation.go b/validation.go
@@ -136,12 +136,14 @@ func validateFIXT(transportDD, appDD *datadictionary.DataDictionary, settings Va
 		}
 	}
 
-	if err := validateWalk(transportDD, appDD, msgType, msg); err != nil {
-		return err
-	}
+	if settings.RejectInvalidMessage {
+		if err := validateFields(transportDD, appDD, msgType, msg); err != nil {
+			return err
+		}
 
-	if err := validateFields(transportDD, appDD, msgType, msg); err != nil {
-		return err
+		if err := validateWalk(transportDD, appDD, msgType, msg); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/validation_test.go b/validation_test.go

-Original file line number
+Diff line change
 #------------------------
 #New order message with incorrect repeating group "count". NoTradingSessions (386)
 -I8=FIXT.1.135=D34=249=TW52=<TIME>56=ISLD11=ID21=140=154=138=200.0055=INTC386=3336=PRE-OPEN336=AFTER-HOURS60=<TIME>
 +I8=FIXT.1.135=D34=249=TW52=<TIME>56=ISLD11=ID21=140=154=138=200.0055=INTC386=3336=3336=660=<TIME>
 # expect a reject
 E8=FIXT.1.19=12535=334=249=ISLD52=00000000-00:00:00.00056=TW45=258=Incorrect NumInGroup count for repeating group371=386372=D373=1610=0
 I8=FIXT.1.135=534=349=TW52=<TIME>56=ISLD
 E8=FIXT.1.19=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 -eDISCONNECT
 +eDISCONNECT
Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,14 @@ func validateFIXT(transportDD, appDD *datadictionary.DataDictionary, settings Va`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`- if err := validateWalk(transportDD, appDD, msgType, msg); err != nil {`
`140`		`- return err`
`141`		`- }`
	`139`	`+ if settings.RejectInvalidMessage {`
	`140`	`+ if err := validateFields(transportDD, appDD, msgType, msg); err != nil {`
	`141`	`+ return err`
	`142`	`+ }`
`142`	`143`
`143`		`- if err := validateFields(transportDD, appDD, msgType, msg); err != nil {`
`144`		`- return err`
	`144`	`+ if err := validateWalk(transportDD, appDD, msgType, msg); err != nil {`
	`145`	`+ return err`
	`146`	`+ }`
`145`	`147`	`}`
`146`	`148`
`147`	`149`	`return nil`