Merge pull request #160 from chihiro-adachi/type-to-schema

プロパティの型定義からスキーマを生成する
EC-CUBE · Sep 21, 2023 · caa5949 · caa5949
2 parents b3730ac + 4f5402c
commit caa5949
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/GraphQL/Types.php b/GraphQL/Types.php
@@ -101,6 +101,31 @@ private function createObjectType($className)
                     return $acc;
                 }, $fields);
 
+                // Entityのプロパティの型定義からスキーマを生成する
+                $props = $classMetadata->getReflectionClass()->getProperties();
+                $fields = array_reduce($props, function ($acc, \ReflectionProperty $prop) use ($className) {
+
+                    if (!$this->entityAccessPolicy->canReadProperty($className, $prop->getName())) {
+                        return $acc;
+                    }
+
+                    if (!$prop->hasType()) {
+                        return $acc;
+                    }
+
+                    // Attributeがある場合はDoctrineのAttributeが指定されているものとみなす
+                    if (count($prop->getAttributes()) > 0) {
+                        return $acc;
+                    }
+
+                    $type = $this->convertPhpTypeToType($prop->getType());
+                    if ($type) {
+                        $acc[$prop->getName()] = $type;
+                    }
+
+                    return $acc;
+                }, $fields);
+
                 return $fields;
             },
             'entityClass' => $className,
@@ -135,4 +160,21 @@ private function isToManyAssociation($mapping)
     {
         return $mapping['type'] & ClassMetadata::TO_MANY;
     }
+
+    private function convertPhpTypeToType(\ReflectionNamedType $refType)
+    {
+        $type = match ($refType->getName()) {
+            'int' => Type::int(),
+            'string' => Type::string(),
+            'bool' => Type::boolean(),
+            'float' => Type::float(),
+            default => null,
+        };
+
+        if ($type) {
+            return $refType->allowsNull() ? $type : Type::nonNull($type);
+        }
+
+        return null;
+    }
 }
diff --git a/Resource/config/services.yaml b/Resource/config/services.yaml
@@ -127,7 +127,7 @@ services:
                 Eccube\Entity\Plugin: ['id', 'name', 'code', 'enabled', 'version', 'source', 'initialized', 'create_date', 'update_date']
                 Eccube\Entity\Product: ['id', 'name', 'note', 'description_list', 'description_detail', 'search_word', 'free_area', 'create_date', 'update_date', 'ProductCategories', 'ProductClasses', 'ProductImage', 'ProductTag', 'CustomerFavoriteProducts', 'Creator', 'Status']
                 Eccube\Entity\ProductCategory: ['product_id', 'category_id', 'Product', 'Category']
-                Eccube\Entity\ProductClass: ['id', 'code', 'stock', 'stock_unlimited', 'sale_limit', 'price01', 'price02', 'delivery_fee', 'visible', 'create_date', 'update_date', 'currency_code', 'point_rate', 'ProductStock', 'TaxRule', 'Product', 'SaleType', 'ClassCategory1', 'ClassCategory2', 'DeliveryDuration', 'Creator']
+                Eccube\Entity\ProductClass: ['id', 'code', 'stock', 'stock_unlimited', 'sale_limit', 'price01', 'price02', 'delivery_fee', 'visible', 'create_date', 'update_date', 'currency_code', 'point_rate', 'ProductStock', 'TaxRule', 'Product', 'SaleType', 'ClassCategory1', 'ClassCategory2', 'DeliveryDuration', 'Creator', 'price01_inc_tax', 'price02_inc_tax']
                 Eccube\Entity\ProductImage: ['id', 'file_name', 'sort_no', 'create_date', 'Product', 'Creator']
                 Eccube\Entity\ProductStock: ['id', 'stock', 'create_date', 'update_date', 'ProductClass', 'Creator']
                 Eccube\Entity\ProductTag: ['id', 'create_date', 'Product', 'Tag', 'Creator']
@@ -183,7 +183,7 @@ services:
           Eccube\Entity\PaymentOption: ['delivery_id', 'payment_id', 'Delivery', 'Payment']
           Eccube\Entity\Product: ['id', 'name', 'note', 'description_list', 'description_detail', 'search_word', 'free_area', 'ProductCategories', 'ProductClasses', 'ProductImage', 'ProductTag', 'CustomerFavoriteProducts', 'Status']
           Eccube\Entity\ProductCategory: ['product_id', 'category_id', 'Product', 'Category']
-          Eccube\Entity\ProductClass: ['id', 'code', 'stock', 'stock_unlimited', 'sale_limit', 'price01', 'price02', 'delivery_fee', 'currency_code', 'point_rate', 'ProductStock', 'TaxRule', 'Product', 'SaleType', 'ClassCategory1', 'ClassCategory2', 'DeliveryDuration']
+          Eccube\Entity\ProductClass: ['id', 'code', 'stock', 'stock_unlimited', 'sale_limit', 'price01', 'price02', 'delivery_fee', 'currency_code', 'point_rate', 'ProductStock', 'TaxRule', 'Product', 'SaleType', 'ClassCategory1', 'ClassCategory2', 'DeliveryDuration', 'price01_inc_tax', 'price02_inc_tax']
           Eccube\Entity\ProductImage: ['id', 'file_name', 'sort_no', 'Product']
           Eccube\Entity\ProductStock: ['id', 'stock', 'ProductClass']
           Eccube\Entity\ProductTag: ['id', 'Product', 'Tag']

diff --git a/Tests/Form/Type/Front/EntryTypeTest.php b/Tests/Form/Type/Front/EntryTypeTest.php
@@ -180,7 +180,7 @@ protected function getFormData()
             ],
             'phone_number' => $faker->phoneNumber,
             'email' => $faker->safeEmail(),
-            'plain_password' => $faker->password($this->eccubeConfig['eccube_password_min_len'], $this->eccubeConfig['eccube_password_max_len']).'1A',
+            'plain_password' => $faker->password($this->eccubeConfig['eccube_password_min_len'], $this->eccubeConfig['eccube_password_max_len'] - 2).'1A',
             'birth' => $faker->dateTimeBetween('-100 years', '-1 days')->format('Y-m-d\TH:i:sP'),
             'sex' => $faker->numberBetween(1, 3),
             'job' => $faker->numberBetween(1, 18),