Add ExportStartedEvent and ExportCompletedEvent, add ability to set filename of export

Author: chrisbjr

src/Export/Jobs/CollateExportsAndUploadToDisk.php

@@ -4,6 +4,7 @@
 
 use Coreproc\NovaDataSync\Enum\Status;
 use Coreproc\NovaDataSync\Export\Models\Export;
+use Coreproc\NovaDataSync\Import\Events\ExportCompletedEvent;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -46,7 +47,7 @@ public function handle(): void
             'files' => $files,
         ]);
 
-        $collatedFileName = $this->exportName . '-' . now()->format('YmdHis') . '.csv';
+        $collatedFileName = $this->exportName . '.csv';
         $collatedFilePath = $this->storagePath($collatedFileName);
         $collatedFileWriter = SimpleExcelWriter::create($collatedFilePath);
 
@@ -82,6 +83,8 @@ public function handle(): void
             'status' => Status::COMPLETED,
             'completed_at' => now(),
         ]);
+
+        event(new ExportCompletedEvent($this->export));
     }
 
     protected function storagePath($path = ''): string

src/Export/Jobs/ExportProcessor.php

@@ -4,6 +4,7 @@
 
 use Coreproc\NovaDataSync\Enum\Status;
 use Coreproc\NovaDataSync\Export\Models\Export;
+use Coreproc\NovaDataSync\Import\Events\ExportStartedEvent;
 use Illuminate\Bus\Batch;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -87,6 +88,8 @@ public function handle(): void
                 $export->update([
                     'status' => Status::IN_PROGRESS->value,
                 ]);
+
+                event(new ExportStartedEvent($export));
             })
             ->then(function (Batch $batch) use ($export, $batchUuid, $exportDisk, $exportName, $exportDirectory) {
                 // Collate and upload to disk job
@@ -110,11 +113,14 @@ public static function chunkSize(): int
         return config('nova-data-sync.exports.chunk_size', 1000);
     }
 
+    /**
+     * Override this method to set the name of the export. Make sure it is unique to avoid conflicts with other files
+     */
     protected function name(): string
     {
         if (empty($this->name)) {
             // return the base name of the class
-            return class_basename($this);
+            return class_basename($this) . '-' . now()->format('YmdHis');
         }
 
         return $this->name;

src/Import/Events/ExportCompletedEvent.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Coreproc\NovaDataSync\Import\Events;
+
+use Coreproc\NovaDataSync\Export\Models\Export;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ExportCompletedEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Export $export)
+    {
+        //
+    }
+}

src/Import/Events/ExportStartedEvent.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Coreproc\NovaDataSync\Import\Events;
+
+use Coreproc\NovaDataSync\Export\Models\Export;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ExportStartedEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Export $export)
+    {
+        //
+    }
+}