Merge pull request #7236 from ecamp/revert-7217-feature/materialitem-nullable

Revert "MaterialItem.MaterialList is nullable"

Author: BacLuc

api/migrations/schema/Version20250412165829.php

@@ -53,7 +53,7 @@
 #[ORM\InheritanceType('SINGLE_TABLE')]
 #[ORM\DiscriminatorColumn(name: 'strategy', type: 'string')]
 #[ORM\UniqueConstraint(name: 'contentnode_parentid_slot_position_unique', columns: ['parentid', 'slot', 'position'])]
-abstract class ContentNode extends BaseEntity implements BelongsToCampInterface, BelongsToContentNodeTreeInterface, CopyFromPrototypeInterface, HasParentInterface {
+abstract class ContentNode extends BaseEntity implements BelongsToContentNodeTreeInterface, CopyFromPrototypeInterface, HasParentInterface {
     use ClassInfoTrait;
 
     /**
@@ -193,17 +193,6 @@ public function setParent(?ContentNode $parent) {
         $this->root ??= $parent?->root;
     }
 
-    public function getCamp(): ?Camp {
-        if (null == $this->getRoot()) {
-            return null;
-        }
-        if ($this->getRoot()->campRootContentNodes->count() > 0) {
-            return $this->getRoot()->campRootContentNodes[0]->camp;
-        }
-
-        return null;
-    }
-
     /**
      * Holds the actual data of the content node.
      */

api/src/Entity/ContentNode.php

@@ -23,7 +23,6 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -45,7 +44,6 @@
             security: 'is_authenticated()'
         ),
         new Post(
-            denormalizationContext: ['groups' => ['write', 'create']],
             securityPostDenormalize: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object) or object.materialList === null'
         ),
     ],
@@ -60,12 +58,11 @@ class MaterialItem extends BaseEntity implements BelongsToCampInterface, CopyFro
      * The list to which this item belongs. Lists are used to keep track of who is
      * responsible to prepare and bring the item to the camp.
      */
-    #[Assert\NotNull]
-    #[AssertBelongsToSameCamp]
+    #[AssertBelongsToSameCamp(compareToPrevious: true, groups: ['update'])]
     #[ApiProperty(example: '/material_lists/1a2b3c4d')]
     #[Groups(['read', 'write'])]
     #[ORM\ManyToOne(targetEntity: MaterialList::class, inversedBy: 'materialItems')]
-    #[ORM\JoinColumn(nullable: true, onDelete: 'cascade')]
+    #[ORM\JoinColumn(nullable: false, onDelete: 'cascade')]
     public ?MaterialList $materialList = null;
 
     /**
@@ -134,13 +131,9 @@ public function __construct() {
         $this->periodMaterialItems = new ArrayCollection();
     }
 
-    #[ApiProperty]
-    #[SerializedName('camp')]
-    #[Groups(['read'])]
+    #[ApiProperty(readable: false)]
     public function getCamp(): ?Camp {
-        return $this->period?->getCamp()
-            ?? $this->materialNode?->getCamp()
-            ?? $this->materialList?->getCamp();
+        return $this->materialList?->getCamp();
     }
 
     /**
@@ -150,14 +143,9 @@ public function getCamp(): ?Camp {
     public function copyFromPrototype($prototype, $entityMap): void {
         $entityMap->add($prototype, $this);
 
-        if (null != $prototype->materialList) {
-            /** @var MaterialList $materialList */
-            $materialList = $entityMap->get($prototype->materialList);
-
-            if ($entityMap->belongsToTargetCamp($materialList)) {
-                $materialList->addMaterialItem($this);
-            }
-        }
+        /** @var MaterialList $materialList */
+        $materialList = $entityMap->get($prototype->materialList);
+        $materialList->addMaterialItem($this);
 
         $this->article = $prototype->article;
         $this->quantity = $prototype->quantity;

api/src/Entity/MaterialItem.php

@@ -24,8 +24,7 @@ public function __construct(ManagerRegistry $registry) {
     }
 
     public function filterByUser(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, User $user): void {
-        $periodMaterialItems = QueryBuilderHelper::findOrAddInnerRootJoinAlias($queryBuilder, $queryNameGenerator, 'periodMaterialItems');
-        $period = QueryBuilderHelper::findOrAddInnerJoinAlias($queryBuilder, $queryNameGenerator, $periodMaterialItems, 'period');
-        $this->filterByCampCollaboration($queryBuilder, $user, "{$period}.camp");
+        $materialList = QueryBuilderHelper::findOrAddInnerRootJoinAlias($queryBuilder, $queryNameGenerator, 'materialList');
+        $this->filterByCampCollaboration($queryBuilder, $user, "{$materialList}.camp");
     }
 }

api/src/Repository/MaterialItemRepository.php

@@ -34,7 +34,6 @@ public function onBefore($data, Operation $operation, array $uriVariables = [],
             throw new \UnexpectedValueException('Property rootContentNode of provided category is of wrong type. Object of type '.ColumnLayout::class.' expected.');
         }
 
-        $targetCamp = $data->category->camp;
         $data->camp = $data->category->camp;
         $rootContentNodePrototype = $data->category->rootContentNode;
 
@@ -51,7 +50,7 @@ public function onBefore($data, Operation $operation, array $uriVariables = [],
         $data->setRootContentNode($rootContentNode);
 
         // deep copy from category root node
-        $entityMap = new EntityMap($targetCamp);
+        $entityMap = new EntityMap();
         $rootContentNode->copyFromPrototype($rootContentNodePrototype, $entityMap);
 
         return $data;

api/src/State/ActivityCreateProcessor.php

@@ -37,7 +37,7 @@ public function onBefore($data, Operation $operation, array $uriVariables = [],
 
         // copy from prototype, if given
         if (isset($data->campPrototype)) {
-            $entityMap = new EntityMap($data);
+            $entityMap = new EntityMap();
             $data->copyFromPrototype($data->campPrototype, $entityMap);
         }
 

api/src/State/CampCreateProcessor.php

@@ -38,7 +38,7 @@ public function onBefore($data, Operation $operation, array $uriVariables = [],
 
         if (isset($data->copyCategorySource)) {
             // CopyActivity Source is set -> copy it's content (rootContentNode)
-            $entityMap = new EntityMap($data->camp);
+            $entityMap = new EntityMap();
             $rootContentNode->copyFromPrototype($data->copyCategorySource->getRootContentNode(), $entityMap);
         }
 

api/src/State/CategoryCreateProcessor.php

@@ -22,7 +22,7 @@ public function __construct(ProcessorInterface $decorated) {
     public function onBefore($data, Operation $operation, array $uriVariables = [], array $context = []): Checklist {
         if (isset($data->copyChecklistSource)) {
             // CopyChecklist Source is set -> copy it's content
-            $entityMap = new EntityMap($data->camp);
+            $entityMap = new EntityMap();
             $data->copyFromPrototype($data->copyChecklistSource, $entityMap);
         }
 

api/src/State/ChecklistCreateProcessor.php

@@ -3,16 +3,12 @@
 namespace App\Util;
 
 use App\Entity\BaseEntity;
-use App\Entity\BelongsToCampInterface;
-use App\Entity\Camp;
 
 class EntityMap {
     use ClassInfoTrait;
 
     private $map = [];
 
-    public function __construct(private Camp $targetCamp) {}
-
     public function add(BaseEntity $prototype, BaseEntity $entity) {
         $key = $this->getObjectClass($prototype).'#'.$prototype->getId();
         $this->map[$key] = $entity;
@@ -24,8 +20,4 @@ public function get(BaseEntity $prototype): BaseEntity {
 
         return $keyExists ? $this->map[$key] : $prototype;
     }
-
-    public function belongsToTargetCamp(BelongsToCampInterface $entity) {
-        return $entity->getCamp() == $this->targetCamp;
-    }
 }

api/src/Util/EntityMap.php

@@ -519,7 +519,7 @@ public function testCreateActivityFromCopySourceWithinSameCamp() {
     }
 
     public function testCreateActivityFromCopySourceAcrossCamp() {
-        $response = static::createClientWithCredentials()->request(
+        static::createClientWithCredentials()->request(
             'POST',
             '/activities',
             ['json' => $this->getExampleWritePayload(
@@ -540,21 +540,6 @@ public function testCreateActivityFromCopySourceAcrossCamp() {
 
         // Activity created
         $this->assertResponseStatusCodeSame(201);
-
-        // Embedded MaterialNode -> MaterialItems
-        // Test MaterialList is nulled
-        $responseArray = $response->toArray();
-        $contentNodes = $responseArray['_embedded']['contentNodes'];
-
-        $materialNodes = array_filter($contentNodes, fn ($cn) => 'Material' == $cn['contentTypeName']);
-        $this->assertCount(1, $materialNodes);
-
-        $materialNode = reset($materialNodes);
-        $materialItems = $materialNode['_embedded']['materialItems'];
-        $this->assertCount(1, $materialItems);
-
-        $materailItem = reset($materialItems);
-        $this->assertNull($materailItem['_links']['materialList']);
     }
 
     /**