Skip to content

Commit 4cb2a94

Browse files
author
Dorien Grönwald
committed
fix: cleanup code
1 parent 0af3f6e commit 4cb2a94

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

app/Http/Controllers/ProgressController.php

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55
use App\Models\EntryUser;
66
use Illuminate\Http\Request;
77
use Statamic\Eloquent\Entries\Entry;
8-
use Statamic\Entries\EntryCollection;
98
use Statamic\View\View;
109

1110
class ProgressController extends Controller
1211
{
1312
public function store(Request $request)
1413
{
15-
if (! $request->user()) {
16-
return response()->json(['status' => 'guest'], 200);
17-
}
18-
1914
$request->validate([
2015
'entry_id' => 'required|string',
2116
'collection' => 'required|string',
@@ -62,20 +57,21 @@ public function show(Request $request)
6257
]);
6358
}
6459

65-
private function enrichComponents(array $visitedRequirements, array $visitedLearningModules): EntryCollection
60+
private function enrichComponents(array $visitedRequirements, array $visitedLearningModules)
6661
{
62+
$visitedIds = array_merge($visitedRequirements, $visitedLearningModules);
63+
6764
return Entry::query()
6865
->whereCollection('components')
6966
->get()
70-
->map(function ($component) use ($visitedRequirements, $visitedLearningModules) {
67+
->map(function ($component) use ($visitedIds) {
7168
$requirements = $component->requirements ?? collect();
7269
$learningModules = $component->learning_modules ?? collect();
7370

74-
$visited = $requirements->merge($learningModules)
75-
->filter(fn ($item) => in_array($item->id, array_merge($visitedRequirements, $visitedLearningModules)));
71+
$allItems = $requirements->merge($learningModules);
7672

77-
$notVisited = $requirements->merge($learningModules)
78-
->filter(fn ($item) => ! in_array($item->id, array_merge($visitedRequirements, $visitedLearningModules)));
73+
$visited = $allItems->filter(fn ($item) => in_array($item->id, $visitedIds));
74+
$notVisited = $allItems->filter(fn ($item) => ! in_array($item->id, $visitedIds));
7975

8076
return [
8177
'title' => $component->title,

0 commit comments

Comments
 (0)