Use null instead of magic 1980 constant in buildgroups

app/Jobs/PerformLegacyDailyUpdates.php

@@ -81,7 +81,7 @@ private function sendEmailExpectedBuilds($projectid, $currentstarttime): void
                                AND bg.starttime<?
                                AND (
                                    bg.endtime>?
-                                   OR bg.endtime='1980-01-01 00:00:00'
+                                   OR bg.endtime IS NULL
                                )
                                AND site.id=t1.siteid
                        ", [
@@ -203,10 +203,10 @@ private function addDailyChanges(int $projectid): void
         BuildGroupRule::DeleteExpiredRulesForProject($project->Id, $cutoff_date);
 
         $stmt = $db->prepare(
-            "SELECT id FROM buildgroup
+            'SELECT id FROM buildgroup
         WHERE projectid = :projectid AND
-              endtime != '1980-01-01 00:00:00' AND
-              endtime < :endtime");
+              endtime IS NOT NULL AND
+              endtime < :endtime');
         $query_params = [
             ':projectid' => $project->Id,
             ':endtime' => $cutoff_date,

app/Models/BuildGroup.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Database\Factories\BuildGroupFactory;
+use Illuminate\Database\Eloquent\Attributes\Scope;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -16,7 +17,7 @@
  * @property string $name
  * @property int $projectid
  * @property Carbon $starttime
- * @property Carbon $endtime
+ * @property ?Carbon $endtime
  * @property int $autoremovetimeframe
  * @property ?string $description
  * @property int $summaryemail
@@ -93,4 +94,13 @@ public function rules(): HasMany
     {
         return $this->hasMany(BuildGroupRule::class, 'groupid');
     }
+
+    /**
+     * @param Builder<$this> $query
+     */
+    #[Scope]
+    protected function active(Builder $query): void
+    {
+        $query->whereNull('endtime');
+    }
 }

app/Services/ProjectService.php

@@ -59,7 +59,7 @@ public static function initializeBuildGroups(Project $project): void
     {
         $common_defaults = [
             'starttime' => Carbon::create(1980),
-            'endtime' => Carbon::create(1980),
+            'endtime' => null,
             'type' => 'Daily',
             'includesubprojectotal' => 1,
             'emailcommitters' => 0,
@@ -121,7 +121,7 @@ public static function getBuildGroups(int $projectid): array
     {
         $eloquent_buildgroups = Project::findOrFail($projectid)
             ->buildgroups()
-            ->where('endtime', Carbon::create(1980))
+            ->whereNull('endtime')
             ->get();
 
         $buildgroups = [];

app/cdash/app/Controller/Api/Index.php

@@ -194,7 +194,7 @@ public function getDynamicBuilds(): array
                     LEFT JOIN buildgroupposition AS gp ON (gp.buildgroupid = bg.id)
                     WHERE
                         bg.projectid = ?
-                        AND bg.endtime = ?
+                        AND bg.endtime IS NULL
                         AND bg.type != 'Daily'
                         AND b2gr.starttime < ?
                         AND (
@@ -203,7 +203,6 @@ public function getDynamicBuilds(): array
                         )
                 ", [
             (int) $this->project->Id,
-            self::BEGIN_EPOCH,
             $this->endDate,
             self::BEGIN_EPOCH,
             $this->endDate,

app/cdash/app/Model/BuildGroup.php

@@ -39,7 +39,7 @@ public function __construct()
             'projectid' => 0,
             'name' => '',
             'starttime' => Carbon::create(1980),
-            'endtime' => Carbon::create(1980),
+            'endtime' => null,
             'description' => '',
             'summaryemail' => 0,
             'type' => 'Daily',
@@ -335,7 +335,7 @@ public function Save(): bool
             $this->eloquent_model->positions()->create([
                 'position' => $position,
                 'starttime' => $this->eloquent_model->starttime,
-                'endtime' => $this->eloquent_model->endtime,
+                'endtime' => Carbon::create(1980),
             ]);
         }
         return true;
@@ -463,14 +463,14 @@ public static function GetBuildGroups($projectid, $begin): array
     {
         $buildgroups = [];
 
-        $stmt = DB::select("
+        $stmt = DB::select('
             SELECT bg.id, bg.name, bgp.position
             FROM buildgroup AS bg
             LEFT JOIN buildgroupposition AS bgp ON (bgp.buildgroupid = bg.id)
             WHERE bg.projectid = ? AND
                   bg.starttime < ? AND
-                  (bg.endtime > ? OR bg.endtime='1980-01-01 00:00:00')
-        ", [$projectid, $begin, $begin]);
+                  (bg.endtime > ? OR bg.endtime IS NULL)
+        ', [$projectid, $begin, $begin]);
 
         foreach ($stmt as $row) {
             $buildgroup = new self();

app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php

@@ -16,6 +16,7 @@
  */
 
 use App\Http\Submission\Handlers\ActionableBuildInterface;
+use App\Models\BuildGroup;
 use CDash\Collection\SubscriberCollection;
 use CDash\Database;
 use CDash\Messaging\Notification\Email\EmailBuilder;
@@ -28,6 +29,7 @@
 use CDash\Model\Subscriber;
 use CDash\Test\CDashUseCaseTestCase;
 use CDash\Test\UseCase\UseCase;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
@@ -125,9 +127,10 @@ public function setUp(): void
             }
 
             // Do the same for build groups
-            DB::table('buildgroup')->insertOrIgnore([
+            BuildGroup::insertOrIgnore([
                 'id' => 0,
                 'projectid' => self::$projectid,
+                'starttime' => Carbon::now(),
                 'description' => 'MultipleSubprojectsEmailTest-' . Str::uuid()->toString(),
             ]);
         }

app/cdash/tests/test_buildmodel.php

@@ -10,6 +10,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Model\Build;
 use CDash\Model\BuildError;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
@@ -38,6 +39,7 @@ public function __construct()
         DB::table('buildgroup')->insertOrIgnore([
             'id' => 0,
             'projectid' => $project->id,
+            'starttime' => Carbon::now(),
             'description' => 'MultipleSubprojectsEmailTest-' . Str::uuid()->toString(),
         ]);
 

app/cdash/tests/test_projectindb.php

@@ -39,15 +39,15 @@ public function testProjectInBuildGroup(): void
         $result = $this->db->query($query);
         $expected = ['0' => ['name' => 'Nightly',
             'starttime' => '1980-01-01 00:00:00',
-            'endtime' => '1980-01-01 00:00:00',
+            'endtime' => null,
             'description' => 'Nightly builds'],
             '1' => ['name' => 'Experimental',
                 'starttime' => '1980-01-01 00:00:00',
-                'endtime' => '1980-01-01 00:00:00',
+                'endtime' => null,
                 'description' => 'Experimental builds'],
             '2' => ['name' => 'Continuous',
                 'starttime' => '1980-01-01 00:00:00',
-                'endtime' => '1980-01-01 00:00:00',
+                'endtime' => null,
                 'description' => 'Continuous builds']];
         $this->assertEqual($result, $expected);
     }

database/factories/BuildGroupFactory.php

@@ -22,7 +22,7 @@ public function definition(): array
         return [
             'name' => Str::uuid()->toString(),
             'starttime' => Carbon::create(1980),
-            'endtime' => Carbon::create(1980),
+            'endtime' => null,
             'autoremovetimeframe' => 0,
             'description' => Str::uuid()->toString(),
             'summaryemail' => 0,

database/migrations/2026_09_10_194315_buildgroup_times.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        DB::statement('ALTER TABLE buildgroup ALTER COLUMN starttime DROP DEFAULT');
+
+        DB::statement('ALTER TABLE buildgroup ALTER COLUMN endtime DROP DEFAULT');
+        DB::statement('ALTER TABLE buildgroup ALTER COLUMN endtime DROP NOT NULL');
+        DB::update("UPDATE buildgroup SET endtime = NULL WHERE endtime = '1980-01-01 00:00:00'");
+    }
+
+    public function down(): void
+    {
+    }
+};

phpstan-baseline.neon

@@ -23034,6 +23034,15 @@ parameters:
 			count: 1
 			path: tests/Feature/RouteAccessTest.php
 
+		-
+			rawMessage: '''
+				Call to deprecated method getBuildGroups() of class App\Services\ProjectService:
+				12/06/2025  Use Eloquent relationships for all new code
+			'''
+			identifier: staticMethod.deprecated
+			count: 1
+			path: tests/Feature/Services/ProjectServiceTest.php
+
 		-
 			rawMessage: Cannot access property $admin on App\Models\User|null.
 			identifier: property.nonObject

tests/Feature/Services/ProjectServiceTest.php

@@ -41,5 +41,13 @@ public function testCreatesDefaultBuildGroups(): void
             ['Nightly', 'Continuous', 'Experimental'],
             $project->buildgroups()->pluck('name')->toArray(),
         );
+
+        foreach ($project->buildgroups as $buildgroup) {
+            self::assertNotNull($buildgroup->starttime);
+            self::assertNull($buildgroup->endtime);
+        }
+
+        $active_groups = ProjectService::getBuildGroups($project->id);
+        self::assertCount(3, $active_groups);
     }
 }