Skip to content

Commit cc3af60

Browse files
committed
Cleanup
1 parent 703532f commit cc3af60

File tree

6 files changed

+25
-30
lines changed

6 files changed

+25
-30
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"require-dev": {
2323
"larastan/larastan": "^2.0",
24+
"laravel/pint": "^1.18",
2425
"nunomaduro/collision": "^v8.4.0",
2526
"orchestra/testbench": "^v9.4.0",
2627
"pestphp/pest": "^v2.35.1",

src/FetchDataFromJiraQueueCommand.php

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,20 @@
55
use Illuminate\Console\Command;
66
use Illuminate\Http\Client\PendingRequest;
77
use Illuminate\Support\Facades\Http;
8-
use Carbon\Carbon;
9-
//function for fetching the data
8+
109
class FetchDataFromJiraQueueCommand extends Command
1110
{
12-
//You can run this signature in the terminal php artisan fetch:queue-jira-data
13-
//This is meant for testing and inserting the data
1411
protected $signature = 'dashboard:fetch-queue-jira-service-management-data';
12+
1513
protected $description = 'Fetch queue data using the Jira Service Management API';
1614

17-
public function handle()
15+
public function handle(): int
1816
{
1917
$data = [
2018
'queues' => [],
2119
];
2220

23-
$this->info("Fetching all queue data");
21+
$this->info('Fetching all queue data');
2422

2523
$queues = $this->getQueues();
2624

@@ -39,18 +37,19 @@ public function handle()
3937

4038
$data['issues_resolved_today'] = $this->getIssuesHandledTodayCount();
4139

42-
dump($data);
43-
4440
JiraQueueTileServiceManagementStore::make()->setData($data);
41+
42+
return self::SUCCESS;
4543
}
4644

4745
private function getQueues(): array
4846
{
4947
$queueResponse = $this->apiClient()
50-
->get(config('dashboard.tiles.jira_service_queues.jira_host') . "/rest/servicedeskapi/servicedesk/4/queue");
48+
->get(config('dashboard.tiles.jira_service_queues.jira_host').'/rest/servicedeskapi/servicedesk/4/queue');
5149

5250
if ($queueResponse->successful()) {
5351
$queuesData = $queueResponse->json();
52+
5453
return $queuesData['values'];
5554
}
5655

@@ -66,16 +65,16 @@ private function getQueueIssueCount(string $queueId): int
6665
do {
6766
$this->info("Fetching data for queue {$queueId}, issue page: {$issuePage}");
6867
$queueRepo = $this->apiClient()
69-
->get(config('dashboard.tiles.jira_service_queues.jira_host') .
68+
->get(config('dashboard.tiles.jira_service_queues.jira_host').
7069
"/rest/servicedeskapi/servicedesk/4/queue/{$queueId}/issue", [
71-
'start' => ($issuePage - 1) * $issuesPerPage,
72-
'limit' => $issuesPerPage,
73-
]);
70+
'start' => ($issuePage - 1) * $issuesPerPage,
71+
'limit' => $issuesPerPage,
72+
]);
7473

7574
if ($queueRepo->successful()) {
7675
$queueRepoData = $queueRepo->json();
7776
$issueData = $queueRepoData['values'] ?? [];
78-
$issueCount =+ count($issueData);
77+
$issueCount = +count($issueData);
7978
} else {
8079
$this->error("Failed to fetch issues for queue {$queueId}. Status: {$queueRepo->status()}");
8180
break;
@@ -89,8 +88,8 @@ private function getQueueIssueCount(string $queueId): int
8988
private function getIssuesHandledTodayCount(): ?int
9089
{
9190
$issuesResponse = $this->apiClient()
92-
->get(config('dashboard.tiles.jira_service_queues.jira_host') . "/rest/api/3/search", [
93-
'jql' => config('dashboard.tiles.jira_service_queues.resolved_today_jql'),
91+
->get(config('dashboard.tiles.jira_service_queues.jira_host').'/rest/api/3/search', [
92+
'jql' => config('dashboard.tiles.jira_service_queues.resolved_today_jql'),
9493
'maxResults' => 1000,
9594
]);
9695

@@ -107,10 +106,8 @@ private function apiClient(): PendingRequest
107106
{
108107
return Http::withHeaders([
109108
'Accept' => 'application/json',
110-
'Authorization' => 'Basic ' . base64_encode(config('dashboard.tiles.jira_service_queues.jira_user') . ":" .
109+
'Authorization' => 'Basic '.base64_encode(config('dashboard.tiles.jira_service_queues.jira_user').':'.
111110
config('dashboard.tiles.jira_service_queues.jira_api_token')),
112111
]);
113112
}
114-
115113
}
116-

src/JiraQueueTileServiceManagementComponent.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Creacoon\JiraQueueServiceTile;
44

5-
use Creacoon\JiraQueueServiceTile\JiraQueueTileServiceManagementStore;
65
use livewire\Component;
76

87
class JiraQueueTileServiceManagementComponent extends Component

src/JiraQueueTileServiceManagementStore.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?php
22

33
namespace Creacoon\JiraQueueServiceTile;
4-
use Spatie\Dashboard\Models\Tile;
54

5+
use Spatie\Dashboard\Models\Tile;
66

77
class JiraQueueTileServiceManagementStore
88
{
99
private Tile $tile;
1010

1111
public static function make()
1212
{
13-
return new static();
13+
return new static;
1414
}
1515

1616
public function __construct()
1717
{
18-
$this->tile = Tile::firstOrCreateForName("JSMQueuesTile");
18+
$this->tile = Tile::firstOrCreateForName('JSMQueuesTile');
1919
}
2020

2121
public function setData(array $data): self
@@ -25,7 +25,6 @@ public function setData(array $data): self
2525
return $this;
2626
}
2727

28-
2928
public function getData(string $key): array
3029
{
3130
return $this->tile->getData('JSMQueueData') ?? [];

src/JiraQueueTileServiceProvider.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
namespace Creacoon\JiraQueueServiceTile;
44

5-
use Creacoon\JiraQueueServiceTile\JiraQueueTileServiceManagementComponent;
65
use Livewire\Livewire;
76
use Spatie\LaravelPackageTools\Package;
87
use Spatie\LaravelPackageTools\PackageServiceProvider;
9-
use Creacoon\JiraQueueServiceTile\FetchDataFromJiraQueueCommand;
108

119
class JiraQueueTileServiceProvider extends PackageServiceProvider
1210
{
@@ -22,19 +20,20 @@ public function configurePackage(Package $package): void
2220
->hasViews()
2321
->hasCommand(FetchDataFromJiraQueueCommand::class);
2422
}
23+
2524
public function boot()
2625
{
2726
if ($this->app->runningInConsole()) {
2827
$this->commands([
29-
FetchDataFromJiraQueueCommand::class,
28+
FetchDataFromJiraQueueCommand::class,
3029
]);
3130
}
3231

3332
$this->publishes([
34-
__DIR__ . '/../resources/views' => resource_path('views/creacoon/dashboard-jira-queue-tile'),
33+
__DIR__.'/../resources/views' => resource_path('views/creacoon/dashboard-jira-queue-tile'),
3534
], 'dashboard-jira-queue-tile-views');
3635

37-
$this->loadViewsFrom(__DIR__ . '/../resources/views', 'dashboard-jira-queue-tile');
36+
$this->loadViewsFrom(__DIR__.'/../resources/views', 'dashboard-jira-queue-tile');
3837

3938
Livewire::component('jira-service-queue-tile', JiraQueueTileServiceManagementComponent::class);
4039
}

tests/Test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ public function true_is_true()
1111
{
1212
$this->assertTrue(true);
1313
}
14-
}
14+
}

0 commit comments

Comments
 (0)