Skip to content

Commit cc9d999

Browse files
JonasGosebergJonasGoseberg
authored
Merge pull request #109 from imbus/SIT-72-cleanup
some improvements to Sonarcube and artisan insights
2 parents aafcf79 + 102c2f0 commit cc9d999

File tree

11 files changed

+31
-41
lines changed

11 files changed

+31
-41
lines changed

‎app/Http/Controllers/Api/PredefinedFilterController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function update(Request $request, int $id): JsonResponse
143143
'filter_data' => $updated,
144144
]);
145145
}
146-
public function destroy(Request $request, int $id)
146+
public function destroy(int $id)
147147
{
148148
$user = auth()->user();
149149
$filter = PredefinedFilter::find($id);

‎app/Http/Controllers/Api/PredefinedFilterPermissionController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function store(Request $request): JsonResponse
4141
]);
4242
}
4343

44-
public function show(Request $request, int $id): JsonResponse
44+
public function show(int $id): JsonResponse
4545
{
4646
$this->authorize('view', PredefinedFilter::class);
4747

@@ -58,7 +58,7 @@ public function show(Request $request, int $id): JsonResponse
5858
return response()->json($permission);
5959
}
6060

61-
public function destroy(Request $request, int $id): JsonResponse
61+
public function destroy(int $id): JsonResponse
6262
{
6363
$this->authorize('delete', PredefinedFilterPermission::class);
6464

@@ -71,4 +71,4 @@ public function destroy(Request $request, int $id): JsonResponse
7171
'message' => __('admin/reports/message.delete.success'),
7272
], 204);
7373
}
74-
}
74+
}

‎app/Http/Controllers/PredefinedFilterController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ public function destroy($Id) : RedirectResponse
8989
return redirect()->route('predefined-filters.index')
9090
->with('error', trans('general.insufficient_permissions'));
9191
}
92-
}
92+
}

‎app/Http/Transformers/PredefinedFiltersTransformer.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Illuminate\Support\Collection;
77
use App\Models\Setting;
88

9-
class PredefinedFiltersTransformer
9+
class PredefinedFiltersTransformer
1010
{
1111
public function transformPredefinedFilters(Collection $filters, $total)
1212
{
@@ -15,12 +15,11 @@ public function transformPredefinedFilters(Collection $filters, $total)
1515
$array[] = self::transformPredefinedFilter($filter);
1616
}
1717

18-
return (new DatatablesTransformer) -> transformDatatables($array, $total);
18+
return (new DatatablesTransformer)->transformDatatables($array, $total);
1919
}
2020

2121
public function transformPredefinedFilter($filter)
2222
{
23-
$setting = Setting::getSettings();
2423

2524
$array = [
2625
'id' => (int) $filter->id,
@@ -29,7 +28,7 @@ public function transformPredefinedFilter($filter)
2928
'is_public' => (bool)$filter->is_public,
3029
'object_type' => e($filter->object_type),
3130
'created_by' => $filter->createdBy ? [
32-
'id' => (int) $filter-> createdBy ->id,
31+
'id' => (int) $filter->createdBy->id,
3332
'name' => $filter->createdBy->present()->nameUrl(),
3433
] : null,
3534
'created_at' => Helper::getFormattedDateObject($filter->created_at, 'datetime'),
@@ -62,7 +61,6 @@ public function transformPredefinedFilter($filter)
6261
'update' => $filter->created_by === auth()->id() || $filter->userHasPermission(auth()->user(), 'edit'),
6362
'delete' => $filter->created_by === auth()->id() || $filter->userHasPermission(auth()->user(), 'delete')
6463
];
65-
$array += $permissions_array;
66-
return $array;
64+
return $array += $permissions_array;
6765
}
68-
}
66+
}

‎app/Livewire/Partials/AdvancedSearch/Modal.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ public function savePredefinedFiltersModal(
170170
$predefinedFilterService->createFilter($validated);
171171

172172
$this->dispatch('showNotificationInFrontend', [
173-
'type' => 'success',
174-
'title' => trans('general.notification_success'),
175-
'message' => trans('admin/predefinedFilters/message.create.success'),
176-
'tag' => 'predefinedFilter',
177-
]);
173+
'type' => 'success',
174+
'title' => trans('general.notification_success'),
175+
'message' => trans('admin/predefinedFilters/message.create.success'),
176+
'tag' => 'predefinedFilter',
177+
]);
178178

179179
$this->dispatch("savePredefinedFiltersModalEvent");
180180
$this->dispatch("closePredefinedFiltersModal");

‎app/Models/PredefinedFilter.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
use Watson\Validating\ValidatingTrait;
99
use Illuminate\Database\Eloquent\Builder;
1010

11-
use App\Models\User;
12-
1311
class PredefinedFilter extends Model
1412
{
1513
use HasFactory;
@@ -101,7 +99,7 @@ private function checkPermissions(User $user, $action): bool
10199
foreach ($this->permissionGroups as $group) {
102100
if (in_array($group->id, $userGroupIds)) {
103101
$permissions = json_decode($group->permissions, true);
104-
if ((isset($permissions["predefinedFilter.$action"]) && $permissions["predefinedFilter.$action"] == '1')) {
102+
if (isset($permissions["predefinedFilter.$action"]) && $permissions["predefinedFilter.$action"] == '1') {
105103
return true;
106104
}
107105
}
@@ -187,4 +185,4 @@ public function checkIfNameAlreadyExists(string $name, int $id = null): bool
187185
return sizeof($query->get()->toArray()) > 1;
188186

189187
}
190-
}
188+
}

‎app/Policies/PredefinedFilterPolicy.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use App\Models\User;
66
use App\Models\PredefinedFilter;
7-
use App\Policies\SnipePermissionsPolicy;
87

98
class PredefinedFilterPolicy extends SnipePermissionsPolicy
109
{
@@ -23,8 +22,8 @@ public function view(User $user, $filter = null)
2322

2423
//Controller
2524
if (is_string($filter) && $filter === PredefinedFilter::class) {
26-
return true;
27-
}
25+
return true;
26+
}
2827

2928
// Record-level permissions
3029
if ($filter instanceof PredefinedFilter) {

‎app/Services/FilterService/FilterService.php‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ protected function applyAssignedToUser($inner, $assignedValue, $operator){
284284
$this->applyRelationalValue($r, $last, $operator, ['column' => 'users.last_name']);
285285
});
286286
});
287-
288287
});
289288
}
290289
protected function applyAssignedToAsset($inner, $assignedValue, $operator){
@@ -293,18 +292,18 @@ protected function applyAssignedToAsset($inner, $assignedValue, $operator){
293292
$inner->where(function ($q) use ($assignedValue, $operator) {
294293
$q->whereNotNull('assets.assigned_to')
295294
->where('assets.assigned_type', Asset::class)
296-
->whereExists(function ($sub) use ($assignedValue, $operator) {
297-
$sub->from('assets as b')
295+
->whereExists(function ($sub) use ($assignedValue, $operator) {
296+
$sub->from('assets as b')
298297
->select('b.id')
299-
->whereColumn('b.id', 'assets.assigned_to')
300-
->where(function ($q2) use ($assignedValue, $operator) {
301-
if ($operator === 'equals') {
302-
$q2->where('b.asset_tag', '=', $assignedValue)
303-
->orWhere('b.name', '=', $assignedValue);
304-
} else {
305-
$q2->where('b.asset_tag', 'LIKE', '%' . $assignedValue . '%')
306-
->orWhere('b.name', 'LIKE', '%' . $assignedValue . '%');
307-
}
298+
->whereColumn('b.id', 'assets.assigned_to')
299+
->where(function ($q2) use ($assignedValue, $operator) {
300+
if ($operator === 'equals') {
301+
$q2->where('b.asset_tag', '=', $assignedValue)
302+
->orWhere('b.name', '=', $assignedValue);
303+
} else {
304+
$q2->where('b.asset_tag', 'LIKE', '%' . $assignedValue . '%')
305+
->orWhere('b.name', 'LIKE', '%' . $assignedValue . '%');
306+
}
308307
});
309308
});
310309
});

‎app/Services/PredefinedFilterPermissionService.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public function store(array $validated): PredefinedFilterPermission
2121
}
2222

2323
return $permission;
24-
2524
}
2625

2726
public function show(int $id): PredefinedFilterPermission

‎app/Services/PredefinedFilterService.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Throwable;
1515
use App\Models\PredefinedFilter;
1616
use App\Services\FilterService\FilterService;
17-
use App\Services\PredefinedFilterPermissionService;
1817
use Illuminate\Http\Request;
1918
use Illuminate\Pagination\LengthAwarePaginator;
2019
use Illuminate\Support\Collection;
@@ -35,7 +34,6 @@ public function __construct(PredefinedFilterPermissionService $predefinedFilterP
3534
public function filterService(): FilterService
3635
{
3736
return $this->filterService ??= app(FilterService::class);
38-
3937
}
4038

4139
public function getAllViewableFilters(): Collection
@@ -141,7 +139,7 @@ public function getFilterWithOptionalPermissionsById(int $id, bool $include_pred
141139
}
142140
break;
143141
default:
144-
break;
142+
break;
145143
}
146144
}
147145

0 commit comments

Comments
 (0)