Update classes

Author: naimsolong

src/Dto/Instruction.php

@@ -2,7 +2,7 @@
 
 namespace NaimSolong\DataExtractor\Dto;
 
-use ExtractBuilder;
+use NaimSolong\DataExtractor\Builder\ExtractBuilder;
 
 readonly class Instruction
 {

src/Dto/Source.php

@@ -2,6 +2,9 @@
 
 namespace NaimSolong\DataExtractor\Dto;
 
+use Exception;
+use Illuminate\Database\Eloquent\Model;
+
 readonly class Source
 {
     public function __construct(
@@ -12,6 +15,10 @@ public function __construct(
 
     public static function fromArray(array $data): self
     {
+        if (!is_subclass_of($data['model'], Model::class)) {
+            throw new Exception('The provided model, parent must be an instance of Illuminate\Database\Eloquent\Model');
+        }
+
         return new self(
             model: $data['model'],
             connection: $data['connection'] ?? config('database.default'),

src/Extract.php

@@ -33,24 +33,22 @@ public function queryId(int $queryId): self
         return $this;
     }
 
-    public function query(string $format): string
+    public function query(): mixed
     {
-        $this->builder->createBuilder($format);
-
         $source = $this->instructions->source()->toArray();
 
         $query = app($source['model'])
             ->setConnection($source['connection'])
-            ->with($source['relationships'] ?? [])
-            ->where('id', $this->queryId);
+            ->with($source['relationships'] ?? []);
 
-        if (! $query->exists()) {
-            throw new ModelNotFoundException("No record found with ID {$this->queryId} in the {$source['model']} model.");
-        }
+        return $query->findOrFail($this->queryId);
+    }
 
-        $data = $query->first();
+    public function extract(string $format): string
+    {
+        $this->builder->createBuilder($format);
 
-        ray($data);
+        $data = $this->query();
 
         return $this->builder
             ->setModel($data)
@@ -59,11 +57,11 @@ public function query(string $format): string
 
     public function toCsv(): string
     {
-        return $this->query(ExtractBuilder::FORMAT_CSV);
+        return $this->extract(ExtractBuilder::FORMAT_CSV);
     }
 
     public function toSql(): string
     {
-        return $this->query(ExtractBuilder::FORMAT_SQL);
+        return $this->extract(ExtractBuilder::FORMAT_SQL);
     }
 }

src/InstructionsResolver.php

@@ -49,11 +49,15 @@ public function set(int|string $value): self
         }
 
         if (is_string($value)) {
-            $this->instruction = array_filter($this->instructions, function ($instruction) use ($value) {
+            $filteredInstructions = array_filter($this->instructions, function ($instruction) use ($value) {
                 return $instruction->name === $value;
-            })[0];
+            });
 
-            return $this;
+            if(count($filteredInstructions) > 0) {
+                $this->instruction = $filteredInstructions[0];
+
+                return $this;
+            }
         }
 
         throw new InvalidArgumentException("Invalid instruction value: {$value}");