Kitware · josephsnyder · Aug 17, 2023 · Jul 21, 2023
diff --git a/app/cdash/include/Test/UseCase/TestUseCase.php b/app/cdash/include/Test/UseCase/TestUseCase.php
@@ -211,6 +211,8 @@ public function createTest(array $properties)
             $properties['FullCommandLine'] = "{$properties['FullName']} --run-test .";
         }
 
+        $properties['ProjectId'] = $this->projectId;
+
         $this->setModel('Test', $properties);
         return $this;
     }

diff --git a/app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php b/app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php
@@ -25,27 +25,24 @@
 use CDash\Messaging\Subscription\SubscriptionCollection;
 use CDash\Messaging\Subscription\UserSubscriptionBuilder;
 use CDash\Model\Label;
-use CDash\Model\Project;
 use CDash\Model\Subscriber;
 use CDash\Test\CDashUseCaseTestCase;
 use CDash\Test\UseCase\UseCase;
+use Illuminate\Support\Facades\DB;
 
 class MultipleSubprojectsEmailTest extends CDashUseCaseTestCase
 {
     private static $tz;
     private static $database;
 
-    private static $projectId = 2;
+    private int $projectid = -1;
 
     /** @var  Database|PHPUnit_Framework_MockObject_MockObject $db */
     private $db;
 
     /** @var  ActionableBuildInterface $submission */
     private $submission;
 
-    /** @var  Project|PHPUnit_Framework_MockObject_MockObject $project */
-    private $project;
-
     /** @var UseCase $useCase */
     private $useCase;
 
@@ -105,6 +102,17 @@ public function setUp() : void
 
         $this->createApplication();
         config(['app.url' => 'http://open.cdash.org']);
+
+        $this->projectid = DB::table('project')->insertGetId([
+            'name' => 'TestProject1',
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        DB::delete('DELETE FROM project WHERE id = ?', [$this->projectid]);
+
+        parent::tearDown();
     }
 
     /**
@@ -159,6 +167,7 @@ private function getNotifications(array $subscribers)
     public function testMultipleSubprojectsTestSubmission()
     {
         $this->useCase = UseCase::createBuilder($this, UseCase::TEST)
+            ->setProjectId($this->projectid)
             ->createSite([
                 'BuildName' => 'CTestTest-Linux-c++-Subprojects',
                 'BuildStamp' => '20160728-1932-Experimental',

diff --git a/app/cdash/tests/case/CDash/TestUseCaseTest.php b/app/cdash/tests/case/CDash/TestUseCaseTest.php
@@ -5,9 +5,29 @@
 use CDash\Test\CDashUseCaseTestCase;
 use CDash\Test\UseCase\TestUseCase;
 use CDash\Test\UseCase\UseCase;
+use Illuminate\Support\Facades\DB;
 
 class TestUseCaseTest extends CDashUseCaseTestCase
 {
+    private int $projectid = -1;
+
+    public function setUp(): void
+    {
+        $this->createApplication();
+        $this->projectid = DB::table('project')->insertGetId([
+            'name' => 'TestProject1',
+        ]);
+
+        parent::setUp();
+    }
+
+    public function tearDown(): void
+    {
+        DB::delete('DELETE FROM project WHERE id = ?', [$this->projectid]);
+
+        parent::tearDown();
+    }
+
     public function testUseCaseBuildsTestUseCase()
     {
         $sut = UseCase::createBuilder($this, UseCase::TEST);
@@ -157,6 +177,7 @@ public function testTestUseCaseCreatesTestPassed()
 
         /** @var UseCase $sut */
         $sut
+            ->setProjectId($this->projectid)
             ->createSite(['Name' => 'Site.Name'])
             ->createTestPassed('some.test.name');
 
@@ -181,6 +202,7 @@ public function testTestUseCaseCreatesTestFailed()
 
         /** @var UseCase $sut */
         $sut
+            ->setProjectId($this->projectid)
             ->createSite(['Name' => 'Site.Name'])
             ->createTestFailed('some.test.name');
 
@@ -205,6 +227,7 @@ public function testTestUseCaseCreatesTestTimeout()
 
         /** @var UseCase $sut */
         $sut
+            ->setProjectId($this->projectid)
             ->createSite(['Name' => 'Site.Name'])
             ->createTestTimedout('some.test.name');
 
@@ -229,6 +252,7 @@ public function testTestUseCaseCreatesTestNotRun()
 
         /** @var UseCase $sut */
         $sut
+            ->setProjectId($this->projectid)
             ->createSite(['Name' => 'Site.Name'])
             ->createTestNotRun('some.test.name');
 
@@ -253,6 +277,7 @@ public function testTestUseCaseCreatesMultisubprojectTestXMLFile()
 
         /** @var TestUseCase $sut */
         $sut
+            ->setProjectId($this->projectid)
             ->createSite([
                 'Name' => 'Site.Name',
                 'BuildName' => 'SomeOS-SomeBuild',
@@ -309,6 +334,7 @@ public function testUseCaseSetsPropertiesByTestName()
         /** @var TestUseCase $sut */
         $sut = UseCase::createBuilder($this, UseCase::TEST);
         $sut
+            ->setProjectId($this->projectid)
             ->createSite([
                 'Name' => 'elysium',
                 'BuildName' => 'test_timing',

diff --git a/app/cdash/tests/test_buildmodel.php b/app/cdash/tests/test_buildmodel.php
@@ -307,6 +307,7 @@ public function testBuildModelGetsConfigures()
     public function testBuildModelAddBuild()
     {
         $build = new Build();
+        $build->ProjectId = 1;
         $this->assertTrue($build->AddBuild());
         $this->assertTrue($build->Id > 0);
 

diff --git a/app/cdash/tests/test_upgrade.php b/app/cdash/tests/test_upgrade.php
@@ -480,8 +480,8 @@ public function testSiteConstraintUpgrade()
                 if ($table_to_update === 'build') {
                     // Handle unique constraint here.
                     $insert_query =
-                        "INSERT INTO $table_to_update (siteid, uuid)
-                        VALUES ($dupe, '$dupe')";
+                        "INSERT INTO $table_to_update (projectid, siteid, uuid)
+                        VALUES (1, $dupe, '$dupe')";
                 } elseif ($table_to_update === 'client_job') {
                     $insert_query =
                         "INSERT INTO $table_to_update (siteid, scheduleid, osid, cmakeid, compilerid)

diff --git a/app/cdash/xml_handlers/testing_handler.php b/app/cdash/xml_handlers/testing_handler.php
@@ -171,6 +171,7 @@ public function endElement($parser, $name)
             if ($this->Labels) {
                 $this->TestCreator->labels = $this->Labels;
             }
+            $this->TestCreator->projectid = $this->projectid;
             $this->TestCreator->create($build);
         } elseif ($name == 'LABEL' && $parent == 'LABELS') {
             if (!empty($this->TestSubProjectName)) {

diff --git a/database/migrations/2023_07_20_185727_project_foreign_keys.php b/database/migrations/2023_07_20_185727_project_foreign_keys.php
@@ -0,0 +1,199 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        echo 'Adding projectid foreign key to authtoken table...' . PHP_EOL;
+        Schema::table('authtoken', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to blockbuild table...' . PHP_EOL;
+        Schema::table('blockbuild', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to build table...' . PHP_EOL;
+        Schema::table('build', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to build_filters table...' . PHP_EOL;
+        Schema::table('build_filters', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to buildgroup table...' . PHP_EOL;
+        Schema::table('buildgroup', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to coveragefilepriority table...' . PHP_EOL;
+        Schema::table('coveragefilepriority', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to labelemail table...' . PHP_EOL;
+        Schema::table('labelemail', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to measurement table...' . PHP_EOL;
+        Schema::table('measurement', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to overview_components table...' . PHP_EOL;
+        Schema::table('overview_components', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to project2repositories table...' . PHP_EOL;
+        Schema::table('project2repositories', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to subproject table...' . PHP_EOL;
+        Schema::table('subproject', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to subprojectgroup table...' . PHP_EOL;
+        Schema::table('subprojectgroup', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to test table...' . PHP_EOL;
+        Schema::table('test', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to user2project table...' . PHP_EOL;
+        Schema::table('user2project', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to user2repository table...' . PHP_EOL;
+        Schema::table('user2repository', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+
+        echo 'Adding projectid foreign key to userstatistics table...' . PHP_EOL;
+        Schema::table('userstatistics', function (Blueprint $table) {
+            $table->integer('projectid')->nullable(false)->change();
+            $table->foreign('projectid')->references('id')->on('project')->cascadeOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('authtoken', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('blockbuild', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('build', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('build_filters', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('buildgroup', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('coveragefilepriority', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('labelemail', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('measurement', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('overview_components', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('project2repositories', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('subproject', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('subprojectgroup', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('test', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('user2project', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('user2repository', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+
+        Schema::table('userstatistics', function (Blueprint $table) {
+            $table->integer('projectid')->change();
+            $table->dropForeign(['projectid']);
+        });
+    }
+};