Workaround for HotChoc handling of arrays (#70)

* #68 * fix: Turn the list into an array as expected, then validate (ChilliCream/graphql-platform#4350) * 7.2.1
benmccallum · Nov 6, 2021 · 1d1983c · 1d1983c
1 parent b68cafd
commit 1d1983c
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 105 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -17,7 +17,7 @@
     <PackageIconUrl>https://github.com/benmccallum/fairybread/raw/master/logo-400x400.png</PackageIconUrl>
     <PackageLicenseUrl>https://github.com/benmccallum/fairybread/blob/master/LICENSE</PackageLicenseUrl>
 
-    <Version>7.2.0</Version>
+    <Version>7.2.1</Version>
 
     <FluentValidationVersion>10.0.0</FluentValidationVersion>
     <HotChocolateVersion>11.0.9</HotChocolateVersion>

diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=1.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=1.verified.txt
@@ -1,21 +1,5 @@
 {
-  Errors: [
-    {
-      Message: Unexpected Execution Error,
-      Path: {
-        Name: readWithArrayArg
-      },
-      Locations: [
-        {
-          Line: 1,
-          Column: 9
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'FooInputDto[]'.
-      }
-    }
-  ]
+  Data: {
+    readWithArrayArg: SomeInteger: 1, SomeString: hello
+  }
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=2.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=2.verified.txt
@@ -1,21 +1,5 @@
 {
-  Errors: [
-    {
-      Message: Unexpected Execution Error,
-      Path: {
-        Name: readWithArrayArg
-      },
-      Locations: [
-        {
-          Line: 1,
-          Column: 9
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'FooInputDto[]'.
-      }
-    }
-  ]
+  Data: {
+    readWithArrayArg: SomeInteger: 1, SomeString: hello
+  }
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=3.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=3.verified.txt
@@ -1,21 +1,5 @@
 {
-  Errors: [
-    {
-      Message: Unexpected Execution Error,
-      Path: {
-        Name: readWithArrayArg
-      },
-      Locations: [
-        {
-          Line: 1,
-          Column: 9
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'FooInputDto[]'.
-      }
-    }
-  ]
+  Data: {
+    readWithArrayArg: SomeInteger: 1, SomeString: hello, SomeInteger: 1, SomeString: hello
+  }
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=4.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=4.verified.txt
@@ -1,20 +1,27 @@
 {
   Errors: [
     {
-      Message: Unexpected Execution Error,
+      Message: 'Some Integer' must be equal to '1'.,
+      Code: FairyBread_ValidationError,
       Path: {
         Name: readWithArrayArg
       },
-      Locations: [
-        {
-          Line: 1,
-          Column: 9
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'FooInputDto[]'.
+      Extensions: {
+        code: FairyBread_ValidationError,
+        argumentName: foos,
+        validatorName: ArrayOfFooInputDtoValidator,
+        errorCode: EqualValidator,
+        errorMessage: 'Some Integer' must be equal to '1'.,
+        attemptedValue: -1,
+        severity: Error,
+        formattedMessagePlaceholderValues: {
+          ComparisonValue: 1,
+          ComparisonProperty: ,
+          PropertyName: Some Integer,
+          PropertyValue: -1,
+          CollectionIndex: 0
+        },
+        propertyName: x[0].SomeInteger
       }
     }
   ]

diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=5.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=5.verified.txt
@@ -1,20 +1,27 @@
 {
   Errors: [
     {
-      Message: Unexpected Execution Error,
+      Message: 'Some Integer' must be equal to '1'.,
+      Code: FairyBread_ValidationError,
       Path: {
         Name: readWithArrayArg
       },
-      Locations: [
-        {
-          Line: 1,
-          Column: 9
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'FooInputDto[]'.
+      Extensions: {
+        code: FairyBread_ValidationError,
+        argumentName: foos,
+        validatorName: ArrayOfFooInputDtoValidator,
+        errorCode: EqualValidator,
+        errorMessage: 'Some Integer' must be equal to '1'.,
+        attemptedValue: -1,
+        severity: Error,
+        formattedMessagePlaceholderValues: {
+          ComparisonValue: 1,
+          ComparisonProperty: ,
+          PropertyName: Some Integer,
+          PropertyValue: -1,
+          CollectionIndex: 0
+        },
+        propertyName: x[0].SomeInteger
       }
     }
   ]

diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=6.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=6.verified.txt
@@ -1,20 +1,51 @@
 {
   Errors: [
     {
-      Message: Unexpected Execution Error,
+      Message: 'Some Integer' must be equal to '1'.,
+      Code: FairyBread_ValidationError,
       Path: {
         Name: readWithArrayArg
       },
-      Locations: [
-        {
-          Line: 1,
-          Column: 9
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'FooInputDto[]'.
+      Extensions: {
+        code: FairyBread_ValidationError,
+        argumentName: foos,
+        validatorName: ArrayOfFooInputDtoValidator,
+        errorCode: EqualValidator,
+        errorMessage: 'Some Integer' must be equal to '1'.,
+        attemptedValue: -1,
+        severity: Error,
+        formattedMessagePlaceholderValues: {
+          ComparisonValue: 1,
+          ComparisonProperty: ,
+          PropertyName: Some Integer,
+          PropertyValue: -1,
+          CollectionIndex: 0
+        },
+        propertyName: x[0].SomeInteger
+      }
+    },
+    {
+      Message: 'Some Integer' must be equal to '1'.,
+      Code: FairyBread_ValidationError,
+      Path: {
+        Name: readWithArrayArg
+      },
+      Extensions: {
+        code: FairyBread_ValidationError,
+        argumentName: foos,
+        validatorName: ArrayOfFooInputDtoValidator,
+        errorCode: EqualValidator,
+        errorMessage: 'Some Integer' must be equal to '1'.,
+        attemptedValue: -1,
+        severity: Error,
+        formattedMessagePlaceholderValues: {
+          ComparisonValue: 1,
+          ComparisonProperty: ,
+          PropertyName: Some Integer,
+          PropertyValue: -1,
+          CollectionIndex: 1
+        },
+        propertyName: x[1].SomeInteger
       }
     }
   ]

diff --git a/src/FairyBread.Tests/InjectorTests.Works_registerValidators=True.verified.txt b/src/FairyBread.Tests/InjectorTests.Works_registerValidators=True.verified.txt
@@ -289,20 +289,51 @@
       }
     },
     {
-      Message: Unexpected Execution Error,
+      Message: '' must be greater than '0'.,
+      Code: FairyBread_ValidationError,
       Path: {
         Name: arrayArgA
       },
-      Locations: [
-        {
-          Line: 1,
-          Column: 424
-        }
-      ],
-      Exception: {
-        $type: InvalidOperationException,
-        Type: InvalidOperationException,
-        Message: Cannot validate instances of type 'List`1'. This validator can only validate instances of type 'Nullable`1[]'.
+      Extensions: {
+        code: FairyBread_ValidationError,
+        argumentName: items,
+        validatorName: ArrayOfNullableIntValidator,
+        errorCode: GreaterThanValidator,
+        errorMessage: '' must be greater than '0'.,
+        attemptedValue: 0,
+        severity: Error,
+        formattedMessagePlaceholderValues: {
+          CollectionIndex: 0,
+          ComparisonValue: 0,
+          ComparisonProperty: ,
+          PropertyName: null,
+          PropertyValue: 0
+        },
+        propertyName: x[0]
+      }
+    },
+    {
+      Message: '' must be greater than '0'.,
+      Code: FairyBread_ValidationError,
+      Path: {
+        Name: arrayArgA
+      },
+      Extensions: {
+        code: FairyBread_ValidationError,
+        argumentName: items,
+        validatorName: ArrayOfNullableIntValidator,
+        errorCode: GreaterThanValidator,
+        errorMessage: '' must be greater than '0'.,
+        attemptedValue: 0,
+        severity: Error,
+        formattedMessagePlaceholderValues: {
+          CollectionIndex: 1,
+          ComparisonValue: 0,
+          ComparisonProperty: ,
+          PropertyName: null,
+          PropertyValue: 0
+        },
+        propertyName: x[1]
       }
     },
     {

diff --git a/src/FairyBread/ValidationMiddleware.cs b/src/FairyBread/ValidationMiddleware.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using FluentValidation;
-using FluentValidation.Results;
 using HotChocolate.Resolvers;
+using HotChocolate.Types;
 
 namespace FairyBread
 {
@@ -49,9 +51,27 @@ public async Task InvokeAsync(IMiddlewareContext context)
                             continue;
                         }
 
+                        var isListType = argument.Type.IsListType();
+                        Type? valueRuntimeType = null;
+                        MethodInfo? toArrayMethod = null;
+                        object? arrayValue = null;
+
                         foreach (var resolvedValidator in resolvedValidators)
                         {
-                            var validationContext = new ValidationContext<object?>(value);
+                            // Workaround for https://github.com/ChilliCream/hotchocolate/issues/4350
+                            var valueToValidate = value;
+                            if (isListType &&
+                                !resolvedValidator.Validator.CanValidateInstancesOfType(value.GetType()))
+                            {
+                                valueRuntimeType ??= value.GetType();
+                                toArrayMethod ??= valueRuntimeType.GetMethod("ToArray");
+                                if (toArrayMethod != null)
+                                {
+                                    valueToValidate = (arrayValue ??= toArrayMethod.Invoke(value, null));
+                                }
+                            }
+
+                            var validationContext = new ValidationContext<object?>(valueToValidate);
                             var validationResult = await resolvedValidator.Validator.ValidateAsync(
                                 validationContext,
                                 context.RequestAborted);