fix: Issue with double EtlExecution entity being created

oliverde8 · Oct 21, 2024 · f629f36 · f629f36
1 parent c3c7411
commit f629f36
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/Controller/EtlController.php b/Controller/EtlController.php
@@ -9,7 +9,7 @@
 use Oliverde8\PhpEtlBundle\Entity\EtlExecution as BaseEtlExecution;
 use Oliverde8\PhpEtlBundle\Message\EtlExecutionMessage;
 use Oliverde8\PhpEtlBundle\Services\ChainProcessorsManager;
-use Oliverde8\PhpEtlSyliusAdminBundle\Entity\Etl\EtlExecution;
+use Oliverde8\PhpEtlBundle\Entity\EtlExecution;
 use Oliverde8\PhpEtlSyliusAdminBundle\Exception\EtlExecutionException;
 use Oliverde8\PhpEtlSyliusAdminBundle\Form\Type\Etl\EtlExecutionType;
 use Symfony\Component\HttpFoundation\HeaderUtils;

diff --git a/Entity/Etl/EtlExecution.php b/Entity/Etl/EtlExecution.php
@@ -5,24 +5,14 @@
 use \Oliverde8\PhpEtlBundle\Entity\EtlExecution as BaseEtlExecution;
 use Oliverde8\PhpEtlSyliusAdminBundle\Repository\Etl\EtlExecutionRepository;
 use Sylius\Component\Resource\Model\ResourceInterface;
-use Doctrine\ORM\Mapping as ORM;
 
-#[ORM\Entity(repositoryClass:EtlExecutionRepository::class)]
+/**
+ * This class should nevery be used, it's only necessery to create a sylius resource.
+ */
 class EtlExecution extends BaseEtlExecution implements ResourceInterface
 {
     public function __construct()
     {
         parent::__construct('', '', [], []);
     }
-
-    public function setName(?string $name): BaseEtlExecution
-    {
-        return BaseEtlExecution::setName($name ?? "");
-    }
-
-
-    public function setDefinition(?string $definition): BaseEtlExecution
-    {
-        return BaseEtlExecution::setDefinition($definition ?? "");
-    }
 }
diff --git a/Form/Type/Etl/EtlExecutionType.php b/Form/Type/Etl/EtlExecutionType.php
@@ -3,7 +3,7 @@
 namespace Oliverde8\PhpEtlSyliusAdminBundle\Form\Type\Etl;
 
 use Oliverde8\PhpEtlBundle\Services\ChainProcessorsManager;
-use Oliverde8\PhpEtlSyliusAdminBundle\Entity\Etl\EtlExecution;
+use Oliverde8\PhpEtlBundle\Entity\EtlExecution;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;

diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
@@ -3,6 +3,7 @@ services:
     _defaults:
         autowire: true
         autoconfigure: true
+        public: true
 
     Oliverde8\PhpEtlSyliusAdminBundle\:
         resource: '../../'

diff --git a/Resources/config/sylius_grid.yaml b/Resources/config/sylius_grid.yaml
@@ -10,9 +10,9 @@ sylius_grid:
             driver:
                 name: doctrine/orm
                 options:
-                    class: Oliverde8\PhpEtlSyliusAdminBundle\Entity\Etl\EtlExecution
+                    class: Oliverde8\PhpEtlBundle\Entity\EtlExecution
                     repository:
-                        method: createAdminGridQueryBuilder
+                        method: [ expr:service('Oliverde8\\PhpEtlSyliusAdminBundle\\Repository\\Etl\\EtlExecutionRepository'), createAdminGridQueryBuilder ]
             fields:
                 id:
                     type: string

diff --git a/Resources/config/sylius_resource.yaml b/Resources/config/sylius_resource.yaml
@@ -5,3 +5,4 @@ sylius_resource:
             classes:
                 model: Oliverde8\PhpEtlSyliusAdminBundle\Entity\Etl\EtlExecution
                 form: Oliverde8\PhpEtlSyliusAdminBundle\Form\Type\Etl\EtlExecutionType
+                repository: Oliverde8\PhpEtlSyliusAdminBundle\Repository\Etl\EtlExecutionRepository
diff --git a/Twig/Components/NewEtlComponent.php b/Twig/Components/NewEtlComponent.php
@@ -4,7 +4,7 @@
 namespace Oliverde8\PhpEtlSyliusAdminBundle\Twig\Components;
 
 use Oliverde8\PhpEtlBundle\Services\ChainProcessorsManager;
-use Oliverde8\PhpEtlSyliusAdminBundle\Entity\Etl\EtlExecution;
+use Oliverde8\PhpEtlBundle\Entity\EtlExecution;
 use Oliverde8\PhpEtlSyliusAdminBundle\Form\Type\Etl\EtlExecutionType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;