Skip to content

Commit 119ca69

Browse files
miserenkovmiserenkov
committed
Simplify enum names
1 parent c70c31e commit 119ca69

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎src/Enums/PulseRecordKeys.php‎ renamed to ‎src/Enums/RecordKeys.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Kodamity\Libraries\ApiUsagePulse\Enums;
1313

14-
enum PulseRecordKeys: string
14+
enum RecordKeys: string
1515
{
1616
case ResponsesStatistics = 'kdm_api_usage_responses_statistics';
1717
}

‎src/Enums/PulseRecordTypes.php‎ renamed to ‎src/Enums/RecordTypes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Kodamity\Libraries\ApiUsagePulse\Enums;
1313

14-
enum PulseRecordTypes: string
14+
enum RecordTypes: string
1515
{
1616
case RequestsStatisticsTotal = 'kdm_api_usage_requests_total';
1717

‎src/Livewire/RequestsSummary.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Illuminate\Contracts\Support\Renderable;
1515
use Illuminate\Support\Facades\Config;
1616
use Illuminate\Support\Facades\View;
17-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordTypes;
17+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordTypes;
1818
use Kodamity\Libraries\ApiUsagePulse\Recorders\RequestsStatistics;
1919
use Laravel\Pulse\Facades\Pulse;
2020
use Laravel\Pulse\Livewire\Card;
@@ -35,14 +35,14 @@ class RequestsSummary extends Card
3535
*/
3636
public function render(): Renderable
3737
{
38-
$types = [PulseRecordTypes::RequestsStatisticsTotal->value, PulseRecordTypes::RequestsStatisticsSuccessful->value];
38+
$types = [RecordTypes::RequestsStatisticsTotal->value, RecordTypes::RequestsStatisticsSuccessful->value];
3939

4040
[$totalRequests, $allTime, $allRunAt] = $this->remember(
4141
fn () => with(
4242
$this->aggregateTotal($types, 'count'),
4343
fn ($results) => (object) [
44-
'total' => $results[PulseRecordTypes::RequestsStatisticsTotal->value] ?? 0,
45-
'success' => $results[PulseRecordTypes::RequestsStatisticsSuccessful->value] ?? 0,
44+
'total' => $results[RecordTypes::RequestsStatisticsTotal->value] ?? 0,
45+
'success' => $results[RecordTypes::RequestsStatisticsSuccessful->value] ?? 0,
4646
],
4747
),
4848
'all',
@@ -54,8 +54,8 @@ function () use ($types) {
5454
->map(function ($row) {
5555
return (object) [
5656
'key' => $row->key,
57-
'total' => $row->{PulseRecordTypes::RequestsStatisticsTotal->value} ?? 0,
58-
'success' => $row->{PulseRecordTypes::RequestsStatisticsSuccessful->value} ?? 0,
57+
'total' => $row->{RecordTypes::RequestsStatisticsTotal->value} ?? 0,
58+
'success' => $row->{RecordTypes::RequestsStatisticsSuccessful->value} ?? 0,
5959
];
6060
});
6161

‎src/Livewire/ResponseStatusesGraph.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Illuminate\Support\Collection;
1616
use Illuminate\Support\Facades\Config;
1717
use Illuminate\Support\Facades\View;
18-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordKeys;
18+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordKeys;
1919
use Kodamity\Libraries\ApiUsagePulse\Enums\ResponseStatusGroup;
2020
use Kodamity\Libraries\ApiUsagePulse\Recorders\ResponsesStatistics;
2121
use Laravel\Pulse\Livewire\Card;
@@ -40,7 +40,7 @@ public function render(): Renderable
4040
[$requests, $time, $runAt] = $this->remember(fn () => $this->graph($statuses, 'count'));
4141

4242
$datasets = $requests
43-
->get(PulseRecordKeys::ResponsesStatistics->value, collect())
43+
->get(RecordKeys::ResponsesStatistics->value, collect())
4444
->mapWithKeys(function (Collection $item, string $key) {
4545
return [ResponseStatusGroup::from($key)->name => $item];
4646
});

‎src/Livewire/ResponseTimesGraph.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use Illuminate\Contracts\Support\Renderable;
1515
use Illuminate\Support\Facades\Config;
1616
use Illuminate\Support\Facades\View;
17-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordKeys;
18-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordTypes;
17+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordKeys;
18+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordTypes;
1919
use Kodamity\Libraries\ApiUsagePulse\Recorders\ResponsesStatistics;
2020
use Laravel\Pulse\Livewire\Card;
2121
use Laravel\Pulse\Livewire\Concerns;
@@ -34,11 +34,11 @@ class ResponseTimesGraph extends Card
3434
public function render(): Renderable
3535
{
3636
/* @phpstan-ignore return.type */
37-
[$requests, $time, $runAt] = $this->remember(fn () => $this->graph([PulseRecordTypes::ResponsesStatisticsTime->value], 'avg'));
37+
[$requests, $time, $runAt] = $this->remember(fn () => $this->graph([RecordTypes::ResponsesStatisticsTime->value], 'avg'));
3838

3939
$dataset = $requests
40-
->get(PulseRecordKeys::ResponsesStatistics->value, collect())
41-
->get(PulseRecordTypes::ResponsesStatisticsTime->value, collect());
40+
->get(RecordKeys::ResponsesStatistics->value, collect())
41+
->get(RecordTypes::ResponsesStatisticsTime->value, collect());
4242

4343
if (Livewire::isLivewireRequest()) {
4444
$this->dispatch('kdm-api-usage-response-times-chart-update', dataset: $dataset);

‎src/Recorders/RequestsStatistics.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Illuminate\Contracts\Http\Kernel;
1717
use Illuminate\Http\Request;
1818
use Illuminate\Support\Carbon;
19-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordTypes;
19+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordTypes;
2020
use Laravel\Pulse\Concerns\ConfiguresAfterResolving;
2121
use Laravel\Pulse\Pulse;
2222
use Laravel\Pulse\Recorders\Concerns;
@@ -71,14 +71,14 @@ public function record(Carbon $startedAt, Request $request, Response $response):
7171
}
7272

7373
$this->pulse->record(
74-
type: PulseRecordTypes::RequestsStatisticsTotal->value,
74+
type: RecordTypes::RequestsStatisticsTotal->value,
7575
key: (string) $userId,
7676
timestamp: $startedAt->getTimestamp(),
7777
)->count();
7878

7979
if ($response->isSuccessful()) {
8080
$this->pulse->record(
81-
type: PulseRecordTypes::RequestsStatisticsSuccessful->value,
81+
type: RecordTypes::RequestsStatisticsSuccessful->value,
8282
key: (string) $userId,
8383
timestamp: $startedAt->getTimestamp(),
8484
)->count();

‎src/Recorders/ResponsesStatistics.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
use Illuminate\Support\Carbon;
1818
use Illuminate\Support\Facades\Config;
1919
use Illuminate\Support\Str;
20-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordKeys;
21-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordTypes;
20+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordKeys;
21+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordTypes;
2222
use Kodamity\Libraries\ApiUsagePulse\Enums\ResponseStatusGroup;
2323
use Laravel\Pulse\Concerns\ConfiguresAfterResolving;
2424
use Laravel\Pulse\Pulse;
@@ -78,14 +78,14 @@ public function record(Carbon $startedAt, Request $request, Response $response):
7878

7979
$this->pulse->record(
8080
type: $statusGroup->value,
81-
key: PulseRecordKeys::ResponsesStatistics->value,
81+
key: RecordKeys::ResponsesStatistics->value,
8282
timestamp: $startedAt,
8383
)->count()->onlyBuckets();
8484

8585
$duration = ((int) $startedAt->diffInMilliseconds());
8686
$this->pulse->record(
87-
type: PulseRecordTypes::ResponsesStatisticsTime->value,
88-
key: PulseRecordKeys::ResponsesStatistics->value,
87+
type: RecordTypes::ResponsesStatisticsTime->value,
88+
key: RecordKeys::ResponsesStatistics->value,
8989
value: $duration,
9090
timestamp: $startedAt,
9191
)->avg()->onlyBuckets();

‎tests/Recorders/RequestsStatisticsTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Illuminate\Support\Facades\Config;
1515
use Illuminate\Support\Facades\DB;
1616
use Illuminate\Support\Facades\Hash;
17-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordTypes;
17+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordTypes;
1818
use Kodamity\Libraries\ApiUsagePulse\Recorders\RequestsStatistics;
1919
use Kodamity\Libraries\ApiUsagePulse\Tests\TestCase;
2020
use Laravel\Pulse\Facades\Pulse;
@@ -46,7 +46,7 @@ public function it_captures_requests_statistics(): void
4646

4747
Pulse::ignore(function () {
4848
$aggregatesRows = DB::table('pulse_aggregates')
49-
->where('type', PulseRecordTypes::RequestsStatisticsTotal)
49+
->where('type', RecordTypes::RequestsStatisticsTotal)
5050
->where('aggregate', 'count')
5151
->get();
5252
$this->assertCount(4, $aggregatesRows);
@@ -56,7 +56,7 @@ public function it_captures_requests_statistics(): void
5656
}
5757

5858
$entriesRows = DB::table('pulse_entries')
59-
->where('type', PulseRecordTypes::RequestsStatisticsTotal)
59+
->where('type', RecordTypes::RequestsStatisticsTotal)
6060
->get();
6161

6262
$this->assertCount(4, $entriesRows);
@@ -75,13 +75,13 @@ public function it_captures_successful_requests_statistics(): void
7575

7676
Pulse::ignore(function () {
7777
$aggregatesRows = DB::table('pulse_aggregates')
78-
->where('type', PulseRecordTypes::RequestsStatisticsTotal)
78+
->where('type', RecordTypes::RequestsStatisticsTotal)
7979
->where('aggregate', 'count')
8080
->get();
8181
$this->assertCount(4, $aggregatesRows);
8282

8383
$successfulAggregatesRows = DB::table('pulse_aggregates')
84-
->where('type', PulseRecordTypes::RequestsStatisticsSuccessful)
84+
->where('type', RecordTypes::RequestsStatisticsSuccessful)
8585
->where('aggregate', 'count')
8686
->get();
8787
$this->assertCount(4, $successfulAggregatesRows);
@@ -91,7 +91,7 @@ public function it_captures_successful_requests_statistics(): void
9191
}
9292

9393
$entriesRows = DB::table('pulse_entries')
94-
->where('type', PulseRecordTypes::RequestsStatisticsSuccessful)
94+
->where('type', RecordTypes::RequestsStatisticsSuccessful)
9595
->get();
9696

9797
$this->assertCount(2, $entriesRows);

‎tests/Recorders/ResponsesStatisticsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Illuminate\Support\Facades\Date;
1616
use Illuminate\Support\Facades\DB;
1717
use Illuminate\Support\Str;
18-
use Kodamity\Libraries\ApiUsagePulse\Enums\PulseRecordTypes;
18+
use Kodamity\Libraries\ApiUsagePulse\Enums\RecordTypes;
1919
use Kodamity\Libraries\ApiUsagePulse\Enums\ResponseStatusGroup;
2020
use Kodamity\Libraries\ApiUsagePulse\Recorders\ResponsesStatistics;
2121
use Kodamity\Libraries\ApiUsagePulse\Tests\TestCase;
@@ -44,7 +44,7 @@ public function it_captures_responses_by_status_code_group(ResponseStatusGroup $
4444
$this->assertCount(4, $aggregatesRows);
4545

4646
$timesAggregatesRows = DB::table('pulse_aggregates')
47-
->where('type', PulseRecordTypes::ResponsesStatisticsTime->value)
47+
->where('type', RecordTypes::ResponsesStatisticsTime->value)
4848
->get();
4949

5050
$this->assertCount(4, $timesAggregatesRows);

0 commit comments

Comments
 (0)