Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 0 additions & 91 deletions app/Http/Controllers/BuildController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use CDash\Database;
use CDash\Model\Build;
use CDash\Model\BuildGroupRule;
use CDash\Model\BuildRelationship;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
Expand Down Expand Up @@ -524,13 +523,6 @@ public function apiBuildSummary(): JsonResponse
}
$response['newissueurl'] = $new_issue_url;

// Check if this build is related to any others.
$build_relationship = new BuildRelationship();
$relationships = $build_relationship->GetRelationships($this->build);
$response['relationships_to'] = $relationships['to'];
$response['relationships_from'] = $relationships['from'];
$response['hasrelationships'] = !empty($response['relationships_to']) || !empty($response['relationships_from']);

$pageTimer->end($response);
return response()->json(cast_data_for_JSON($response));
}
Expand Down Expand Up @@ -710,89 +702,6 @@ public function apiBuildExpected(): JsonResponse
]);
}

public function apiRelateBuilds(): JsonResponse
{
$this->setProjectByName(request()->string('project') ?? '');

if (!request()->has('buildid')) {
abort(400, '"buildid" parameter required.');
}
if (!request()->has('relatedid')) {
abort(400, '"relatedid" parameter required.');
}

$buildid = (int) request()->input('buildid');
$relatedid = (int) request()->input('relatedid');

$build = new Build();
$build->Id = $buildid;
$relatedbuild = new Build();
$relatedbuild->Id = $relatedid;
$buildRelationship = new BuildRelationship();
$buildRelationship->Build = $build;
$buildRelationship->RelatedBuild = $relatedbuild;
$buildRelationship->Project = $this->project;

switch (request()->method()) {
case 'GET':
return $this->apiRelateBuildsGet($buildRelationship);
case 'POST':
return $this->apiRelateBuildsPost($buildRelationship);
case 'DELETE':
return $this->apiRelateBuildsDelete($buildRelationship);
default:
abort(500, 'Unhandled method: ' . request()->method());
}
}

private function apiRelateBuildsGet(BuildRelationship $buildRelationship): JsonResponse
{
if ($buildRelationship->Exists()) {
$buildRelationship->Fill();
return response()->json($buildRelationship->marshal());
}
abort(404, "No relationship exists between Builds {$buildRelationship->Build->Id} and {$buildRelationship->RelatedBuild->Id}");
}

private function apiRelateBuildsPost(BuildRelationship $buildRelationship): JsonResponse
{
// Create or update the relationship between these two builds.
if (!request()->has('relationship')) {
abort(400, '"relationship" parameter required.');
}
$relationship = request()->input('relationship');
$buildRelationship->Relationship = $relationship;
$exit_status = 200;
if (!$buildRelationship->Exists()) {
$exit_status = 201;
}
if (!$buildRelationship->Save($error_msg)) {
if ($error_msg) {
abort(400, $error_msg);
} else {
abort(500, 'Error saving relationship');
}
}
return response()->json($buildRelationship->marshal(), $exit_status);
}

private function apiRelateBuildsDelete(BuildRelationship $buildRelationship): JsonResponse
{
if (can_administrate_project($this->project->Id)) {
if ($buildRelationship->Exists()) {
if (!$buildRelationship->Delete($error_msg)) {
if ($error_msg) {
abort(400, $error_msg);
} else {
abort(500, 'Error deleting relationship');
}
}
}
abort(204);
}
return response()->json();
}

public function restApi(): JsonResponse
{
$this->setBuildById((int) request()->input('buildid', -1));
Expand Down
226 changes: 0 additions & 226 deletions app/cdash/app/Model/BuildRelationship.php

This file was deleted.

5 changes: 1 addition & 4 deletions app/cdash/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,8 @@ add_legacy_unit_test(/CDash/Model/Repository)
add_laravel_test(/Feature/CDashTest)
set_tests_properties(/Feature/CDashTest PROPERTIES DEPENDS install_1)

add_legacy_unit_test(/CDash/Model/BuildRelationship)
set_tests_properties(/CDash/Model/BuildRelationship PROPERTIES DEPENDS /Feature/CDashTest)

add_legacy_unit_test(/CDash/MultipleSubprojectsEmail)
set_tests_properties(/CDash/MultipleSubprojectsEmail PROPERTIES DEPENDS /CDash/Model/BuildRelationship)
set_tests_properties(/CDash/MultipleSubprojectsEmail PROPERTIES DEPENDS /Feature/CDashTest)

add_legacy_unit_test(/CDash/NightlyTime)
set_tests_properties(/CDash/NightlyTime PROPERTIES DEPENDS /CDash/MultipleSubprojectsEmail)
Expand Down
Loading