move out repetative ingressenum and move in sourceenum

alnutile · Jun 17, 2023 · e9fa4ba · e9fa4ba
1 parent 9f41a3b
commit e9fa4ba
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 28 deletions.
diff --git a/app/Http/Controllers/Sources/WebHookSourceController.php b/app/Http/Controllers/Sources/WebHookSourceController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Sources;
 
 use App\Events\SourceRunCompleteEvent;
-use App\Jobs\ProcessSourceJob;
 use App\Models\Project;
 use App\Models\Source;
 use App\Source\SourceEnum;

diff --git a/app/Ingress/IngressTypeEnum.php b/app/Ingress/IngressTypeEnum.php
diff --git a/app/Models/Document.php b/app/Models/Document.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Ingress\IngressTypeEnum;
 use App\Ingress\StatusEnum;
 use App\Source\SourceEnum;
 use Illuminate\Database\Eloquent\Collection;
@@ -21,6 +20,7 @@
  * @property Source $source
  * @property Project $project
  * @property Collection $document_chunks
+ * @property SourceEnum $type
  *
  * @method Source source()
  * @method Project project()
@@ -34,7 +34,7 @@ class Document extends Model
 
     protected $casts = [
         'status' => StatusEnum::class,
-        'type' => IngressTypeEnum::class,
+        'type' => SourceEnum::class,
         'meta_data' => 'array',
         'embedding' => Vector::class,
     ];

diff --git a/app/Transformer/Types/JsonTransformer.php b/app/Transformer/Types/JsonTransformer.php
@@ -7,22 +7,21 @@
 use App\Models\Transformer;
 use App\Transformer\BaseTransformer;
 use Ramsey\Uuid\Uuid;
-use Soundasleep\Html2Text as Helper;
 
 class JsonTransformer extends BaseTransformer
 {
     public function handle(Transformer $transformer): Document
     {
 
-        $config = config('larachain.sources.' . $this->document->source->type->value . '.transformers', null);
+        $config = config('larachain.sources.'.$this->document->source->type->value.'.transformers', null);
 
-        if($config && in_array('App\\Transformer\\Types\\JsonTransformer', $config)) {
+        if ($config && in_array('App\\Transformer\\Types\\JsonTransformer', $config)) {
             $fileContents = $this->document->content;
             $guid = md5($fileContents);
 
             if (! DocumentChunk::query()
                 ->where('document_id', $this->document->id)
-                ->where("guid", $guid)
+                ->where('guid', $guid)
                 ->exists()) {
                 DocumentChunk::create([
                     'guid' => Uuid::uuid4()->toString(),

diff --git a/config/larachain.php b/config/larachain.php
@@ -22,7 +22,7 @@
             'description' => 'You can take data from a webhook or trigger a listener',
             'class' => 'App\\Source\\Types\\WebHook',
             'transformers' => [
-                'App\\Transformer\\Types\\JsonTransformer'
+                'App\\Transformer\\Types\\JsonTransformer',
             ],
             'requires' => [
             ],

diff --git a/database/factories/DocumentFactory.php b/database/factories/DocumentFactory.php
@@ -4,6 +4,7 @@
 
 use App\Ingress\StatusEnum;
 use App\Models\Source;
+use App\Source\SourceEnum;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\File;
 
@@ -24,6 +25,7 @@ public function definition(): array
         return [
             'token_count' => fake()->randomDigitNotZero(),
             'status' => StatusEnum::Pending,
+            'type' => SourceEnum::WebHook,
             'guid' => fake()->uuid(),
             'content' => fake()->sentence(10),
             'source_id' => Source::factory(),

diff --git a/tests/Feature/DataToDocumentDtoDataTest.php b/tests/Feature/DataToDocumentDtoDataTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Feature;
 
 use App\Data\DataToDocumentDtoData;
-use App\Ingress\IngressTypeEnum;
+use App\Source\SourceEnum;
 use Illuminate\Support\Str;
 use Tests\TestCase;
 
@@ -13,7 +13,7 @@ public function test_dto()
     {
         $dto = new DataToDocumentDtoData(
             'foobar',
-            IngressTypeEnum::WebScrape,
+            SourceEnum::ScrapeWebPage,
             'foobaz',
             'project_id_'.Str::random(),
             [

diff --git a/tests/Feature/Http/Controllers/WebHooksSourceControllerTest.php b/tests/Feature/Http/Controllers/WebHooksSourceControllerTest.php
@@ -77,7 +77,7 @@ public function testRunWebHook()
 
         $response->assertRedirect(route('projects.show', ['project' => $project->id]));
 
-        Queue::assertPushed(ProcessSourceJob::class);
+        Queue::assertNotPushed(ProcessSourceJob::class);
     }
 
     public function testUpdateWebHook()

diff --git a/tests/Feature/JsonTransformerTest.php b/tests/Feature/JsonTransformerTest.php
@@ -5,35 +5,33 @@
 use App\Models\Document;
 use App\Models\Source;
 use App\Models\Transformer;
-use App\Transformer\TransformerEnum;
 use App\Transformer\Types\JsonTransformer;
-use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 
 class JsonTransformerTest extends TestCase
 {
     use SharedSetupForPdfFile;
 
-    public function test_runs_base_on_source() {
+    public function test_runs_base_on_source()
+    {
         /** @var Source $source */
         $source = Source::factory()
             ->webHook()
             ->create();
 
         $document = Document::factory()->create([
-            'source_id' => $source->id
+            'source_id' => $source->id,
         ]);
 
         /** @var Transformer $transformer */
         $transformerModel = Transformer::factory()->create([
-            'project_id' => $source->project_id
+            'project_id' => $source->project_id,
         ]);
 
-        $this->assertDatabaseCount("document_chunks", 0);
+        $this->assertDatabaseCount('document_chunks', 0);
 
         $transformer = new JsonTransformer($document);
         $transformer->handle($transformerModel);
-        $this->assertDatabaseCount("document_chunks", 1);
+        $this->assertDatabaseCount('document_chunks', 1);
     }
-
 }