PG-25

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
         report: clover.xml
         coverage_badge_path: output/coverage.svg
         push_badge: false
-    - name: Git push to image-data branch
+    - name: Git push to testing/develop branch
       uses: peaceiris/actions-gh-pages@v3
       with:
         publish_dir: ./output

database/migrations-matrix-uuid/2020_01_02_100001_create_matrix_boards_table.php

@@ -26,6 +26,7 @@ public function up(): void
             $table->uuid('owned_by_id')->nullable()->index();
             $table->uuid('parent_id')->nullable()->index();
             $table->string('board_type')->nullable()->index();
+            $table->uuid('backlog_id')->nullable()->index();
             $table->uuid('epic_id')->nullable()->index();
             $table->uuid('flow_id')->nullable()->index();
             $table->uuid('milestone_id')->nullable()->index();

database/migrations-matrix-uuid/2020_01_02_100001_create_matrix_epics_table.php

@@ -26,6 +26,7 @@ public function up(): void
             $table->uuid('owned_by_id')->nullable()->index();
             $table->uuid('parent_id')->nullable()->index();
             $table->string('epic_type')->nullable()->index();
+            $table->uuid('backlog_id')->nullable()->index();
             $table->uuid('board_id')->nullable()->index();
             $table->uuid('flow_id')->nullable()->index();
             $table->uuid('milestone_id')->nullable()->index();

routes/backlogs.php

@@ -65,7 +65,7 @@
         ->can('lock', 'backlog')
     ;
 
-    Route::put('/unlock/{backlog}', [
+    Route::delete('/lock/{backlog}', [
         'as'   => 'playground.matrix.resource.backlogs.unlock',
         'uses' => 'BacklogController@unlock',
     ])->whereUuid('backlog')

routes/boards.php

@@ -65,7 +65,7 @@
         ->can('lock', 'board')
     ;
 
-    Route::put('/unlock/{board}', [
+    Route::delete('/lock/{board}', [
         'as'   => 'playground.matrix.resource.boards.unlock',
         'uses' => 'BoardController@unlock',
     ])->whereUuid('board')

routes/epics.php

@@ -65,7 +65,7 @@
         ->can('lock', 'epic')
     ;
 
-    Route::put('/unlock/{epic}', [
+    Route::delete('/lock/{epic}', [
         'as'   => 'playground.matrix.resource.epics.unlock',
         'uses' => 'EpicController@unlock',
     ])->whereUuid('epic')

routes/flows.php

@@ -65,7 +65,7 @@
         ->can('lock', 'flow')
     ;
 
-    Route::put('/unlock/{flow}', [
+    Route::delete('/lock/{flow}', [
         'as'   => 'playground.matrix.resource.flows.unlock',
         'uses' => 'FlowController@unlock',
     ])->whereUuid('flow')

routes/milestones.php

@@ -65,7 +65,7 @@
         ->can('lock', 'milestone')
     ;
 
-    Route::put('/unlock/{milestone}', [
+    Route::delete('/lock/{milestone}', [
         'as'   => 'playground.matrix.resource.milestones.unlock',
         'uses' => 'MilestoneController@unlock',
     ])->whereUuid('milestone')

routes/notes.php

@@ -65,7 +65,7 @@
         ->can('lock', 'note')
     ;
 
-    Route::put('/unlock/{note}', [
+    Route::delete('/lock/{note}', [
         'as'   => 'playground.matrix.resource.notes.unlock',
         'uses' => 'NoteController@unlock',
     ])->whereUuid('note')

routes/projects.php

@@ -65,7 +65,7 @@
         ->can('lock', 'project')
     ;
 
-    Route::put('/unlock/{project}', [
+    Route::delete('/lock/{project}', [
         'as'   => 'playground.matrix.resource.projects.unlock',
         'uses' => 'ProjectController@unlock',
     ])->whereUuid('project')

routes/releases.php

@@ -65,7 +65,7 @@
         ->can('lock', 'release')
     ;
 
-    Route::put('/unlock/{release}', [
+    Route::delete('/lock/{release}', [
         'as'   => 'playground.matrix.resource.releases.unlock',
         'uses' => 'ReleaseController@unlock',
     ])->whereUuid('release')

routes/roadmaps.php

@@ -65,7 +65,7 @@
         ->can('lock', 'roadmap')
     ;
 
-    Route::put('/unlock/{roadmap}', [
+    Route::delete('/lock/{roadmap}', [
         'as'   => 'playground.matrix.resource.roadmaps.unlock',
         'uses' => 'RoadmapController@unlock',
     ])->whereUuid('roadmap')

routes/sources.php

@@ -65,7 +65,7 @@
         ->can('lock', 'source')
     ;
 
-    Route::put('/unlock/{source}', [
+    Route::delete('/lock/{source}', [
         'as'   => 'playground.matrix.resource.sources.unlock',
         'uses' => 'SourceController@unlock',
     ])->whereUuid('source')

routes/sprints.php

@@ -65,7 +65,7 @@
         ->can('lock', 'sprint')
     ;
 
-    Route::put('/unlock/{sprint}', [
+    Route::delete('/lock/{sprint}', [
         'as'   => 'playground.matrix.resource.sprints.unlock',
         'uses' => 'SprintController@unlock',
     ])->whereUuid('sprint')

routes/tags.php

@@ -65,7 +65,7 @@
         ->can('lock', 'tag')
     ;
 
-    Route::put('/unlock/{tag}', [
+    Route::delete('/lock/{tag}', [
         'as'   => 'playground.matrix.resource.tags.unlock',
         'uses' => 'TagController@unlock',
     ])->whereUuid('tag')

routes/teams.php

@@ -65,7 +65,7 @@
         ->can('lock', 'team')
     ;
 
-    Route::put('/unlock/{team}', [
+    Route::delete('/lock/{team}', [
         'as'   => 'playground.matrix.resource.teams.unlock',
         'uses' => 'TeamController@unlock',
     ])->whereUuid('team')

routes/tickets.php

@@ -65,7 +65,7 @@
         ->can('lock', 'ticket')
     ;
 
-    Route::put('/unlock/{ticket}', [
+    Route::delete('/lock/{ticket}', [
         'as'   => 'playground.matrix.resource.tickets.unlock',
         'uses' => 'TicketController@unlock',
     ])->whereUuid('ticket')

routes/versions.php

@@ -65,7 +65,7 @@
         ->can('lock', 'version')
     ;
 
-    Route::put('/unlock/{version}', [
+    Route::delete('/lock/{version}', [
         'as'   => 'playground.matrix.resource.versions.unlock',
         'uses' => 'VersionController@unlock',
     ])->whereUuid('version')

src/Http/Controllers/BacklogController.php

@@ -17,8 +17,8 @@
 use GammaMatrix\Playground\Matrix\Resource\Http\Requests\Backlog\StoreRequest;
 use GammaMatrix\Playground\Matrix\Resource\Http\Requests\Backlog\UnlockRequest;
 use GammaMatrix\Playground\Matrix\Resource\Http\Requests\Backlog\UpdateRequest;
-use GammaMatrix\Playground\Matrix\Resource\Http\Resources\Backlog\Backlog as BacklogResource;
-use GammaMatrix\Playground\Matrix\Resource\Http\Resources\Backlog\BacklogCollection;
+use GammaMatrix\Playground\Matrix\Resource\Http\Resources\Backlog as BacklogResource;
+use GammaMatrix\Playground\Matrix\Resource\Http\Resources\BacklogCollection;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -62,7 +62,7 @@ public function create(
         $backlog = new Backlog($validated);
 
         $meta = [
-            'session_user_id' => $user->id,
+            'session_user_id' => $user?->id,
             'id'              => null,
             'timestamp'       => Carbon::now()->toJson(),
             'validated'       => $validated,
@@ -113,7 +113,7 @@ public function edit(
         $user = $request->user();
 
         $meta = [
-            'session_user_id' => $user->id,
+            'session_user_id' => $user?->id,
             'id'              => $backlog->id,
             'timestamp'       => Carbon::now()->toJson(),
             'validated'       => $validated,
@@ -186,7 +186,7 @@ public function destroy(
     public function lock(
         Backlog $backlog,
         LockRequest $request
-    ): JsonResponse|RedirectResponse {
+    ): JsonResponse|RedirectResponse|BacklogResource {
         $validated = $request->validated();
 
         $user = $request->user();
@@ -196,14 +196,15 @@ public function lock(
         $backlog->save();
 
         $meta = [
-            'session_user_id' => $user->id,
+            'session_user_id' => $user?->id,
             'id'              => $backlog->id,
             'timestamp'       => Carbon::now()->toJson(),
             'info'            => $this->packageInfo,
         ];
+        // dump($request);
 
         if ($request->expectsJson()) {
-            return new BacklogResource($backlog);
+            return (new BacklogResource($backlog))->response($request);
         }
 
         $returnUrl = $validated['_return_url'] ?? '';
@@ -261,13 +262,13 @@ public function index(
 
         if ($request->expectsJson()) {
             return (new BacklogCollection($paginator))->additional(['meta' => [
-                'session_user_id' => $user->id,
+                'session_user_id' => $user?->id,
                 'validated'       => $validated,
             ]]);
         }
 
         $meta = [
-            'session_user_id' => $user->id,
+            'session_user_id' => $user?->id,
             'columns'         => $request->getPaginationColumns(),
             'dates'           => $request->getPaginationDates(),
             'flags'           => $request->getPaginationFlags(),
@@ -298,15 +299,15 @@ public function index(
     public function restore(
         Backlog $backlog,
         RestoreRequest $request
-    ): JsonResponse|RedirectResponse {
+    ): JsonResponse|RedirectResponse|BacklogResource {
         $validated = $request->validated();
 
         $user = $request->user();
 
         $backlog->restore();
 
         if ($request->expectsJson()) {
-            return new BacklogResource($backlog);
+            return (new BacklogResource($backlog))->response($request);
         }
 
         $returnUrl = $validated['_return_url'] ?? '';
@@ -326,21 +327,21 @@ public function restore(
     public function show(
         Backlog $backlog,
         ShowRequest $request
-    ): JsonResponse|View {
+    ): JsonResponse|View|BacklogResource {
         $validated = $request->validated();
 
         $user = $request->user();
 
         $meta = [
-            'session_user_id' => $user->id,
+            'session_user_id' => $user?->id,
             'id'              => $backlog->id,
             'timestamp'       => Carbon::now()->toJson(),
             'validated'       => $validated,
             'info'            => $this->packageInfo,
         ];
 
         if ($request->expectsJson()) {
-            return new BacklogResource($backlog);
+            return (new BacklogResource($backlog))->response($request);
         }
 
         $meta['input'] = $request->input();
@@ -364,7 +365,7 @@ public function show(
       */
     public function store(
         StoreRequest $request
-    ): Response|JsonResponse|RedirectResponse {
+    ): Response|JsonResponse|RedirectResponse|BacklogResource {
         $validated = $request->validated();
 
         $user = $request->user();
@@ -374,7 +375,7 @@ public function store(
         $backlog->save();
 
         if ($request->expectsJson()) {
-            return new BacklogResource($backlog);
+            return (new BacklogResource($backlog))->response($request);
         }
 
         $returnUrl = $validated['return_url'] ?? '';
@@ -394,7 +395,7 @@ public function store(
     public function unlock(
         Backlog $backlog,
         UnlockRequest $request
-    ): JsonResponse|RedirectResponse {
+    ): JsonResponse|RedirectResponse|BacklogResource {
         $validated = $request->validated();
 
         $user = $request->user();
@@ -404,7 +405,7 @@ public function unlock(
         $backlog->save();
 
         if ($request->expectsJson()) {
-            return new BacklogResource($backlog);
+            return (new BacklogResource($backlog))->response($request);
         }
 
         $returnUrl = $validated['return_url'] ?? '';
@@ -424,15 +425,15 @@ public function unlock(
     public function update(
         Backlog $backlog,
         UpdateRequest $request
-    ): JsonResponse|RedirectResponse {
+    ): JsonResponse|RedirectResponse|BacklogResource {
         $validated = $request->validated();
 
         $user = $request->user();
 
         $backlog->update($validated);
 
         if ($request->expectsJson()) {
-            return new BacklogResource($backlog);
+            return (new BacklogResource($backlog))->response($request);
         }
 
         $returnUrl = $validated['return_url'] ?? '';