Skip to content

Commit 37f7bd9

Browse files
AllanKodergithub-actions[bot]
authored andcommitted
Apply automatic changes
1 parent 96f2fbb commit 37f7bd9

3 files changed

Lines changed: 19 additions & 23 deletions

File tree

app/Exceptions/Resources/ResourceInvalidTabException.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
use Exception;
66

7-
class ResourceInvalidTabException extends Exception
8-
{
9-
}
7+
class ResourceInvalidTabException extends Exception {}

app/Http/Controllers/ComputerScienceResourceController.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,24 @@ public function store(StoreResourceRequest $request)
6060
try {
6161
$resource = $this->resourceService->createResource($validatedData);
6262
session()->flash('success', 'Created Resource!');
63+
6364
return response()->json($resource);
64-
}
65-
catch (ResourceAlreadyCreatedException $e)
66-
{
65+
} catch (ResourceAlreadyCreatedException $e) {
6766
Log::warning('Resource already exists', [
6867
'user_id' => Auth::id(),
6968
'resource_id' => $e->resource->id ?? null,
7069
'name' => $e->resource->name ?? null,
7170
]);
7271
session()->flash('warning', 'Resource Already Exists!');
72+
7373
return response()->json($e->resource);
74-
}
75-
catch (Throwable $e) {
74+
} catch (Throwable $e) {
7675
Log::error('Error creating resource', [
7776
'user_id' => Auth::id(),
7877
'error' => $e->getMessage(),
7978
'trace' => $e->getTraceAsString(),
8079
]);
80+
8181
return response()->json([], 500);
8282
}
8383
}
@@ -89,6 +89,7 @@ public function show(Request $request, string $slug, string $tab = 'reviews')
8989
{
9090
try {
9191
$result = $this->resourceService->getShowResourceData($request, $slug, $tab);
92+
9293
return Inertia::render('Resources/Show', $result);
9394
} catch (ResourceInvalidTabException $e) {
9495
Log::warning('Invalid resource tab requested', [

app/Services/ComputerScienceResourceService.php

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@
55
use App\Exceptions\Resources\ResourceAlreadyCreatedException;
66
use App\Exceptions\Resources\ResourceInvalidTabException;
77
use App\Models\ComputerScienceResource;
8-
use App\Services\UpvoteService;
9-
use App\Services\SortingManagers\ResourceSortingManager;
10-
use Throwable;
11-
use App\Models\ResourceReview;
128
use App\Models\ResourceEdits;
13-
use App\Services\CommentService;
14-
use Inertia\Inertia;
9+
use App\Models\ResourceReview;
10+
use App\Services\SortingManagers\ResourceSortingManager;
1511
use Illuminate\Http\Request;
1612
use Illuminate\Support\Facades\Auth;
1713
use Illuminate\Support\Facades\DB;
1814
use Illuminate\Support\Facades\Log;
1915
use Illuminate\Support\Facades\Storage;
16+
use Inertia\Inertia;
17+
use Throwable;
2018

2119
class ComputerScienceResourceService
2220
{
@@ -30,18 +28,14 @@ public function __construct(
3028
/**
3129
* Create a new ComputerScienceResource
3230
*
33-
* @param array $validatedData
34-
* @return ComputerScienceResource
3531
* @throws Throwable
3632
*/
3733
public function createResource(array $validatedData): ComputerScienceResource
3834
{
39-
if ($conflictingResource = $this->existingConflictingResource($validatedData))
40-
{
35+
if ($conflictingResource = $this->existingConflictingResource($validatedData)) {
4136
throw new ResourceAlreadyCreatedException($conflictingResource);
4237
}
4338

44-
4539
DB::beginTransaction();
4640
try {
4741
// Store the image onto storage
@@ -56,7 +50,7 @@ public function createResource(array $validatedData): ComputerScienceResource
5650

5751
$fileName = $imageFile->getClientOriginalName();
5852
throw new \RuntimeException(
59-
"Could not save the image file '{$fileName}' for user ID " . Auth::id() . '.'
53+
"Could not save the image file '{$fileName}' for user ID ".Auth::id().'.'
6054
);
6155
}
6256
}
@@ -125,6 +119,7 @@ public function createResource(array $validatedData): ComputerScienceResource
125119

126120
/**
127121
* Get all data for the resource show page, including tab logic.
122+
*
128123
* @throws Throwable
129124
*/
130125
public function getShowResourceData(Request $request, string $slug, string $tab = 'reviews')
@@ -135,7 +130,7 @@ public function getShowResourceData(Request $request, string $slug, string $tab
135130

136131
$validTabs = ['reviews', 'discussion', 'edits'];
137132
if (! in_array($tab, $validTabs)) {
138-
throw new ResourceInvalidTabException('Invalid tab: ' . $tab);
133+
throw new ResourceInvalidTabException('Invalid tab: '.$tab);
139134
}
140135

141136
$data = [
@@ -155,6 +150,7 @@ public function getShowResourceData(Request $request, string $slug, string $tab
155150
function () use ($computerScienceResource, $sortBy, $request) {
156151
$query = ResourceReview::whereBelongsTo($computerScienceResource);
157152
$query = $this->resourceSortingManager->applySort($query, $sortBy, ResourceReview::class);
153+
158154
return $query->with('user')->paginate(10)->appends($request->query());
159155
}
160156
);
@@ -163,18 +159,19 @@ function () use ($computerScienceResource, $sortBy, $request) {
163159
function () use ($computerScienceResource, $sortBy, $request) {
164160
$query = ResourceEdits::whereBelongsTo($computerScienceResource);
165161
$query = $this->resourceSortingManager->applySort($query, $sortBy, ResourceEdits::class);
162+
166163
return $query->with('user')->paginate(10)->appends($request->query());
167164
}
168165
);
169166
} elseif ($tab === 'discussion') {
170167
$data['discussion'] = Inertia::defer(
171-
fn() => $this->commentService->getPaginatedComments('resource', $computerScienceResource->id, 0, 150, $sortBy)
168+
fn () => $this->commentService->getPaginatedComments('resource', $computerScienceResource->id, 0, 150, $sortBy)
172169
);
173170
}
171+
174172
return $data;
175173
}
176174

177-
178175
/**
179176
* In case a user does a double submit, we have a check for that
180177
* Checks against StoreResourceRequest

0 commit comments

Comments
 (0)