PG-30

gammamatrix · Dec 1, 2023 · 06841bc · 06841bc
1 parent f2a63ab
commit 06841bc
Show file tree

Hide file tree

Showing 31 changed files with 139 additions and 120 deletions.
diff --git a/src/Http/Controllers/BacklogController.php b/src/Http/Controllers/BacklogController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|BacklogCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new BacklogCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new BacklogCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new BacklogResource($backlog))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new BacklogResource($backlog))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new BacklogResource($backlog))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/BoardController.php b/src/Http/Controllers/BoardController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|BoardCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new BoardCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new BoardCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new BoardResource($board))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new BoardResource($board))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new BoardResource($board))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/EpicController.php b/src/Http/Controllers/EpicController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|EpicCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new EpicCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new EpicCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new EpicResource($epic))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new EpicResource($epic))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new EpicResource($epic))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/FlowController.php b/src/Http/Controllers/FlowController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|FlowCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new FlowCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new FlowCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new FlowResource($flow))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new FlowResource($flow))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new FlowResource($flow))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/MilestoneController.php b/src/Http/Controllers/MilestoneController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|MilestoneCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new MilestoneCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new MilestoneCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new MilestoneResource($milestone))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new MilestoneResource($milestone))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new MilestoneResource($milestone))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/NoteController.php b/src/Http/Controllers/NoteController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|NoteCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new NoteCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new NoteCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new NoteResource($note))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new NoteResource($note))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new NoteResource($note))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/ProjectController.php b/src/Http/Controllers/ProjectController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|ProjectCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new ProjectCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new ProjectCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new ProjectResource($project))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new ProjectResource($project))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new ProjectResource($project))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);

diff --git a/src/Http/Controllers/ReleaseController.php b/src/Http/Controllers/ReleaseController.php
@@ -223,7 +223,7 @@ public function lock(
      */
     public function index(
         IndexRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|ReleaseCollection {
         $user = $request->user();
 
         $validated = $request->validated();
@@ -261,10 +261,7 @@ public function index(
         $paginator->appends($validated);
 
         if ($request->expectsJson()) {
-            return (new ReleaseCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user?->id,
-                'validated'       => $validated,
-            ]]);
+            return (new ReleaseCollection($paginator))->response($request);
         }
 
         $meta = [
@@ -378,7 +375,7 @@ public function store(
             return (new ReleaseResource($release))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -408,7 +405,7 @@ public function unlock(
             return (new ReleaseResource($release))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);
@@ -436,7 +433,7 @@ public function update(
             return (new ReleaseResource($release))->response($request);
         }
 
-        $returnUrl = $validated['return_url'] ?? '';
+        $returnUrl = $validated['_return_url'] ?? '';
 
         if ($returnUrl) {
             return redirect($returnUrl);