Merge pull request #2170 from usu/feature/content-node-column-layout

Updated API Tests for ColumnLayout

Author: pmattmann

api/fixtures/camps.yml

@@ -1,6 +1,6 @@
 App\Entity\Camp:
   camp1:
-    name: <word()>
+    name: Camp1
     title: <word()>
     motto: <sentence()>
     addressName: <word()>
@@ -12,7 +12,7 @@ App\Entity\Camp:
     isPrototype: false
     campPrototypeId: null
   camp2:
-    name: <word()>
+    name: Camp2
     title: <word()>
     motto: <sentence()>
     addressName: <word()>
@@ -24,7 +24,7 @@ App\Entity\Camp:
     isPrototype: false
     campPrototypeId: null
   campUnrelated:
-    name: <word()>
+    name: CampUnrelated
     title: <word()>
     motto: <sentence()>
     addressName: <word()>
@@ -36,7 +36,7 @@ App\Entity\Camp:
     isPrototype: false
     campPrototypeId: null
   campPrototype:
-    name: <word()>
+    name: CampPrototype
     title: <word()>
     motto: <sentence()>
     addressName: <word()>

api/migrations/Version20211030082112.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20211030082112 extends AbstractMigration {
+    public function getDescription(): string {
+        return '';
+    }
+
+    public function up(Schema $schema): void {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE content_node DROP CONSTRAINT FK_481D058010EE4CEE');
+        $this->addSql('ALTER TABLE content_node ADD CONSTRAINT FK_481D058010EE4CEE FOREIGN KEY (parentId) REFERENCES content_node (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE content_node DROP CONSTRAINT fk_481d058010ee4cee');
+        $this->addSql('ALTER TABLE content_node ADD CONSTRAINT fk_481d058010ee4cee FOREIGN KEY (parentid) REFERENCES content_node (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}

api/migrations/Version20211030110620.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20211030110620 extends AbstractMigration {
+    public function getDescription(): string {
+        return '';
+    }
+
+    public function up(Schema $schema): void {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE abstract_content_node_owner DROP CONSTRAINT FK_8E710AB4F886581C');
+        $this->addSql('ALTER TABLE abstract_content_node_owner ADD CONSTRAINT FK_8E710AB4F886581C FOREIGN KEY (rootContentNodeId) REFERENCES content_node (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE abstract_content_node_owner DROP CONSTRAINT fk_8e710ab4f886581c');
+        $this->addSql('ALTER TABLE abstract_content_node_owner ADD CONSTRAINT fk_8e710ab4f886581c FOREIGN KEY (rootcontentnodeid) REFERENCES content_node (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}

api/src/Entity/AbstractContentNodeOwner.php

@@ -17,7 +17,7 @@ abstract class AbstractContentNodeOwner extends BaseEntity {
      * exchanged, but all the contents attached to it can.
      *
      * @ORM\OneToOne(targetEntity="ContentNode", inversedBy="owner", cascade={"persist"})
-     * @ORM\JoinColumn(nullable=false, unique=true)
+     * @ORM\JoinColumn(nullable=false, unique=true, onDelete="cascade")
      */
     #[Assert\DisableAutoMapping]
     #[ApiProperty(writable: false, example: '/content_nodes/1a2b3c4d')]

api/src/Entity/ContentNode.php

@@ -42,7 +42,7 @@
 #[ApiFilter(SearchFilter::class, properties: ['parent'])]
 abstract class ContentNode extends BaseEntity implements BelongsToCampInterface {
     /**
-     * @ORM\OneToOne(targetEntity="AbstractContentNodeOwner", mappedBy="rootContentNode", cascade={"persist", "remove"})
+     * @ORM\OneToOne(targetEntity="AbstractContentNodeOwner", mappedBy="rootContentNode", cascade={"persist"})
      */
     #[SerializedName('_owner')]
     #[ApiProperty(readable: false, writable: false)]
@@ -75,6 +75,7 @@ abstract class ContentNode extends BaseEntity implements BelongsToCampInterface
      * it has an owner.
      *
      * @ORM\ManyToOne(targetEntity="ContentNode", inversedBy="children")
+     * @ORM\JoinColumn(onDelete="CASCADE")
      */
     #[AssertEitherIsNull(
         other: 'owner',
@@ -166,13 +167,14 @@ public function getContentTypeName(): string {
     #[SerializedName('owner')]
     #[ApiProperty(writable: false, example: '/activities/1a2b3c4d')]
     #[Groups(['read'])]
-    public function getRootOwner(): Activity|Category|AbstractContentNodeOwner {
+    public function getRootOwner(): Activity|Category|AbstractContentNodeOwner|null {
         if (null !== $this->root) {
             return $this->root->owner;
         }
 
         // this line is used during create process when $this->root is not yet set
-        return $this->parent->root->owner;
+        // returns null if parent is not set
+        return $this->parent?->root->owner;
     }
 
     /**

api/src/Entity/ContentNode/ColumnLayout.php

@@ -5,15 +5,17 @@
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;
 use App\Entity\ContentNode;
+use App\Repository\ColumnLayoutRepository;
 use App\Validator\AssertJsonSchema;
 use App\Validator\ColumnLayout\AssertColumWidthsSumTo12;
 use App\Validator\ColumnLayout\AssertNoOrphanChildren;
-use App\Validator\ColumnLayout\ColumnLayoutGroupSequence;
+use App\Validator\ColumnLayout\ColumnLayoutPatchGroupSequence;
+use App\Validator\ColumnLayout\ColumnLayoutPostGroupSequence;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=ColumnLayoutRepository::class)
  * @ORM\Table(name="content_node_columnlayout")
  */
 #[ApiResource(
@@ -25,17 +27,17 @@
         'post' => [
             'denormalization_context' => ['groups' => ['write', 'create']],
             'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
-            'validation_groups' => ColumnLayoutGroupSequence::class,
+            'validation_groups' => ColumnLayoutPostGroupSequence::class,
         ],
     ],
     itemOperations: [
         'get' => ['security' => 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)'],
         'patch' => [
             'denormalization_context' => ['groups' => ['write', 'update']],
             'security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
-            'validation_groups' => ColumnLayoutGroupSequence::class,
+            'validation_groups' => ColumnLayoutPatchGroupSequence::class,
         ],
-        'delete' => ['security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'],
+        'delete' => ['security' => '(is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)) and object.owner === null'], // disallow delete when contentNode is a root node
     ],
     denormalizationContext: ['groups' => ['write']],
     normalizationContext: ['groups' => ['read']],

api/src/Entity/ContentNode/MaterialNode.php

@@ -24,15 +24,18 @@
         ],
         'post' => [
             'denormalization_context' => ['groups' => ['write', 'create']],
-            'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)', ],
+            'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
+            'validation_groups' => ['Default', 'create'],
+        ],
     ],
     itemOperations: [
         'get' => ['security' => 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)'],
         'patch' => [
             'denormalization_context' => ['groups' => ['write', 'update']],
             'security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
+            'validation_groups' => ['Default', 'update'],
         ],
-        'delete' => ['security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'],
+        'delete' => ['security' => '(is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)) and object.owner === null'], // disallow delete when contentNode is a root node
     ],
     denormalizationContext: ['groups' => ['write']],
     normalizationContext: ['groups' => ['read']],

api/src/Entity/ContentNode/SingleText.php

@@ -21,15 +21,18 @@
         ],
         'post' => [
             'denormalization_context' => ['groups' => ['write', 'create']],
-            'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)', ],
+            'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
+            'validation_groups' => ['Default', 'create'],
+        ],
     ],
     itemOperations: [
         'get' => ['security' => 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)'],
         'patch' => [
             'denormalization_context' => ['groups' => ['write', 'update']],
             'security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
+            'validation_groups' => ['Default', 'update'],
         ],
-        'delete' => ['security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'],
+        'delete' => ['security' => '(is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)) and object.owner === null'], // disallow delete when contentNode is a root node
     ],
     denormalizationContext: ['groups' => ['write']],
     normalizationContext: ['groups' => ['read']],

api/src/Entity/ContentNode/Storyboard.php

@@ -23,15 +23,18 @@
         ],
         'post' => [
             'denormalization_context' => ['groups' => ['write', 'create']],
-            'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)', ],
+            'security_post_denormalize' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
+            'validation_groups' => ['Default', 'create'],
+        ],
     ],
     itemOperations: [
         'get' => ['security' => 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PROTOTYPE", object)'],
         'patch' => [
             'denormalization_context' => ['groups' => ['write', 'update']],
             'security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)',
+            'validation_groups' => ['Default', 'update'],
         ],
-        'delete' => ['security' => 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'],
+        'delete' => ['security' => '(is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)) and object.owner === null'], // disallow delete when contentNode is a root node
     ],
     denormalizationContext: ['groups' => ['write']],
     normalizationContext: ['groups' => ['read']],

api/src/Repository/ColumnLayoutRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Repository;
+
+use App\Entity\ContentNode\ColumnLayout;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method null|ColumnLayout find($id, $lockMode = null, $lockVersion = null)
+ * @method null|ColumnLayout findOneBy(array $criteria, array $orderBy = null)
+ * @method ColumnLayout[]    findAll()
+ * @method ColumnLayout[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ColumnLayoutRepository extends ContentNodeRepository {
+    public function __construct(ManagerRegistry $registry) {
+        parent::__construct($registry, ColumnLayout::class);
+    }
+}