Merge pull request #1076 from Kitware/dynamic_delete

Fix dynamic build rule deletion bug

Author: zackgalbreath

app/cdash/public/api/v1/manageBuildGroup.php

@@ -20,6 +20,7 @@
 use App\Services\PageTimer;
 use CDash\Database;
 use CDash\Model\Project;
+use CDash\Model\Site;
 use CDash\Model\UserProject;
 
 $pageTimer = new PageTimer();
@@ -112,9 +113,9 @@
     $response['error'] = 'Database error during site lookup';
 }
 
-$sites = array();
+$sites = [];
 while ($row = $stmt->fetch()) {
-    $site = array();
+    $site = [];
     $site['id'] = $row['siteid'];
     $site['name'] = $row['name'];
     $sites[] = $site;
@@ -169,13 +170,20 @@
                 $rule_response['sitename'] = 'Any';
                 $rule_response['siteid'] = 0;
             } else {
+                $rule_response['siteid'] = $siteid;
+                $found = false;
                 foreach ($sites as $site) {
                     if ($site['id'] == $siteid) {
                         $rule_response['sitename'] = $site['name'];
-                        $rule_response['siteid'] = $site['id'];
+                        $found = true;
                         break;
                     }
                 }
+                if (!$found) {
+                    $site = new Site();
+                    $site->Id = $siteid;
+                    $rule_response['sitename'] = $site->GetName();
+                }
             }
 
             $parentgroupid = $rule->ParentGroupId;

app/cdash/tests/test_putdynamicbuilds.php

@@ -9,7 +9,8 @@
 require_once 'include/pdo.php';
 
 use CDash\Database;
-use CDash\Model\BuildConfigure;
+use CDash\Model\BuildGroup;
+use CDash\Model\Site;
 
 class PutDynamicBuildsTestCase extends KWWebTestCase
 {
@@ -31,10 +32,17 @@ public function testPutDynamicBuildsDiff()
 
         // Get one of the default buildgroups for this project.
         $stmt = $this->PDO->prepare(
-            'SELECT id FROM buildgroup WHERE projectid = :projectid LIMIT 2');
+            'SELECT id FROM buildgroup WHERE projectid = :projectid LIMIT 1');
         $this->PDO->execute($stmt, [':projectid' => $this->ProjectId]);
         $this->ParentGroupId = $stmt->fetchColumn();
-        $this->ChildGroupId = $stmt->fetchColumn();
+
+        // Create a 'Latest' buildgroup for this project.
+        $buildgroup = new BuildGroup();
+        $buildgroup->SetProjectId($this->ProjectId);
+        $buildgroup->SetName('latest results');
+        $buildgroup->SetType('Latest');
+        $buildgroup->Save();
+        $this->ChildGroupId = $buildgroup->GetId();
 
         // Use the API PUT a list of builds.
         $client = $this->getGuzzleClient();
@@ -74,6 +82,27 @@ public function testPutDynamicBuildsDiff()
             $this->assertTrue(strtotime($endtime) > strtotime('-1 week'));
         }
 
+        // Verify that we can associate a dynamic build group with a rule that
+        // hasn't submitted any builds to this project yet.
+        $site = new Site();
+        $site->Id = 1;
+        $site_name = $site->GetName();
+        $build_rules = [
+            [ 'match' => 'foo', 'parentgroupid' => $this->ParentGroupId, 'site' => $site_name ],
+        ];
+        $starttime_stmt = $this->PDO->prepare("
+            SELECT starttime FROM build2grouprule
+            WHERE buildname     = :buildname AND
+                  parentgroupid = :parentgroupid AND
+                  siteid        = $site->Id");
+        $this->verifyListGetsCreated($client, $starttime_stmt, $build_rules);
+        $this->login();
+        $this->get($this->url . "/api/v1/manageBuildGroup.php?projectid={$this->ProjectId}");
+        $content = $this->getBrowser()->getContent();
+        $jsonobj = json_decode($content, true);
+        $this->assertEqual($jsonobj['dynamics'][0]['rules'][0]['match'], 'foo');
+        $this->assertEqual($jsonobj['dynamics'][0]['rules'][0]['siteid'], 1);
+
         // Clean up.
         $this->deleteProject($this->ProjectId);
     }