Skip to content

Commit 9ee4d3c

Browse files
YoyaspYoyasp
committed
Rename fields according to naming convention
1 parent 586fa33 commit 9ee4d3c

78 files changed

Lines changed: 4322 additions & 3405 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/Restify/AccessPointRepository.php‎

Lines changed: 58 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
use App\Models\AccessPoint;
66
use Binaryk\LaravelRestify\Fields\BelongsTo;
7+
use Binaryk\LaravelRestify\Filters\MatchFilter;
8+
use Binaryk\LaravelRestify\Filters\SearchableFilter;
9+
use Binaryk\LaravelRestify\Filters\SortableFilter;
710
use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
811
use Illuminate\Http\Request;
912

@@ -17,42 +20,8 @@ class AccessPointRepository extends Repository
1720

1821
public static string $title = 'name';
1922

20-
public static array $search = [
21-
'name',
22-
'mac_addr',
23-
];
24-
25-
public static array $match = [
26-
'device_id' => 'integer',
27-
'name' => 'text',
28-
'radio_number' => 'integer',
29-
'type' => 'text',
30-
'mac_addr' => 'text',
31-
'channel' => 'integer',
32-
'txpow' => 'integer',
33-
'radioutil' => 'integer',
34-
'numasoclients' => 'integer',
35-
'nummonclients' => 'integer',
36-
'numactbssid' => 'integer',
37-
'nummonbssid' => 'integer',
38-
'interference' => 'integer',
39-
];
40-
41-
public static array $sort = [
42-
'device_id',
43-
'name',
44-
'radio_number',
45-
'type',
46-
'mac_addr',
47-
'channel',
48-
'txpow',
49-
'radioutil',
50-
'numasoclients',
51-
'nummonclients',
52-
'numactbssid',
53-
'nummonbssid',
54-
'interference',
55-
];
23+
24+
5625

5726
public static function related(): array
5827
{
@@ -61,21 +30,64 @@ public static function related(): array
6130
];
6231
}
6332

33+
public static function searchables(): array
34+
{
35+
return [
36+
'name' => SearchableFilter::make()->setColumn('name'),
37+
'macAddress' => SearchableFilter::make()->setColumn('mac_addr'),
38+
];
39+
}
40+
41+
public static function matches(): array
42+
{
43+
return [
44+
'name' => MatchFilter::make()->setType('text')->setColumn('name'),
45+
'radioNumber' => MatchFilter::make()->setType('integer')->setColumn('radio_number'),
46+
'category' => MatchFilter::make()->setType('text')->setColumn('type'),
47+
'macAddress' => MatchFilter::make()->setType('text')->setColumn('mac_addr'),
48+
'channel' => MatchFilter::make()->setType('integer')->setColumn('channel'),
49+
'transmitPower' => MatchFilter::make()->setType('integer')->setColumn('txpow'),
50+
'radioUtilization' => MatchFilter::make()->setType('integer')->setColumn('radioutil'),
51+
'associatedClients' => MatchFilter::make()->setType('integer')->setColumn('numasoclients'),
52+
'monitoredClients' => MatchFilter::make()->setType('integer')->setColumn('nummonclients'),
53+
'activeBssidCount' => MatchFilter::make()->setType('integer')->setColumn('numactbssid'),
54+
'monitoredBssidCount' => MatchFilter::make()->setType('integer')->setColumn('nummonbssid'),
55+
'interference' => MatchFilter::make()->setType('integer')->setColumn('interference'),
56+
];
57+
}
58+
59+
public static function sorts(): array
60+
{
61+
return [
62+
'name' => SortableFilter::make()->setColumn('name'),
63+
'radioNumber' => SortableFilter::make()->setColumn('radio_number'),
64+
'category' => SortableFilter::make()->setColumn('type'),
65+
'macAddress' => SortableFilter::make()->setColumn('mac_addr'),
66+
'channel' => SortableFilter::make()->setColumn('channel'),
67+
'transmitPower' => SortableFilter::make()->setColumn('txpow'),
68+
'radioUtilization' => SortableFilter::make()->setColumn('radioutil'),
69+
'associatedClients' => SortableFilter::make()->setColumn('numasoclients'),
70+
'monitoredClients' => SortableFilter::make()->setColumn('nummonclients'),
71+
'activeBssidCount' => SortableFilter::make()->setColumn('numactbssid'),
72+
'monitoredBssidCount' => SortableFilter::make()->setColumn('nummonbssid'),
73+
'interference' => SortableFilter::make()->setColumn('interference'),
74+
];
75+
}
76+
6477
public function fields(RestifyRequest $request): array
6578
{
6679
return [
67-
field('device_id')->readonly(),
6880
field('name')->readonly(),
69-
field('radio_number')->readonly(),
70-
field('type')->readonly(),
71-
field('mac_addr')->readonly(),
81+
field('radioNumber', fn ($value, $model) => $model->radio_number)->readonly(),
82+
field('category', fn ($value, $model) => $model->type)->readonly(),
83+
field('macAddress', fn ($value, $model) => $model->mac_addr)->readonly(),
7284
field('channel')->readonly(),
73-
field('txpow')->readonly(),
74-
field('radioutil')->readonly(),
75-
field('numasoclients')->readonly(),
76-
field('nummonclients')->readonly(),
77-
field('numactbssid')->readonly(),
78-
field('nummonbssid')->readonly(),
85+
field('transmitPower', fn ($value, $model) => $model->txpow)->readonly(),
86+
field('radioUtilization', fn ($value, $model) => $model->radioutil)->readonly(),
87+
field('associatedClients', fn ($value, $model) => $model->numasoclients)->readonly(),
88+
field('monitoredClients', fn ($value, $model) => $model->nummonclients)->readonly(),
89+
field('activeBssidCount', fn ($value, $model) => $model->numactbssid)->readonly(),
90+
field('monitoredBssidCount', fn ($value, $model) => $model->nummonbssid)->readonly(),
7991
field('interference')->readonly(),
8092
];
8193
}

‎app/Restify/AlertLogRepository.php‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
use Binaryk\LaravelRestify\Fields\BelongsTo;
77
use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
88
use Illuminate\Http\Request;
9+
use Binaryk\LaravelRestify\Filters\MatchFilter;
10+
use Binaryk\LaravelRestify\Filters\SearchableFilter;
11+
use Binaryk\LaravelRestify\Filters\SortableFilter;
912

1013
class AlertLogRepository extends Repository
1114
{
@@ -15,19 +18,7 @@ class AlertLogRepository extends Repository
1518

1619
public static string $title = 'id';
1720

18-
public static array $match = [
19-
'device_id' => 'integer',
20-
'rule_id' => 'integer',
21-
'state' => 'integer',
22-
'time_logged' => 'datetime',
23-
];
2421

25-
public static array $sort = [
26-
'device_id',
27-
'rule_id',
28-
'state',
29-
'time_logged',
30-
];
3122

3223
public static function related(): array
3324
{
@@ -37,13 +28,32 @@ public static function related(): array
3728
];
3829
}
3930

31+
public static function searchables(): array
32+
{
33+
return [];
34+
}
35+
36+
public static function matches(): array
37+
{
38+
return [
39+
'state' => MatchFilter::make()->setType('integer')->setColumn('state'),
40+
'createdAt' => MatchFilter::make()->setType('datetime')->setColumn('time_logged'),
41+
];
42+
}
43+
44+
public static function sorts(): array
45+
{
46+
return [
47+
'state' => SortableFilter::make()->setColumn('state'),
48+
'createdAt' => SortableFilter::make()->setColumn('time_logged'),
49+
];
50+
}
51+
4052
public function fields(RestifyRequest $request): array
4153
{
4254
return [
43-
field('device_id')->readonly(),
44-
field('rule_id')->readonly(),
4555
field('state')->readonly(),
46-
field('time_logged')->readonly(),
56+
field('createdAt', fn ($value, $model) => $model->time_logged)->readonly(),
4757
];
4858
}
4959

‎app/Restify/AlertRepository.php‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
1010
use Illuminate\Http\Request;
1111
use Illuminate\Routing\Router;
12+
use Binaryk\LaravelRestify\Filters\MatchFilter;
13+
use Binaryk\LaravelRestify\Filters\SearchableFilter;
14+
use Binaryk\LaravelRestify\Filters\SortableFilter;
1215

1316
class AlertRepository extends Repository
1417
{
@@ -18,25 +21,8 @@ class AlertRepository extends Repository
1821

1922
public static string $title = 'id';
2023

21-
public static array $search = [];
22-
23-
public static array $match = [
24-
'device_id' => 'integer',
25-
'rule_id' => 'integer',
26-
'state' => 'integer',
27-
'alerted' => 'integer',
28-
'open' => 'integer',
29-
'timestamp' => 'datetime',
30-
];
31-
32-
public static array $sort = [
33-
'device_id',
34-
'rule_id',
35-
'state',
36-
'alerted',
37-
'open',
38-
'timestamp',
39-
];
24+
25+
4026

4127
public static function related(): array
4228
{
@@ -46,16 +32,43 @@ public static function related(): array
4632
];
4733
}
4834

35+
public static function searchables(): array
36+
{
37+
return [];
38+
}
39+
40+
public static function matches(): array
41+
{
42+
return [
43+
'state' => MatchFilter::make()->setType('integer')->setColumn('state'),
44+
'note' => MatchFilter::make()->setType('text')->setColumn('note'),
45+
'isAlerted' => MatchFilter::make()->setType('bool')->setColumn('alerted'),
46+
'isOpen' => MatchFilter::make()->setType('bool')->setColumn('open'),
47+
'createdAt' => MatchFilter::make()->setType('datetime')->setColumn('timestamp'),
48+
'info' => MatchFilter::make()->setType('text')->setColumn('info'),
49+
];
50+
}
51+
52+
public static function sorts(): array
53+
{
54+
return [
55+
'state' => SortableFilter::make()->setColumn('state'),
56+
'note' => SortableFilter::make()->setColumn('note'),
57+
'isAlerted' => SortableFilter::make()->setColumn('alerted'),
58+
'isOpen' => SortableFilter::make()->setColumn('open'),
59+
'createdAt' => SortableFilter::make()->setColumn('timestamp'),
60+
'info' => SortableFilter::make()->setColumn('info'),
61+
];
62+
}
63+
4964
public function fields(RestifyRequest $request): array
5065
{
5166
return [
52-
field('device_id')->readonly(),
53-
field('rule_id')->readonly(),
5467
field('state')->readonly(),
5568
field('note')->readonly(),
56-
field('alerted')->readonly(),
57-
field('open')->readonly(),
58-
field('timestamp')->readonly(),
69+
field('isAlerted', fn ($value, $model) => $model->alerted)->readonly(),
70+
field('isOpen', fn ($value, $model) => $model->open)->readonly(),
71+
field('createdAt', fn ($value, $model) => $model->timestamp)->readonly(),
5972
field('info')->readonly(),
6073
];
6174
}

‎app/Restify/AlertRuleRepository.php‎

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use App\Models\AlertRule;
66
use Binaryk\LaravelRestify\Fields\BelongsToMany;
77
use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
8+
use Binaryk\LaravelRestify\Filters\MatchFilter;
9+
use Binaryk\LaravelRestify\Filters\SearchableFilter;
10+
use Binaryk\LaravelRestify\Filters\SortableFilter;
811

912
class AlertRuleRepository extends Repository
1013
{
@@ -14,23 +17,8 @@ class AlertRuleRepository extends Repository
1417

1518
public static string $title = 'name';
1619

17-
public static array $search = [
18-
'name',
19-
];
2020

21-
public static array $match = [
22-
'name' => 'text',
23-
'severity' => 'text',
24-
'disabled' => 'integer',
25-
'invert_map' => 'integer',
26-
];
2721

28-
public static array $sort = [
29-
'name',
30-
'severity',
31-
'disabled',
32-
'invert_map',
33-
];
3422

3523
public static function related(): array
3624
{
@@ -41,19 +29,76 @@ public static function related(): array
4129
];
4230
}
4331

32+
public static function searchables(): array
33+
{
34+
return [
35+
'name' => SearchableFilter::make()->setColumn('name'),
36+
];
37+
}
38+
39+
public static function matches(): array
40+
{
41+
return [
42+
'name' => MatchFilter::make()->setType('text')->setColumn('name'),
43+
'severity' => MatchFilter::make()->setType('text')->setColumn('severity'),
44+
'isEnabled' => MatchFilter::make()->setType('bool')->setColumn('disabled'),
45+
'rule' => MatchFilter::make()->setType('text')->setColumn('rule'),
46+
'query' => MatchFilter::make()->setType('text')->setColumn('query'),
47+
'builder' => MatchFilter::make()->setType('text')->setColumn('builder'),
48+
'extra' => MatchFilter::make()->setType('text')->setColumn('extra'),
49+
'procedure' => MatchFilter::make()->setType('text')->setColumn('proc'),
50+
'notes' => MatchFilter::make()->setType('text')->setColumn('notes'),
51+
'isInverted' => MatchFilter::make()->setType('bool')->setColumn('invert_map'),
52+
];
53+
}
54+
55+
public static function sorts(): array
56+
{
57+
return [
58+
'name' => SortableFilter::make()->setColumn('name'),
59+
'severity' => SortableFilter::make()->setColumn('severity'),
60+
'isEnabled' => SortableFilter::make()->setColumn('disabled'),
61+
'rule' => SortableFilter::make()->setColumn('rule'),
62+
'query' => SortableFilter::make()->setColumn('query'),
63+
'builder' => SortableFilter::make()->setColumn('builder'),
64+
'extra' => SortableFilter::make()->setColumn('extra'),
65+
'procedure' => SortableFilter::make()->setColumn('proc'),
66+
'notes' => SortableFilter::make()->setColumn('notes'),
67+
'isInverted' => SortableFilter::make()->setColumn('invert_map'),
68+
];
69+
}
70+
4471
public function fields(RestifyRequest $request): array
4572
{
4673
return [
4774
field('name')->rules('required', 'string', 'max:255'),
4875
field('severity')->rules('required', 'in:ok,warning,critical'),
49-
field('disabled')->rules('required', 'boolean'),
76+
field('isEnabled', fn ($value, $model) => ! $model->disabled)
77+
->fillCallback(function ($request, $model, $attribute) {
78+
if ($request->exists($attribute)) {
79+
$model->disabled = ! $request->boolean($attribute);
80+
}
81+
})
82+
->rules('required', 'boolean'),
5083
field('rule')->readonly(),
5184
field('query')->readonly(),
5285
field('builder')->readonly(),
5386
field('extra')->readonly(),
54-
field('proc')->rules('nullable', 'string', 'max:80'),
87+
field('procedure', fn ($value, $model) => $model->proc)
88+
->fillCallback(function ($request, $model, $attribute) {
89+
if ($request->exists($attribute)) {
90+
$model->proc = $request->input($attribute);
91+
}
92+
})
93+
->rules('nullable', 'string', 'max:80'),
5594
field('notes')->rules('nullable', 'string'),
56-
field('invert_map')->rules('boolean'),
95+
field('isInverted', fn ($value, $model) => $model->invert_map)
96+
->fillCallback(function ($request, $model, $attribute) {
97+
if ($request->exists($attribute)) {
98+
$model->invert_map = $request->input($attribute);
99+
}
100+
})
101+
->rules('boolean'),
57102
];
58103
}
59104
}

0 commit comments

Comments
 (0)