Operator on primary key must have ID as their leaf type

Author: PowerKiKi

src/Factory/Type/FilterTypeFactory.php

@@ -179,8 +179,13 @@ private function getConditionFieldsType(string $className, string $typeName): In
 
                 // Get all scalar fields
                 foreach ($metadata->fieldMappings as $mapping) {
-                    /** @var LeafType $leafType */
-                    $leafType = $this->types->get($mapping['type']);
+                    if ($mapping['id'] ?? false) {
+                        $leafType = Type::id();
+                    } else {
+                        /** @var LeafType $leafType */
+                        $leafType = $this->types->get($mapping['type']);
+                    }
+
                     $fieldName = $mapping['fieldName'];
                     $operators = $this->getOperators($fieldName, $leafType, false, false);
 

tests/data/ModelWithTraitsFilter.graphqls

@@ -3,44 +3,44 @@ schema {
   mutation: mutation
 }
 
-input BetweenOperatorInt {
-  from: Int!
-  to: Int!
+input BetweenOperatorID {
+  from: ID!
+  to: ID!
   not: Boolean = false
 }
 
-input EqualOperatorInt {
-  value: Int!
+input EqualOperatorID {
+  value: ID!
   not: Boolean = false
 }
 
-input GreaterOperatorInt {
-  value: Int!
+input GreaterOperatorID {
+  value: ID!
   not: Boolean = false
 }
 
-input GreaterOrEqualOperatorInt {
-  value: Int!
+input GreaterOrEqualOperatorID {
+  value: ID!
   not: Boolean = false
 }
 
-input InOperatorInt {
-  values: [Int!]!
+input InOperatorID {
+  values: [ID!]!
   not: Boolean = false
 }
 
-input LessOperatorInt {
-  value: Int!
+input LessOperatorID {
+  value: ID!
   not: Boolean = false
 }
 
-input LessOrEqualOperatorInt {
-  value: Int!
+input LessOrEqualOperatorID {
+  value: ID!
   not: Boolean = false
 }
 
-input LikeOperatorInt {
-  value: Int!
+input LikeOperatorID {
+  value: ID!
   not: Boolean = false
 }
 
@@ -76,15 +76,15 @@ input ModelWithTraitsFilterConditionFieldCustomFromTrait {
 
 # Type to specify a condition on a specific field
 input ModelWithTraitsFilterConditionFieldId {
-  between: BetweenOperatorInt
-  equal: EqualOperatorInt
-  greater: GreaterOperatorInt
-  greaterOrEqual: GreaterOrEqualOperatorInt
-  in: InOperatorInt
-  less: LessOperatorInt
-  lessOrEqual: LessOrEqualOperatorInt
-  like: LikeOperatorInt
-  null: NullOperatorInt
+  between: BetweenOperatorID
+  equal: EqualOperatorID
+  greater: GreaterOperatorID
+  greaterOrEqual: GreaterOrEqualOperatorID
+  in: InOperatorID
+  less: LessOperatorID
+  lessOrEqual: LessOrEqualOperatorID
+  like: LikeOperatorID
+  null: NullOperatorID
 }
 
 # Type to specify conditions on fields
@@ -98,7 +98,7 @@ input ModelWithTraitsFilterJoins {
 
 }
 
-input NullOperatorInt {
+input NullOperatorID {
   not: Boolean = false
 }
 

tests/data/PostFilter.graphqls

@@ -21,12 +21,6 @@ input BetweenOperatorID {
   not: Boolean = false
 }
 
-input BetweenOperatorInt {
-  from: Int!
-  to: Int!
-  not: Boolean = false
-}
-
 input BetweenOperatorString {
   from: String!
   to: String!
@@ -56,11 +50,6 @@ input EqualOperatorID {
   not: Boolean = false
 }
 
-input EqualOperatorInt {
-  value: Int!
-  not: Boolean = false
-}
-
 input EqualOperatorString {
   value: String!
   not: Boolean = false
@@ -81,11 +70,6 @@ input GreaterOperatorID {
   not: Boolean = false
 }
 
-input GreaterOperatorInt {
-  value: Int!
-  not: Boolean = false
-}
-
 input GreaterOperatorString {
   value: String!
   not: Boolean = false
@@ -106,11 +90,6 @@ input GreaterOrEqualOperatorID {
   not: Boolean = false
 }
 
-input GreaterOrEqualOperatorInt {
-  value: Int!
-  not: Boolean = false
-}
-
 input GreaterOrEqualOperatorString {
   value: String!
   not: Boolean = false
@@ -138,11 +117,6 @@ input InOperatorID {
   not: Boolean = false
 }
 
-input InOperatorInt {
-  values: [Int!]!
-  not: Boolean = false
-}
-
 input InOperatorString {
   values: [String!]!
   not: Boolean = false
@@ -179,11 +153,6 @@ input LessOperatorID {
   not: Boolean = false
 }
 
-input LessOperatorInt {
-  value: Int!
-  not: Boolean = false
-}
-
 input LessOperatorString {
   value: String!
   not: Boolean = false
@@ -204,11 +173,6 @@ input LessOrEqualOperatorID {
   not: Boolean = false
 }
 
-input LessOrEqualOperatorInt {
-  value: Int!
-  not: Boolean = false
-}
-
 input LessOrEqualOperatorString {
   value: String!
   not: Boolean = false
@@ -229,11 +193,6 @@ input LikeOperatorID {
   not: Boolean = false
 }
 
-input LikeOperatorInt {
-  value: Int!
-  not: Boolean = false
-}
-
 input LikeOperatorString {
   value: String!
   not: Boolean = false
@@ -261,10 +220,6 @@ input NullOperatorID {
   not: Boolean = false
 }
 
-input NullOperatorInt {
-  not: Boolean = false
-}
-
 input NullOperatorString {
   not: Boolean = false
 }
@@ -321,15 +276,15 @@ input PostFilterConditionFieldCustom {
 
 # Type to specify a condition on a specific field
 input PostFilterConditionFieldId {
-  between: BetweenOperatorInt
-  equal: EqualOperatorInt
-  greater: GreaterOperatorInt
-  greaterOrEqual: GreaterOrEqualOperatorInt
-  in: InOperatorInt
-  less: LessOperatorInt
-  lessOrEqual: LessOrEqualOperatorInt
-  like: LikeOperatorInt
-  null: NullOperatorInt
+  between: BetweenOperatorID
+  equal: EqualOperatorID
+  greater: GreaterOperatorID
+  greaterOrEqual: GreaterOrEqualOperatorID
+  in: InOperatorID
+  less: LessOperatorID
+  lessOrEqual: LessOrEqualOperatorID
+  like: LikeOperatorID
+  null: NullOperatorID
   modulo: ModuloOperatorInt
 }
 
@@ -455,15 +410,15 @@ input UserFilterConditionFieldEmail {
 
 # Type to specify a condition on a specific field
 input UserFilterConditionFieldId {
-  between: BetweenOperatorInt
-  equal: EqualOperatorInt
-  greater: GreaterOperatorInt
-  greaterOrEqual: GreaterOrEqualOperatorInt
-  in: InOperatorInt
-  less: LessOperatorInt
-  lessOrEqual: LessOrEqualOperatorInt
-  like: LikeOperatorInt
-  null: NullOperatorInt
+  between: BetweenOperatorID
+  equal: EqualOperatorID
+  greater: GreaterOperatorID
+  greaterOrEqual: GreaterOrEqualOperatorID
+  in: InOperatorID
+  less: LessOperatorID
+  lessOrEqual: LessOrEqualOperatorID
+  like: LikeOperatorID
+  null: NullOperatorID
   modulo: ModuloOperatorInt
 }