fix(queues): Change event to ensure objects exist

Multiple listeners on `ResourceCreated` can cause issues where one
listener is dependent on objects created in another. This moves one of
the listeners to a later event to ensure needed objects exist.

Author: zooley

app/Listeners/Resources/Queues/Queues.php

@@ -5,6 +5,7 @@
 use App\Modules\Resources\Events\AssetCreated;
 use App\Modules\Resources\Events\SubresourceCreated;
 use App\Modules\Resources\Events\SubresourceDeleted;
+use App\Modules\Resources\Events\ChildCreated;
 use App\Modules\Queues\Models\Queue;
 use App\Modules\Queues\Models\Walltime;
 use App\Modules\Queues\Models\Scheduler;
@@ -22,36 +23,38 @@ class Queues
 	 */
 	public function subscribe(Dispatcher $events): void
 	{
-		$events->listen(AssetCreated::class, self::class . '@handleAssetCreated');
+		$events->listen(ChildCreated::class, self::class . '@handleChildCreated');
 		$events->listen(SubresourceCreated::class, self::class . '@handleSubresourceCreated');
 		$events->listen(SubresourceDeleted::class, self::class . '@handleSubresourceDeleted');
 	}
 
 	/**
 	 * Create a default scheduler for a new compute asset
 	 *
-	 * @param   AssetCreated  $event
+	 * @param   ChildCreated  $event
 	 * @return  void
 	 */
-	public function handleAssetCreated(AssetCreated $event): void
+	public function handleChildCreated(ChildCreated $event): void
 	{
-		if ($event->asset->resourcetype != 1)
-		{
-			return;
-		}
+		$subresource = $event->child->subresource;
 
-		$child = $event->asset->children->first();
-
-		$scheduler = new Scheduler;
-		$scheduler->hostname = $event->asset->rolename . '-adm.' . str_replace('www', '', request()->getHost());
-		if ($child)
+		if (substr($subresource->name, -strlen('-Nonspecific')) == '-Nonspecific')
 		{
-			$scheduler->queuesubresourceid = $child->subresourceid;
+			$scheduler = Scheduler::query()
+				->where('queuesubresourceid', '=', $subresource->id)
+				->first();
+
+			if (!$scheduler)
+			{
+				$scheduler = new Scheduler;
+				$scheduler->hostname = $subresource->resource->rolename . '-adm.' . str_replace('www.', '', request()->getHost());
+				$scheduler->queuesubresourceid = $subresource->id;
+				$scheduler->batchsystem = $subresource->resource->batchsystem;
+				$scheduler->schedulerpolicyid = 1;
+				$scheduler->defaultmaxwalltime = 1209600;
+				$scheduler->save();
+			}
 		}
-		$scheduler->batchsystem = $event->asset->batchsystem;
-		$scheduler->schedulerpolicyid = 1;
-		$scheduler->defaultmaxwalltime = 1209600;
-		$scheduler->save();
 	}
 
 	/**
@@ -70,7 +73,6 @@ public function handleSubresourceCreated(SubresourceCreated $event): void
 		}
 
 		$queue = new Queue;
-
 		$queue->name          = config()->get('module.queues.prefix', 'system-') . $subresource->cluster;
 		$queue->cluster       = $subresource->cluster;
 		$queue->groupid       = '-1';

app/Modules/Resources/Events/ChildCreated.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Modules\Resources\Events;
+
+use App\Modules\Resources\Models\Child;
+
+class ChildCreated
+{
+	/**
+	 * @var Child
+	 */
+	public $child;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Child $child
+	 * @return void
+	 */
+	public function __construct(Child $child)
+	{
+		$this->child = $child;
+	}
+}

app/Modules/Resources/Models/Child.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use App\Modules\Resources\Events\ChildCreated;
 
 /**
  * Model for a subresource mapping
@@ -28,6 +29,15 @@ class Child extends Model
 	 */
 	public $timestamps = false;
 
+	/**
+	 * The event map for the model.
+	 *
+	 * @var array<string,string>
+	 */
+	protected $dispatchesEvents = [
+		'created' => ChildCreated::class,
+	];
+
 	/**
 	 * Defines a relationship to a resource
 	 *