Handle different cases for FieldtypeInteger.

Author: dadish

src/Type/Fieldtype/FieldtypeInteger.php

@@ -1,17 +1,42 @@
 <?php namespace ProcessWire\GraphQL\Type\Fieldtype;
 
 use GraphQL\Type\Definition\Type;
-use ProcessWire\GraphQL\Type\Fieldtype\Traits\FieldTrait;
+use ProcessWire\Page;
+use ProcessWire\GraphQL\Cache;
 use ProcessWire\GraphQL\Type\Fieldtype\Traits\InputFieldTrait;
 use ProcessWire\GraphQL\Type\Fieldtype\Traits\SetValueTrait;
 
 class FieldtypeInteger
 { 
-  use FieldTrait;
   use InputFieldTrait;
   use SetValueTrait;
   public static function type()
   {
     return Type::int();
   }
+
+  public static function field($field)
+  {
+    return Cache::field($field->name, function () use ($field) {
+      // description
+      $desc = $field->description;
+      if (!$desc) {
+        $desc = "Field with the type of {$field->type}";
+      }
+
+      return [
+        'name' => $field->name,
+        'description' => $desc,
+        'type' => self::type($field),
+        'resolve' => function (Page $page) use ($field) {
+          $fieldName = $field->name;
+          $value = $page->$fieldName;
+          if (empty($value) && !is_int($value)) {
+            return null;
+          }
+          return $value;
+        }
+      ];
+    });
+  }
 }

…ieldtypeInteger/FieldtypeIntegerTest.php …eldtype/FieldtypeInteger/CaseOneTest.phptest/Field/Page/Fieldtype/FieldtypeInteger/FieldtypeIntegerTest.php renamed to test/Field/Page/Fieldtype/FieldtypeInteger/CaseOneTest.php test/Field/Page/Fieldtype/FieldtypeInteger/FieldtypeIntegerTest.php renamed to test/Field/Page/Fieldtype/FieldtypeInteger/CaseOneTest.php

@@ -6,7 +6,7 @@
 use \ProcessWire\GraphQL\Test\Field\Page\Fieldtype\Traits\FieldtypeTestTrait;
 use \ProcessWire\GraphQL\Utils;
 
-class FieldtypeIntegerTest extends GraphqlTestCase {  
+class FieldtypeIntegerCaseOneTest extends GraphqlTestCase {  
 
   const settings = [
     'login' => 'admin',
@@ -20,7 +20,7 @@ class FieldtypeIntegerTest extends GraphqlTestCase {
 
   public function testValue()
   {
-    $skyscraper = Utils::pages()->find("template=skyscraper, sort=random")->first();
+    $skyscraper = Utils::pages()->get("template=skyscraper, sort=random");
     $query = "{
       skyscraper(s: \"id=$skyscraper->id\") {
         list {

test/Field/Page/Fieldtype/FieldtypeInteger/CaseThreeTest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace ProcessWire\GraphQL\Test\Field\Page\Fieldtype;
+
+use \ProcessWire\GraphQL\Test\GraphqlTestCase;
+use \ProcessWire\GraphQL\Utils;
+
+class FieldtypeIntegerCaseThreeTest extends GraphqlTestCase {  
+
+  const settings = [
+    'login' => 'admin',
+    'legalTemplates' => ['skyscraper'],
+    'legalFields' => ['floors'],
+    'access' => [
+      'fields' => [
+        [
+          'name' => 'floors',
+          'zeroNotEmpty' => true
+        ]
+      ]
+    ]
+  ];
+
+  public function testValue()
+  {
+    $skyscraper = Utils::pages()->get("template=skyscraper, sort=random, floors=''");
+    $query = "{
+      skyscraper(s: \"id=$skyscraper->id\") {
+        list {
+          floors
+        }
+      }
+    }";
+    $res = self::execute($query);
+    assertNull($res->data->skyscraper->list[0]->floors, 'Retrieves incorrect value.');
+    assertObjectNotHasAttribute('errors', $res, 'There are errors.');
+  }
+
+}

test/Field/Page/Fieldtype/FieldtypeInteger/CaseTwoTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace ProcessWire\GraphQL\Test\Field\Page\Fieldtype;
+
+use \ProcessWire\GraphQL\Test\GraphqlTestCase;
+use \ProcessWire\GraphQL\Utils;
+
+class FieldtypeIntegerCaseTwoTest extends GraphqlTestCase {  
+
+  const settings = [
+    'login' => 'admin',
+    'legalTemplates' => ['skyscraper'],
+    'legalFields' => ['floors'],
+  ];
+
+  public function testValue()
+  {
+    $skyscraper = Utils::pages()->get("template=skyscraper, sort=random, floors=0");
+    $query = "{
+      skyscraper(s: \"id=$skyscraper->id\") {
+        list {
+          floors
+        }
+      }
+    }";
+    $res = self::execute($query);
+    assertEquals(0, $res->data->skyscraper->list[0]->floors, 'Retrieves incorrect value.');
+    assertObjectNotHasAttribute('errors', $res, 'There are errors.');
+  }
+
+}

test/Performance/DBQueryCount.php

@@ -118,7 +118,7 @@ public function testDbQueryCount() {
     $expected = $skyscrapers->get("architects=$architectsWithResumes, sort=random");
     assertNotNull($expected, 'No expected skyscraper to check.');
     $actual = self::getListItemId($res->data->skyscraper->list, $expected->id);
-    assertEquals(count($expected->architects), count($actual->architects), 'Incorrect architects amount.');
+    assertEquals(count($expected->architects), count($actual->architects->list), 'Incorrect architects amount.');
     assertEquals($expected->architects[0]->id, $actual->architects->list[0]->id, 'Incorrect architect id.');
     assertEquals($expected->architects[0]->title, $actual->architects->list[0]->title, 'Incorrect architect title.');
     assertEquals($expected->architects[0]->created, $actual->architects->list[0]->created, 'Incorrect architect created.');