From 39de7f47ca2bb11b92a71445000692c345cb7a74 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 5 Sep 2024 17:09:42 +0200 Subject: [PATCH] =?UTF-8?q?add:=20ignora=20kind=20debug,=20test=20per=20nu?= =?UTF-8?q?ova=20feature=20rm:=20test=20vuoti=20su=20funzionalit=C3=A0=20b?= =?UTF-8?q?asate=20su=20api=20terze?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/IssueValidationController.php | 16 ++++++---- .../GiteaApiControllerTest.php | 15 ---------- .../GiteaApiController/GiteaExportTest.php | 15 ---------- .../GiteaApiController/GiteaFetchTest.php | 30 ------------------- .../IssueValidationControllerTest.php | 15 +++++++--- .../ThirdPartyServices/EmailServiceTest.php | 15 ---------- .../NextcloudServiceTest.php | 15 ---------- .../OpenProjectServiceTest.php | 20 ------------- .../ThirdPartyServicesTest.php | 15 ---------- 9 files changed, 21 insertions(+), 135 deletions(-) delete mode 100644 tests/Http/Controllers/GiteaApiController/GiteaApiControllerTest.php delete mode 100644 tests/Http/Controllers/GiteaApiController/GiteaExportTest.php delete mode 100644 tests/Http/Controllers/GiteaApiController/GiteaFetchTest.php delete mode 100644 tests/Http/Controllers/ThirdPartyServices/EmailServiceTest.php delete mode 100644 tests/Http/Controllers/ThirdPartyServices/NextcloudServiceTest.php delete mode 100644 tests/Http/Controllers/ThirdPartyServices/OpenProjectServiceTest.php delete mode 100644 tests/Http/Controllers/ThirdPartyServices/ThirdPartyServicesTest.php diff --git a/app/Http/Controllers/IssueValidationController.php b/app/Http/Controllers/IssueValidationController.php index cb31ba0..6e01a5b 100644 --- a/app/Http/Controllers/IssueValidationController.php +++ b/app/Http/Controllers/IssueValidationController.php @@ -17,13 +17,17 @@ class IssueValidationController extends Controller return $datetime->format('Y-m-d H:i:s'); } - function search_requested_by($issue_labels){ + function search_requested_by_and_kind_bug($issue_labels){ + $kind_requested_by = false; foreach ($issue_labels as $key => $label) { - if (strpos($label['name'],'RequestBy') !== false) { - return true; + if (!$kind_requested_by && strpos($label['name'],'RequestBy') !== false) { + $kind_requested_by = true; + } + if ( strpos($label['name'],'Bug') !== false) { + return false; } } - return false; + return $kind_requested_by; } function get_issue_total_time(array $issue_time) @@ -39,8 +43,8 @@ class IssueValidationController extends Controller function check_issue_is_billed(array $issue_labels, array $issue_time): bool { $issue_time = $this->get_issue_total_time($issue_time); $issue_time = (gmdate('H:i:s', $issue_time) !== '00:00:00'); - $label_requested_by_index = $this->search_requested_by($issue_labels); - return $issue_time && $label_requested_by_index; + $label_requested_by_no_kind_bug = $this->search_requested_by_and_kind_bug($issue_labels); + return $issue_time && $label_requested_by_no_kind_bug; } function handle_single_issue(string $from_date, string $to_date, array $issue, array $issue_time){ diff --git a/tests/Http/Controllers/GiteaApiController/GiteaApiControllerTest.php b/tests/Http/Controllers/GiteaApiController/GiteaApiControllerTest.php deleted file mode 100644 index 27b0bfc..0000000 --- a/tests/Http/Controllers/GiteaApiController/GiteaApiControllerTest.php +++ /dev/null @@ -1,15 +0,0 @@ - 'RequestBy: User1'], ['name' => 'Bug']]; - $this->assertTrue($this->issue_validation_controller->search_requested_by($labels)); + $labels = [['name' => 'RequestBy: User1'], ['name' => 'Piru']]; + $this->assertTrue($this->issue_validation_controller->search_requested_by_and_kind_bug($labels)); } public function testLabelDoesNotExist() { $labels = [['name' => 'Bug'], ['name' => 'Feature']]; - $this->assertFalse($this->issue_validation_controller->search_requested_by($labels)); + $this->assertFalse($this->issue_validation_controller->search_requested_by_and_kind_bug($labels)); } public function testEmptyLabels() { $labels = []; - $this->assertFalse($this->issue_validation_controller->search_requested_by($labels)); + $this->assertFalse($this->issue_validation_controller->search_requested_by_and_kind_bug($labels)); } + + public function testKindBugExists() + { + $labels = [['name' => 'RequestBy: User1'], ['name' => 'Bug']]; + $this->assertFalse($this->issue_validation_controller->search_requested_by_and_kind_bug($labels)); + } + } diff --git a/tests/Http/Controllers/ThirdPartyServices/EmailServiceTest.php b/tests/Http/Controllers/ThirdPartyServices/EmailServiceTest.php deleted file mode 100644 index 7c6b1ba..0000000 --- a/tests/Http/Controllers/ThirdPartyServices/EmailServiceTest.php +++ /dev/null @@ -1,15 +0,0 @@ -