Release v11.6 - Bugfixes and major backend improvement preparations

app/Console/Commands/Database/SeedOne.php

@@ -2,9 +2,6 @@
 
 namespace App\Console\Commands\Database;
 
-use App\Console\Commands\Traits\ExecutesShellCommands;
-use App\Repositories\Database\ReleaseRepository;
-use App\Repositories\Interfaces\ReleaseRepositoryInterface;
 use App\Service\Cache\CacheServiceInterface;
 use Database\Seeders\DatabaseSeeder;
 use Illuminate\Console\Command;
@@ -55,13 +52,15 @@ public function handle(
     ): int {
         $className = $this->argument('className');
 
+        $databaseSeeder->setCommand($this);
+
         $this->resolver->setDefaultConnection($this->getDatabase());
 
         try {
             $classNames = explode(',', $className);
             $this->info(sprintf('Seeding database with only %s...', implode(', ', $classNames)));
 
-            $fullClassNames = collect()->map(function ($className) {
+            $fullClassNames = collect($classNames)->map(function ($className) {
                 return 'Database\\Seeders\\' . $className;
             })->toArray();
 

app/Console/Commands/Scheduler/SchedulerCommand.php

@@ -14,6 +14,8 @@ public function trackTime(callable $callable): int
     {
         Stopwatch::start(__METHOD__);
 
+        // Prevent long tasks from inserting the point very late
+        $startTime = time();
         try {
             $callable();
         } catch (\Exception $ex) {
@@ -26,7 +28,7 @@ public function trackTime(callable $callable): int
             'scheduler',
             $this->getTags(),
             [$this->getName() => Stopwatch::stop(__METHOD__)],
-            time()
+            $startTime
         );
 
         return 0;

app/Events/ContextEvent.php

@@ -42,6 +42,19 @@ public function broadcastOn(): array
         } else if ($this->context instanceof Dungeon) {
             $result[] = new PresenceChannel(sprintf('%s-mapping-version-edit.%s', config('app.type'), $this->context->getRouteKey()));
         }
+//        if ($this->context instanceof DungeonRoute) {
+//            $presenceChannel = new PresenceChannel('');
+//            $presenceChannel->name = sprintf('%s-route-edit.%s', config('app.type'), $this->context->getRouteKey());
+//            $result[] = new PresenceChannel($presenceChannel);
+//        } else if ($this->context instanceof LiveSession) {
+//            $presenceChannel = new PresenceChannel('');
+//            $presenceChannel->name = sprintf('%s-live-session.%s', config('app.type'), $this->context->getRouteKey());
+//            $result[] = new PresenceChannel($presenceChannel);
+//        } else if ($this->context instanceof Dungeon) {
+//            $presenceChannel = new PresenceChannel('');
+//            $presenceChannel->name = sprintf('%s-mapping-version-edit.%s', config('app.type'), $this->context->getRouteKey());
+//            $result[] = new PresenceChannel($presenceChannel);
+//        }
 
         return $result;
     }

app/Events/Model/ContextModelEvent.php

@@ -3,12 +3,13 @@
 namespace App\Events\Model;
 
 use App\Events\ContextEvent;
+use App\Models\Interfaces\EventModelInterface;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 abstract class ContextModelEvent extends ContextEvent
 {
-    public function __construct(Model $context, User $user, protected Model $model)
+    public function __construct(Model $context, User $user, protected EventModelInterface $model)
     {
         parent::__construct($context, $user);
     }
@@ -18,6 +19,7 @@ public function broadcastWith(): array
         return array_merge(parent::broadcastWith(), [
             'model'       => $this->model,
             'model_class' => $this->model::class,
+            'model_data'  => $this->model->getEventData(),
         ]);
     }
 }

app/Http/Controllers/Ajax/AjaxBrushlineController.php

@@ -5,6 +5,7 @@
 use App\Events\Model\ModelChangedEvent;
 use App\Events\Model\ModelDeletedEvent;
 use App\Http\Controllers\Controller;
+use App\Http\Controllers\Traits\ChangesDungeonRoute;
 use App\Http\Controllers\Traits\SavesPolylines;
 use App\Http\Controllers\Traits\ValidatesFloorId;
 use App\Http\Requests\Brushline\APIBrushlineFormRequest;
@@ -52,6 +53,8 @@ public function store(
         }
 
         DB::transaction(function () use ($coordinatesService, $brushline, $dungeonRoute, $validated, &$result) {
+            $beforeModel = $brushline === null ? null : clone $brushline;
+
             if ($brushline === null) {
                 $brushline = Brushline::create([
                     'dungeon_route_id' => $dungeonRoute->id,
@@ -69,25 +72,16 @@ public function store(
             try {
                 if ($success) {
                     // Create a new polyline and save it
-                    $changedFloor = null;
-                    $polyline     = $this->savePolyline(
+                    $this->savePolylineToModel(
                         $coordinatesService,
+                        $dungeonRoute,
                         $dungeonRoute->mappingVersion,
                         Polyline::findOrNew($brushline->polyline_id),
+                        $beforeModel,
                         $brushline,
-                        $validated['polyline'],
-                        $changedFloor
+                        $validated['polyline']
                     );
 
-                    // Couple the path to the polyline
-                    $brushline->update([
-                        'polyline_id' => $polyline->id,
-                        'floor_id'    => $changedFloor?->id ?? $brushline->floor_id,
-                    ]);
-
-                    // Load the polyline, so it can be echoed back to the user
-                    $brushline->load(['polyline']);
-
                     // Something's updated; broadcast it
                     if (Auth::check()) {
                         broadcast(new ModelChangedEvent($dungeonRoute, Auth::user(), $brushline));
@@ -126,6 +120,8 @@ public function delete(Request $request, DungeonRoute $dungeonRoute, Brushline $
                     broadcast(new ModelDeletedEvent($dungeonRoute, Auth::getUser(), $brushline));
                 }
 
+                $this->dungeonRouteChanged($dungeonRoute, $brushline, null);
+
                 // Touch the route so that the thumbnail gets updated
                 $dungeonRoute->touch();
 

app/Http/Controllers/Ajax/AjaxDungeonRouteController.php

@@ -5,6 +5,7 @@
 namespace App\Http\Controllers\Ajax;
 
 use App\Http\Controllers\Controller;
+use App\Http\Controllers\Traits\ChangesDungeonRoute;
 use App\Http\Controllers\Traits\ListsBrushlines;
 use App\Http\Controllers\Traits\ListsDungeonFloorSwitchMarkers;
 use App\Http\Controllers\Traits\ListsEnemies;
@@ -68,6 +69,7 @@ class AjaxDungeonRouteController extends Controller
     use ListsEnemyPatrols;
     use ListsMapIcons;
     use ListsPaths;
+    use ChangesDungeonRoute;
 
     /**
      * @return mixed
@@ -238,11 +240,9 @@ public function htmlsearch(AjaxDungeonRouteSearchFormRequest $request, Expansion
                                      'ratings', 'routeattributes', 'dungeon', 'dungeon.activeFloors', 'mappingVersion'])
             ->join('dungeons', 'dungeon_routes.dungeon_id', 'dungeons.id')
             ->join('mapping_versions', 'mapping_versions.dungeon_id', 'dungeons.id')
-            ->when($expansion !== null, static fn(Builder $builder) =>
-                $builder->where('dungeons.expansion_id', $expansion->id)
+            ->when($expansion !== null, static fn(Builder $builder) => $builder->where('dungeons.expansion_id', $expansion->id)
             )
-            ->when($season !== null, static fn(Builder $builder) =>
-                $builder->where('dungeon_routes.season_id', $season->id)
+            ->when($season !== null, static fn(Builder $builder) => $builder->where('dungeon_routes.season_id', $season->id)
             )
             // Only non-try routes, combine both where() and whereNull(), there are inconsistencies where one or the
             // other may work, this covers all bases for both dev and live
@@ -455,25 +455,34 @@ public function store(
     ): DungeonRoute {
         $this->authorize('edit', $dungeonRoute);
 
+        $beforeDungeonRoute = null;
+
         if ($dungeonRoute === null) {
             $dungeonRoute = new DungeonRoute();
+        } else {
+            $beforeDungeonRoute = clone $dungeonRoute;
         }
 
         // Update or insert it
         if (!$dungeonRoute->saveFromRequest($request, $seasonService, $expansionService, $thumbnailService)) {
             abort(500, 'Unable to save dungeonroute');
         }
 
+        $this->dungeonRouteChanged($dungeonRoute, $beforeDungeonRoute, $dungeonRoute);
+
         return $dungeonRoute;
     }
 
     /**
      * @throws AuthorizationException
+     * @throws Exception
      */
-    public function storePullGradient(Request $request, SeasonService $seasonService, DungeonRoute $dungeonRoute): Response
+    public function storePullGradient(Request $request, DungeonRoute $dungeonRoute): Response
     {
         $this->authorize('edit', $dungeonRoute);
 
+        $beforeDungeonRoute = clone $dungeonRoute;
+
         $dungeonRoute->pull_gradient              = $request->get('pull_gradient', '');
         $dungeonRoute->pull_gradient_apply_always = $request->get('pull_gradient_apply_always', false);
 
@@ -482,6 +491,8 @@ public function storePullGradient(Request $request, SeasonService $seasonService
             abort(500, 'Unable to save dungeonroute');
         }
 
+        $this->dungeonRouteChanged($dungeonRoute, $beforeDungeonRoute, $dungeonRoute);
+
         return response()->noContent();
     }
 
@@ -496,6 +507,8 @@ public function delete(Request $request, DungeonRoute $dungeonRoute): Response
             abort(500, 'Unable to delete dungeonroute');
         }
 
+        $this->dungeonRouteChanged($dungeonRoute, $dungeonRoute, null);
+
         return response()->noContent();
     }
 
@@ -512,13 +525,17 @@ public function publishedState(PublishFormRequest $request, DungeonRoute $dungeo
             abort(422, 'This sharing state is not available for this route');
         }
 
+        $beforeDungeonRoute = clone $dungeonRoute;
+
         $dungeonRoute->published_state_id = PublishedState::ALL[$publishedState];
         if ($dungeonRoute->published_state_id === PublishedState::ALL[PublishedState::WORLD]) {
             $dungeonRoute->published_at = date('Y-m-d H:i:s', time());
         }
 
         $dungeonRoute->save();
 
+        $this->dungeonRouteChanged($dungeonRoute, $beforeDungeonRoute, $dungeonRoute);
+
         return response()->noContent();
     }
 

app/Http/Controllers/Ajax/AjaxEnemyPatrolController.php

@@ -35,34 +35,30 @@ public function store(
     ): EnemyPatrol {
         $validated = $request->validated();
 
+        $beforeModel = $enemyPatrol !== null ? clone $enemyPatrol : null;
+
         return $this->storeModel(
             $mappingVersion,
             $validated,
             EnemyPatrol::class,
             $enemyPatrol,
-            function (EnemyPatrol $enemyPatrol) use ($coordinatesService, $validated) {
-                $changedFloor = null;
+            function (EnemyPatrol $enemyPatrol) use ($coordinatesService, $validated, $beforeModel) {
+                // A bit of a hack but disable the facade status of the mapping version - when editing an enemy patrol
+                // we use the admin panel, which NEVER uses the facade view since we're editing.
+                $enemyPatrol->mappingVersion->facade_enabled = false;
 
                 // Create a new polyline and save it
-                $polyline = $this->savePolyline(
+                $this->savePolylineToModel(
                     $coordinatesService,
+                    null, // Disable saving changes - we don't need that
                     $enemyPatrol->mappingVersion,
                     Polyline::findOrNew($enemyPatrol->polyline_id),
+                    $beforeModel,
                     $enemyPatrol,
-                    $validated['polyline'],
-                    $changedFloor
+                    $validated['polyline']
                 );
 
-                // Couple the patrol to the polyline
-                $saveResult = $enemyPatrol->update([
-                    'polyline_id' => $polyline->id,
-                    'floor_id'    => $changedFloor?->id ?? $enemyPatrol->floor_id,
-                ]);
-
-                // Load the polyline, so it can be echoed back to the user
-                $enemyPatrol->load(['polyline']);
-
-                return $saveResult;
+                return true;
             }
         );
     }