Expose all project fields via GraphQL

williamjallen · williamjallen · commit d0244f4c796f · 2026-02-03T13:08:45.000-05:00
This PR adds all of the missing Project fields and solidifies the database types to better enforce our constraints.  I plan to follow this work with a new `updateProject` mutation.
diff --git a/app/GraphQL/Scalars/Time.php b/app/GraphQL/Scalars/Time.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\GraphQL\Scalars;
+
+use Carbon\Exceptions\InvalidFormatException;
+use GraphQL\Error\InvariantViolation;
+use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\ValueNode;
+use GraphQL\Type\Definition\ScalarType;
+use Illuminate\Support\Carbon;
+
+final class Time extends ScalarType
+{
+    public function serialize(mixed $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * @throws InvariantViolation
+     */
+    public function parseValue(mixed $value): string
+    {
+        if (!$this->validateTime($value)) {
+            throw new InvariantViolation("The value $value is not a valid Time format (H:i:s).");
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param ValueNode&Node $valueNode
+     * @param array<string, mixed>|null $variables
+     *
+     * @throws InvariantViolation
+     */
+    public function parseLiteral(Node $valueNode, ?array $variables = null): string
+    {
+        if (!property_exists($valueNode, 'value')) {
+            throw new InvariantViolation('Time must be a string.');
+        }
+
+        if (!$this->validateTime($valueNode->value)) {
+            throw new InvariantViolation("The value {$valueNode->value} is not a valid Time.");
+        }
+
+        return $valueNode->value;
+    }
+
+    private function validateTime(string $time): bool
+    {
+        // Simple regex for HH:MM:SS* format to make sure it's actually a time, not a datetime.
+        if (preg_match('/^([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/', $time) !== 1) {
+            return false;
+        }
+
+        try {
+            Carbon::parse($time);
+            return true;
+        } catch (InvalidFormatException) {
+            return false;
+        }
+    }
+}
diff --git a/app/Models/Project.php b/app/Models/Project.php
@@ -14,23 +14,23 @@
 /**
  * @property int $id
  * @property string $name
- * @property string $description
- * @property string $homeurl
- * @property string $cvsurl
- * @property string $bugtrackerurl
- * @property string $bugtrackernewissueurl
- * @property string $bugtrackertype
- * @property string $documentationurl
+ * @property ?string $description
+ * @property ?string $homeurl
+ * @property ?string $cvsurl
+ * @property ?string $bugtrackerurl
+ * @property ?string $bugtrackernewissueurl
+ * @property ?string $bugtrackertype
+ * @property ?string $documentationurl
  * @property int $imageid
  * @property int $public
  * @property int $coveragethreshold
- * @property string $testingdataurl
+ * @property ?string $testingdataurl
  * @property string $nightlytime
  * @property bool $emaillowcoverage
  * @property bool $emailtesttimingchanged
  * @property bool $emailbrokensubmission
  * @property bool $emailredundantfailures
- * @property string $cvsviewertype
+ * @property ?string $cvsviewertype
  * @property int $testtimestd
  * @property int $testtimestdthreshold
  * @property bool $showtesttime
diff --git a/app/cdash/app/Lib/Repository/GitHub.php b/app/cdash/app/Lib/Repository/GitHub.php
@@ -664,7 +664,7 @@ public function getRepository(): string
 
     protected function getRepositoryInformation(): void
     {
-        $url = str_replace('//', '', $this->project->CvsUrl);
+        $url = str_replace('//', '', $this->project->CvsUrl ?? '');
         $parts = explode('/', $url);
         if (isset($parts[1])) {
             $this->owner = $parts[1];
diff --git a/app/cdash/app/Model/BuildError.php b/app/cdash/app/Model/BuildError.php
@@ -110,7 +110,7 @@ public static function marshal(array $data, Project $project, $revision): array
             'logline' => (int) $data['logline'],
             'cvsurl' => RepositoryUtils::get_diff_url($project->Id, $project->CvsUrl, $sourceFile['directory'], $sourceFile['file'], $revision),
             'precontext' => '',
-            'text' => RepositoryUtils::linkify_compiler_output($project->CvsUrl, $source_dir, $revision, $data['stdoutput']),
+            'text' => RepositoryUtils::linkify_compiler_output($project->CvsUrl ?? '', $source_dir, $revision, $data['stdoutput']),
             'postcontext' => '',
             'sourcefile' => $data['sourcefile'],
             'sourceline' => $data['sourceline'],
diff --git a/app/cdash/app/Model/BuildFailure.php b/app/cdash/app/Model/BuildFailure.php
@@ -255,7 +255,7 @@ public static function marshal($data, Project $project, $revision, $linkifyOutpu
             $file = basename($data['sourcefile']);
             $directory = dirname($data['sourcefile']);
 
-            $source_dir = RepositoryUtils::get_source_dir($project->Id, $project->CvsUrl, $directory);
+            $source_dir = RepositoryUtils::get_source_dir($project->Id, $project->CvsUrl ?? '', $directory);
             if (str_starts_with($directory, $source_dir)) {
                 $directory = substr($directory, strlen($source_dir));
             }
@@ -267,9 +267,9 @@ public static function marshal($data, Project $project, $revision, $linkifyOutpu
                 $revision);
 
             if ($source_dir !== null && $linkifyOutput) {
-                $marshaled['stderror'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl, $source_dir,
+                $marshaled['stderror'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl ?? '', $source_dir,
                     $revision, $data['stderror']);
-                $marshaled['stdoutput'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl, $source_dir,
+                $marshaled['stdoutput'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl ?? '', $source_dir,
                     $revision, $data['stdoutput']);
             }
         }
diff --git a/app/cdash/app/Model/Project.php b/app/cdash/app/Model/Project.php
@@ -43,25 +43,25 @@ class Project
 {
     public $Name;
     public $Id;
-    public $Description;
-    public $HomeUrl;
-    public $CvsUrl;
-    public $DocumentationUrl;
-    public $BugTrackerUrl;
-    public $BugTrackerNewIssueUrl;
-    public $BugTrackerType;
+    public ?string $Description = null;
+    public ?string $HomeUrl = null;
+    public ?string $CvsUrl = null;
+    public ?string $DocumentationUrl = null;
+    public ?string $BugTrackerUrl = null;
+    public ?string $BugTrackerNewIssueUrl = null;
+    public ?string $BugTrackerType = null;
     public ?int $ImageId = null;
     public $Public;
     public $CoverageThreshold;
-    public $TestingDataUrl;
+    public ?string $TestingDataUrl = null;
     public $NightlyTime;
     public $NightlyDateTime;
     public $NightlyTimezone;
     public $EmailLowCoverage = 0;
     public $EmailTestTimingChanged = 0;
     public $EmailBrokenSubmission = 0;
     public $EmailRedundantFailures = 0;
-    public $CvsViewerType;
+    public ?string $CvsViewerType = null;
     public $TestTimeStd;
     public $TestTimeStdThreshold;
     public $ShowTestTime = 0;
@@ -115,15 +115,15 @@ public function Save(): bool
         $project->fill([
             'name' => $this->Name ?? '',
             'description' => $this->Description,
-            'homeurl' => $this->HomeUrl ?? '',
-            'cvsurl' => $this->CvsUrl ?? '',
-            'documentationurl' => $this->DocumentationUrl ?? '',
-            'bugtrackerurl' => $this->BugTrackerUrl ?? '',
-            'bugtrackernewissueurl' => $this->BugTrackerNewIssueUrl ?? '',
-            'bugtrackertype' => $this->BugTrackerType ?? '',
+            'homeurl' => $this->HomeUrl,
+            'cvsurl' => $this->CvsUrl,
+            'documentationurl' => $this->DocumentationUrl,
+            'bugtrackerurl' => $this->BugTrackerUrl,
+            'bugtrackernewissueurl' => $this->BugTrackerNewIssueUrl,
+            'bugtrackertype' => $this->BugTrackerType,
             'public' => (int) $this->Public,
             'coveragethreshold' => (int) $this->CoverageThreshold,
-            'testingdataurl' => $this->TestingDataUrl ?? '',
+            'testingdataurl' => $this->TestingDataUrl,
             'nightlytime' => $this->NightlyTime ?? '',
             'emaillowcoverage' => (bool) $this->EmailLowCoverage,
             'emailtesttimingchanged' => (bool) $this->EmailTestTimingChanged,
@@ -137,7 +137,7 @@ public function Save(): bool
             'autoremovetimeframe' => (int) $this->AutoremoveTimeframe,
             'autoremovemaxbuilds' => (int) $this->AutoremoveMaxBuilds,
             'uploadquota' => (int) $this->UploadQuota,
-            'cvsviewertype' => $this->CvsViewerType ?? '',
+            'cvsviewertype' => $this->CvsViewerType,
             'testtimestd' => (int) $this->TestTimeStd,
             'testtimestdthreshold' => (int) $this->TestTimeStdThreshold,
             'showtesttime' => (bool) $this->ShowTestTime,
diff --git a/app/cdash/app/Model/Repository.php b/app/cdash/app/Model/Repository.php
@@ -107,7 +107,7 @@ protected static function getRepositoryService(Project $project): ?RepositorySer
 
     public static function getRepositoryInterface(Project $project): RepositoryInterface
     {
-        switch (strtolower($project->CvsViewerType)) {
+        switch (strtolower($project->CvsViewerType ?? '')) {
             case strtolower(self::VIEWER_GITHUB):
                 $service = new GitHub($project);
                 break;
diff --git a/app/cdash/include/common.php b/app/cdash/include/common.php
@@ -572,10 +572,10 @@ function get_dashboard_JSON($projectname, $date, &$response): void
     $project->FindByName($projectname);
 
     $project_array = [];
-    $project_array['cvsurl'] = $project->Id ? $project->CvsUrl : 'unknown';
-    $project_array['bugtrackerurl'] = $project->Id ? $project->BugTrackerUrl : 'unknown';
-    $project_array['documentationurl'] = $project->Id ? $project->DocumentationUrl : 'unknown';
-    $project_array['homeurl'] = $project->Id ? $project->HomeUrl : 'unknown';
+    $project_array['cvsurl'] = $project->CvsUrl ?? '';
+    $project_array['bugtrackerurl'] = $project->BugTrackerUrl ?? '';
+    $project_array['documentationurl'] = $project->DocumentationUrl ?? '';
+    $project_array['homeurl'] = $project->HomeUrl ?? '';
     $project_array['name'] = $projectname;
     $project_array['nightlytime'] = $project->Id ? $project->NightlyTime : '00:00:00';
 
diff --git a/app/cdash/tests/test_builddetails.php b/app/cdash/tests/test_builddetails.php
@@ -24,7 +24,7 @@ public function __construct()
 
         $this->createProject([
             'Name' => 'BuildDetails',
-            'CvsViewerType' => 'viewcvs',
+            'CvsViewerType' => null,
         ]);
 
         foreach ($this->testDataFiles as $testDataFile) {
diff --git a/database/migrations/2026_01_30_045544_project_column_types.php b/database/migrations/2026_01_30_045544_project_column_types.php
@@ -0,0 +1,99 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        DB::statement('ALTER TABLE project ALTER COLUMN homeurl DROP NOT NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN homeurl DROP DEFAULT');
+        DB::statement('ALTER TABLE project ALTER COLUMN homeurl TYPE text');
+        DB::update("UPDATE project SET homeurl = NULL WHERE homeurl = ''");
+
+        DB::statement('ALTER TABLE project ALTER COLUMN cvsurl DROP NOT NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN cvsurl DROP DEFAULT');
+        DB::statement('ALTER TABLE project ALTER COLUMN cvsurl TYPE text');
+        DB::update("UPDATE project SET cvsurl = NULL WHERE cvsurl = ''");
+
+        DB::statement('ALTER TABLE project ALTER COLUMN bugtrackerurl DROP NOT NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN bugtrackerurl DROP DEFAULT');
+        DB::statement('ALTER TABLE project ALTER COLUMN bugtrackerurl TYPE text');
+        DB::update("UPDATE project SET bugtrackerurl = NULL WHERE bugtrackerurl = ''");
+
+        DB::statement('ALTER TABLE project ALTER COLUMN bugtrackernewissueurl DROP NOT NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN bugtrackernewissueurl DROP DEFAULT');
+        DB::statement('ALTER TABLE project ALTER COLUMN bugtrackernewissueurl TYPE text');
+        DB::update("UPDATE project SET bugtrackernewissueurl = NULL WHERE bugtrackernewissueurl = ''");
+
+        DB::statement('ALTER TABLE project ALTER COLUMN documentationurl DROP NOT NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN documentationurl DROP DEFAULT');
+        DB::statement('ALTER TABLE project ALTER COLUMN documentationurl TYPE text');
+        DB::update("UPDATE project SET documentationurl = NULL WHERE documentationurl = ''");
+
+        DB::statement('ALTER TABLE project ALTER COLUMN testingdataurl DROP NOT NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN testingdataurl DROP DEFAULT');
+        DB::statement('ALTER TABLE project ALTER COLUMN testingdataurl TYPE text');
+        DB::update("UPDATE project SET testingdataurl = NULL WHERE testingdataurl = ''");
+
+        DB::update('UPDATE project SET testtimestd = 4 WHERE testtimestd IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN testtimestd SET NOT NULL');
+
+        DB::update('UPDATE project SET testtimestdthreshold = 1 WHERE testtimestdthreshold IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN testtimestdthreshold SET NOT NULL');
+
+        DB::update('UPDATE project SET testtimemaxstatus = 3 WHERE testtimemaxstatus IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN testtimemaxstatus SET NOT NULL');
+
+        DB::update('UPDATE project SET emailmaxitems = 5 WHERE emailmaxitems IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN emailmaxitems SET NOT NULL');
+
+        DB::update('UPDATE project SET emailmaxchars = 255 WHERE emailmaxchars IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN emailmaxchars SET NOT NULL');
+
+        DB::update('UPDATE project SET autoremovetimeframe = 0 WHERE autoremovetimeframe IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN autoremovetimeframe SET NOT NULL');
+
+        DB::update('UPDATE project SET autoremovemaxbuilds = 300 WHERE autoremovemaxbuilds IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN autoremovemaxbuilds SET NOT NULL');
+
+        DB::update('UPDATE project SET uploadquota = 0 WHERE uploadquota IS NULL');
+        DB::statement('ALTER TABLE project ALTER COLUMN uploadquota SET NOT NULL');
+
+        DB::statement('ALTER TABLE project ALTER COLUMN ldapfilter TYPE text');
+
+        DB::statement('ALTER TABLE project ALTER COLUMN banner TYPE text');
+
+        // We drop the type first in case the database has been truncated previously.
+        DB::statement('DROP TYPE IF EXISTS cvsviewertype');
+        DB::statement("CREATE TYPE cvsviewertype AS ENUM ('github', 'gitlab')");
+        DB::statement("
+            ALTER TABLE project
+            ALTER COLUMN cvsviewertype
+            TYPE cvsviewertype USING
+                CASE
+                    WHEN cvsviewertype = 'github' THEN 'github'::cvsviewertype
+                    WHEN cvsviewertype = 'gitlab' THEN 'gitlab'::cvsviewertype
+                    ELSE NULL
+                END
+        ");
+
+        // We drop the type first in case the database has been truncated previously.
+        DB::statement('DROP TYPE IF EXISTS bugtrackertype');
+        DB::statement("CREATE TYPE bugtrackertype AS ENUM ('GitHub', 'Buganizer', 'JIRA')");
+        DB::statement("
+            ALTER TABLE project
+            ALTER COLUMN bugtrackertype
+            TYPE bugtrackertype USING
+                CASE
+                    WHEN bugtrackertype = 'GitHub' THEN 'GitHub'::bugtrackertype
+                    WHEN bugtrackertype = 'Buganizer' THEN 'Buganizer'::bugtrackertype
+                    WHEN bugtrackertype = 'JIRA' THEN 'JIRA'::bugtrackertype
+                    ELSE NULL
+                END
+        ");
+    }
+
+    public function down(): void
+    {
+    }
+};
diff --git a/graphql/schema.graphql b/graphql/schema.graphql
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/tests/Browser/Pages/SitesIdPageTest.php b/tests/Browser/Pages/SitesIdPageTest.php
diff --git a/tests/Feature/GraphQL/ProjectTypeTest.php b/tests/Feature/GraphQL/ProjectTypeTest.php

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ public function getRepository(): string`
`664`	`664`
`665`	`665`	`protected function getRepositoryInformation(): void`
`666`	`666`	`{`
`667`		`- $url = str_replace('//', '', $this->project->CvsUrl);`
	`667`	`+ $url = str_replace('//', '', $this->project->CvsUrl ?? '');`
`668`	`668`	`$parts = explode('/', $url);`
`669`	`669`	`if (isset($parts[1])) {`
`670`	`670`	`$this->owner = $parts[1];`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public static function marshal($data, Project $project, $revision, $linkifyOutpu`
`255`	`255`	`$file = basename($data['sourcefile']);`
`256`	`256`	`$directory = dirname($data['sourcefile']);`
`257`	`257`
`258`		`- $source_dir = RepositoryUtils::get_source_dir($project->Id, $project->CvsUrl, $directory);`
	`258`	`+ $source_dir = RepositoryUtils::get_source_dir($project->Id, $project->CvsUrl ?? '', $directory);`
`259`	`259`	`if (str_starts_with($directory, $source_dir)) {`
`260`	`260`	`$directory = substr($directory, strlen($source_dir));`
`261`	`261`	`}`
`@@ -267,9 +267,9 @@ public static function marshal($data, Project $project, $revision, $linkifyOutpu`
`267`	`267`	`$revision);`
`268`	`268`
`269`	`269`	`if ($source_dir !== null && $linkifyOutput) {`
`270`		`- $marshaled['stderror'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl, $source_dir,`
	`270`	`+ $marshaled['stderror'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl ?? '', $source_dir,`
`271`	`271`	`$revision, $data['stderror']);`
`272`		`- $marshaled['stdoutput'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl, $source_dir,`
	`272`	`+ $marshaled['stdoutput'] = RepositoryUtils::linkify_compiler_output($project->CvsUrl ?? '', $source_dir,`
`273`	`273`	`$revision, $data['stdoutput']);`
`274`	`274`	`}`
`275`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ protected static function getRepositoryService(Project $project): ?RepositorySer`
`107`	`107`
`108`	`108`	`public static function getRepositoryInterface(Project $project): RepositoryInterface`
`109`	`109`	`{`
`110`		`- switch (strtolower($project->CvsViewerType)) {`
	`110`	`+ switch (strtolower($project->CvsViewerType ?? '')) {`
`111`	`111`	`case strtolower(self::VIEWER_GITHUB):`
`112`	`112`	`$service = new GitHub($project);`
`113`	`113`	`break;`