Projekt BOM-Konfiguration um Assemblies bereinigen.

Assembly BOM-Konfiguration um Projektauswahl erweitern (APS-3, APS-4)

src/Entity/AssemblySystem/Assembly.php

@@ -22,7 +22,6 @@ declare(strict_types=1);
 
 namespace App\Entity\AssemblySystem;
 
-use App\Repository\AssemblyRepository;
 use Doctrine\Common\Collections\Criteria;
 use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
 use ApiPlatform\Metadata\ApiFilter;
@@ -57,7 +56,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  *
  * @extends AbstractStructuralDBElement<AssemblyAttachment, AssemblyParameter>
  */
-#[ORM\Entity(repositoryClass: AssemblyRepository::class)]
+#[ORM\Entity]
 #[ORM\Table(name: 'assemblies')]
 #[ApiResource(
     operations: [
@@ -108,6 +107,7 @@ class Assembly extends AbstractStructuralDBElement
     #[Groups(['extended', 'full', 'import'])]
     #[ORM\OneToMany(mappedBy: 'assembly', targetEntity: AssemblyBOMEntry::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
     #[UniqueObjectCollection(message: 'assembly.bom_entry.part_already_in_bom', fields: ['part'])]
+    #[UniqueObjectCollection(message: 'assembly.bom_entry.project_already_in_bom', fields: ['project'])]
     #[UniqueObjectCollection(message: 'assembly.bom_entry.name_already_in_bom', fields: ['name'])]
     protected Collection $bom_entries;
 

src/Entity/AssemblySystem/AssemblyBOMEntry.php

@@ -36,7 +36,7 @@ use ApiPlatform\OpenApi\Model\Operation;
 use ApiPlatform\Serializer\Filter\PropertyFilter;
 use App\ApiPlatform\Filter\LikeFilter;
 use App\Entity\Contracts\TimeStampableInterface;
-use App\Entity\AssemblySystem\Assembly;
+use App\Entity\ProjectSystem\Project;
 use App\Repository\DBElementRepository;
 use App\Validator\UniqueValidatableInterface;
 use Doctrine\DBAL\Types\Types;
@@ -133,6 +133,18 @@ class AssemblyBOMEntry extends AbstractDBElement implements UniqueValidatableInt
     #[Groups(['bom_entry:read', 'bom_entry:write', 'full'])]
     protected ?Part $part = null;
 
+    /**
+     * @var Project|null The associated project
+     */
+    #[Assert\Expression(
+        '(this.getPart() === null or this.getProject() === null) and (this.getName() === null or (this.getName() != null and this.getName() != ""))',
+        message: 'validator.project.bom_entry.only_part_or_assembly_allowed'
+    )]
+    #[ORM\ManyToOne(targetEntity: Project::class)]
+    #[ORM\JoinColumn(name: 'id_project', nullable: true)]
+    #[Groups(['bom_entry:read', 'bom_entry:write', ])]
+    protected ?Project $project = null;
+
     /**
      * @var BigDecimal|null The price of this non-part BOM entry
      */
@@ -225,6 +237,17 @@ class AssemblyBOMEntry extends AbstractDBElement implements UniqueValidatableInt
         return $this;
     }
 
+    public function getProject(): ?Project
+    {
+        return $this->project;
+    }
+
+    public function setProject(?Project $project): AssemblyBOMEntry
+    {
+        $this->project = $project;
+        return $this;
+    }
+
     /**
      * Returns the price of this BOM entry, if existing.
      * Prices are only valid on non-Part BOM entries.
@@ -297,6 +320,7 @@ class AssemblyBOMEntry extends AbstractDBElement implements UniqueValidatableInt
         return [
             'name' => $this->getName(),
             'part' => $this->getPart()?->getID(),
+            'project' => $this->getProject()?->getID(),
         ];
     }
 }

src/Entity/ProjectSystem/Project.php

@@ -108,7 +108,6 @@ class Project extends AbstractStructuralDBElement
     #[Groups(['extended', 'full', 'import'])]
     #[ORM\OneToMany(mappedBy: 'project', targetEntity: ProjectBOMEntry::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
     #[UniqueObjectCollection(message: 'project.bom_entry.part_already_in_bom', fields: ['part'])]
-    #[UniqueObjectCollection(message: 'project.bom_entry.assembly_already_in_bom', fields: ['assembly'])]
     #[UniqueObjectCollection(message: 'project.bom_entry.name_already_in_bom', fields: ['name'])]
     protected Collection $bom_entries;
 

src/Entity/ProjectSystem/ProjectBOMEntry.php

@@ -35,7 +35,6 @@ use ApiPlatform\Metadata\Post;
 use ApiPlatform\OpenApi\Model\Operation;
 use ApiPlatform\Serializer\Filter\PropertyFilter;
 use App\ApiPlatform\Filter\LikeFilter;
-use App\Entity\AssemblySystem\Assembly;
 use App\Entity\Contracts\TimeStampableInterface;
 use App\Validator\UniqueValidatableInterface;
 use Doctrine\DBAL\Types\Types;
@@ -104,10 +103,7 @@ class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInte
     /**
      * @var string|null An optional name describing this BOM entry (useful for non-part entries)
      */
-    #[Assert\Expression(
-        'this.getPart() !== null or this.getAssembly() !== null or (this.getName() !== null and this.getName() != "")',
-        message: 'validator.project.bom_entry.part_or_assembly_needed'
-    )]
+    #[Assert\Expression('this.getPart() !== null or this.getName() !== null', message: 'validator.project.bom_entry.name_or_part_needed')]
     #[ORM\Column(type: Types::STRING, nullable: true)]
     #[Groups(['bom_entry:read', 'bom_entry:write', 'import', 'simple', 'extended', 'full'])]
     protected ?string $name = null;
@@ -135,18 +131,6 @@ class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInte
     #[Groups(['bom_entry:read', 'bom_entry:write', 'full'])]
     protected ?Part $part = null;
 
-    /**
-     * @var Assembly|null The associated assembly
-     */
-    #[Assert\Expression(
-        '(this.getPart() === null or this.getAssembly() === null) and (this.getName() === null or (this.getName() != null and this.getName() != ""))',
-        message: 'validator.project.bom_entry.only_part_or_assembly_allowed'
-    )]
-    #[ORM\ManyToOne(targetEntity: Assembly::class, inversedBy: 'assembly_bom_entries')]
-    #[ORM\JoinColumn(name: 'id_assembly')]
-    #[Groups(['bom_entry:read', 'bom_entry:write', ])]
-    protected ?Assembly $assembly = null;
-
     /**
      * @var BigDecimal|null The price of this non-part BOM entry
      */
@@ -239,16 +223,6 @@ class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInte
         return $this;
     }
 
-    public function getAssembly(): ?Assembly
-    {
-        return $this->assembly;
-    }
-
-    public function setAssembly(?Assembly $assembly): void
-    {
-        $this->assembly = $assembly;
-    }
-
     /**
      * Returns the price of this BOM entry, if existing.
      * Prices are only valid on non-Part BOM entries.
@@ -286,15 +260,6 @@ class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInte
         return $this->part instanceof Part;
     }
 
-    /**
-     * Checks whether this BOM entry is a assembly associated BOM entry or not.
-     * @return bool True if this BOM entry is a assembly associated BOM entry, false otherwise.
-     */
-    public function isAssemblyBomEntry(): bool
-    {
-        return $this->assembly instanceof Assembly;
-    }
-
     #[Assert\Callback]
     public function validate(ExecutionContextInterface $context, $payload): void
     {
@@ -356,7 +321,6 @@ class ProjectBOMEntry extends AbstractDBElement implements UniqueValidatableInte
         return [
             'name' => $this->getName(),
             'part' => $this->getPart()?->getID(),
-            'assembly' => $this->getAssembly()?->getID(),
         ];
     }
 }