Batch transaction by collection

database/migrations/2023_06_27_014433_add_collection_chain_id_to_beam_batches_table.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('beam_batches', function (Blueprint $table) {
+            $table->string('collection_chain_id')->index()->nullable()->after('transaction_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('beam_batches', function (Blueprint $table) {
+            $table->dropColumn('collection_chain_id');
+        });
+    }
+};

src/BeamServiceProvider.php

@@ -37,6 +37,7 @@ public function configurePackage(Package $package): void
             ->hasMigration('create_beam_claims_table')
             ->hasMigration('create_beam_scans_table')
             ->hasMigration('update_beams_table')
+            ->hasMigration('add_collection_chain_id_to_beam_batches_table')
             ->hasRoute('enjin-platform-beam')
             ->hasTranslations();
     }

src/Commands/BatchProcess.php

@@ -4,6 +4,7 @@
 
 use Enjin\Platform\Beam\Enums\BeamType;
 use Enjin\Platform\Beam\Enums\ClaimStatus;
+use Enjin\Platform\Beam\Events\BeamBatchTransactionCreated;
 use Enjin\Platform\Beam\Events\BeamClaimInProgress;
 use Enjin\Platform\Beam\Models\BeamBatch;
 use Enjin\Platform\Beam\Models\BeamClaim;
@@ -217,6 +218,7 @@ protected function processBatch(BeamType $type): int
                         'idempotency_key' => Str::uuid()->toString(),
                     ], $this->account);
                     BeamBatch::where('id', $batchId)->update(['transaction_id' => $transaction->id]);
+                    BeamBatchTransactionCreated::safeBroadcast($param['collectionId'], $transaction->id);
                 }
 
                 $this->updateStatus($claims, $reassignedClaims);

src/Events/BeamBatchTransactionCreated.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Enjin\Platform\Beam\Events;
+
+use Enjin\Platform\Beam\Channels\PlatformBeamChannel;
+use Enjin\Platform\Channels\PlatformAppChannel;
+use Enjin\Platform\Events\PlatformBroadcastEvent;
+
+class BeamBatchTransactionCreated extends PlatformBroadcastEvent
+{
+    /**
+     * Creates a new event instance.
+     */
+    public function __construct($collectionId, $transactionId)
+    {
+        parent::__construct();
+
+        $this->broadcastData = [
+            'collectionId' => $collectionId,
+            'transactionId' => $transactionId,
+        ];
+
+        $this->broadcastChannels = [
+            new PlatformAppChannel(),
+            new PlatformBeamChannel(),
+        ];
+    }
+}

src/Jobs/ClaimBeam.php

@@ -94,7 +94,10 @@ protected function buildRequiredClaimAttributes(BatchService $batchService, Mode
     {
         return [
             ...Arr::only($this->data, ['wallet_public_key', 'claimed_at', 'state', 'ip_address']),
-            'beam_batch_id' => $batchService->getNextBatchId(BeamType::getEnumCase($claim->type)),
+            'beam_batch_id' => $batchService->getNextBatchId(
+                BeamType::getEnumCase($claim->type),
+                $claim->beam->collection_chain_id
+            ),
         ];
     }
 }

src/Services/BatchService.php

@@ -38,9 +38,13 @@ public function __construct()
     /**
      * Get next batch ID.
      */
-    public function getNextBatchId(BeamType $type): int
+    public function getNextBatchId(BeamType $type, string $collectionid): int
     {
-        $batch = BeamBatch::firstOrNew(['completed_at' => null, 'beam_type' => $type->name]);
+        $batch = BeamBatch::firstOrNew([
+            'completed_at' => null,
+            'beam_type' => $type->name,
+            'collection_chain_id' => $collectionid,
+        ]);
         if (!$batch->exists) {
             $batch->save();
         }