merge devel

ecamp · Mar 31, 2024 · 5745469 · 5745469
2 parents ed26dc7 + 37794d5
commit 5745469
Show file tree

Hide file tree

Showing 21 changed files with 15,035 additions and 8,191 deletions.
diff --git a/.ops/aws-setup/package-lock.json b/.ops/aws-setup/package-lock.json
diff --git a/.ops/aws-setup/package.json b/.ops/aws-setup/package.json
@@ -16,7 +16,7 @@
     },
     "devDependencies": {
         "@babel/eslint-parser": "7.24.1",
-        "@types/node": "20.11.30",
+        "@types/node": "20.12.2",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",

diff --git a/api/composer.json b/api/composer.json
@@ -149,4 +149,4 @@
             }
         }
     }
-}
+}
diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/src/Entity/Activity.php b/api/src/Entity/Activity.php
@@ -118,7 +118,7 @@ class Activity extends BaseEntity implements BelongsToCampInterface {
     public ?Category $category = null;
 
     /**
-     * Copy Contents from this Source-Activity.
+     * Copy contents from this source activity.
      */
     #[ApiProperty(example: '/activities/1a2b3c4d')]
     #[Groups(['create'])]

diff --git a/api/src/Entity/Category.php b/api/src/Entity/Category.php
@@ -119,6 +119,13 @@ class Category extends BaseEntity implements BelongsToCampInterface, CopyFromPro
     #[ORM\OneToMany(targetEntity: Activity::class, mappedBy: 'category', orphanRemoval: true)]
     public Collection $activities;
 
+    /**
+     * Copy contents from this source category or activity.
+     */
+    #[ApiProperty(example: '/categories/1a2b3c4d')]
+    #[Groups(['create'])]
+    public null|Activity|Category $copyCategorySource;
+
     /**
      * The id of the category that was used as a template for creating this category. Internal for now, is
      * not published through the API.

diff --git a/api/src/State/CategoryCreateProcessor.php b/api/src/State/CategoryCreateProcessor.php
@@ -8,6 +8,7 @@
 use App\Entity\ContentNode\ColumnLayout;
 use App\Entity\ContentType;
 use App\State\Util\AbstractPersistProcessor;
+use App\Util\EntityMap;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -35,6 +36,12 @@ public function onBefore($data, Operation $operation, array $uriVariables = [],
         $rootContentNode->data = ['columns' => [['slot' => '1', 'width' => 12]]];
         $data->setRootContentNode($rootContentNode);
 
+        if (isset($data->copyCategorySource)) {
+            // CopyActivity Source is set -> copy it's content (rootContentNode)
+            $entityMap = new EntityMap();
+            $rootContentNode->copyFromPrototype($data->copyCategorySource->getRootContentNode(), $entityMap);
+        }
+
         return $data;
     }
 }
diff --git a/api/tests/Api/Categories/CreateCategoryTest.php b/api/tests/Api/Categories/CreateCategoryTest.php
@@ -99,10 +99,10 @@ public function testCreateCategoryCreatesNewColumnLayoutAsRootContentNode() {
 
         $this->assertResponseStatusCodeSame(201);
         $newestColumnLayout = $this->getEntityManager()->getRepository(ContentNode::class)
-            ->findBy(['contentType' => static::$fixtures['contentTypeColumnLayout']], ['createTime' => 'DESC'])[0]
+            ->findBy(['contentType' => static::$fixtures['contentTypeColumnLayout'], 'instanceName' => null], ['createTime' => 'DESC'], 1)[0]
         ;
         $this->assertJsonContains(['_links' => [
-            'rootContentNode' => ['href' => '/content_node/column_layouts/'.$newestColumnLayout->getId()],
+            'rootContentNode' => ['href' => $this->getIriFor($newestColumnLayout)],
         ]]);
     }
 
@@ -456,6 +456,102 @@ public function testCreateCategoryValidatesInvalidNumberingStyle() {
         ]);
     }
 
+    public function testCreateCategoryFromCopySourceValidatesAccess() {
+        static::createClientWithCredentials(['email' => static::$fixtures['user8memberOnlyInCamp2']->getEmail()])->request(
+            'POST',
+            '/categories',
+            ['json' => $this->getExampleWritePayload(
+                [
+                    'camp' => $this->getIriFor('camp2'),
+                    'copyCategorySource' => $this->getIriFor('category1'),
+                ]
+            )]
+        );
+
+        // No Access on category1 -> BadRequest
+        $this->assertResponseStatusCodeSame(400);
+    }
+
+    public function testCreateCategoryFromCopySourceWithinSameCamp() {
+        static::createClientWithCredentials()->request(
+            'POST',
+            '/categories',
+            ['json' => $this->getExampleWritePayload(
+                [
+                    'camp' => $this->getIriFor('camp1'),
+                    'copyCategorySource' => $this->getIriFor('category1'),
+                ],
+            )]
+        );
+
+        // Category created
+        $this->assertResponseStatusCodeSame(201);
+    }
+
+    public function testCreateCategoryFromCopySourceAcrossCamp() {
+        static::createClientWithCredentials()->request(
+            'POST',
+            '/categories',
+            ['json' => $this->getExampleWritePayload(
+                [
+                    'camp' => $this->getIriFor('camp2'),
+                    'copyCategorySource' => $this->getIriFor('category1'),
+                ],
+            )]
+        );
+
+        // Category created
+        $this->assertResponseStatusCodeSame(201);
+    }
+
+    public function testCreateCategoryFromCopySourceActivityValidatesAccess() {
+        static::createClientWithCredentials(['email' => static::$fixtures['user8memberOnlyInCamp2']->getEmail()])->request(
+            'POST',
+            '/categories',
+            ['json' => $this->getExampleWritePayload(
+                [
+                    'camp' => $this->getIriFor('camp2'),
+                    'copyCategorySource' => $this->getIriFor('activity1'),
+                ]
+            )]
+        );
+
+        // No Access on activity1 -> BadRequest
+        $this->assertResponseStatusCodeSame(400);
+    }
+
+    public function testCreateCategoryFromCopySourceActivityWithinSameCamp() {
+        static::createClientWithCredentials()->request(
+            'POST',
+            '/categories',
+            ['json' => $this->getExampleWritePayload(
+                [
+                    'camp' => $this->getIriFor('camp1'),
+                    'copyCategorySource' => $this->getIriFor('activity1'),
+                ],
+            )]
+        );
+
+        // Category created
+        $this->assertResponseStatusCodeSame(201);
+    }
+
+    public function testCreateCategoryFromCopySourceActivityAcrossCamp() {
+        static::createClientWithCredentials()->request(
+            'POST',
+            '/categories',
+            ['json' => $this->getExampleWritePayload(
+                [
+                    'camp' => $this->getIriFor('camp2'),
+                    'copyCategorySource' => $this->getIriFor('activity1'),
+                ],
+            )]
+        );
+
+        // Category created
+        $this->assertResponseStatusCodeSame(201);
+    }
+
     /**
      * @throws RedirectionExceptionInterface
      * @throws DecodingExceptionInterface
@@ -488,6 +584,7 @@ public function getExampleWritePayload($attributes = [], $except = []) {
             Category::class,
             Post::class,
             array_merge([
+                'copyCategorySource' => null,
                 'camp' => $this->getIriFor('camp1'),
                 'preferredContentTypes' => [$this->getIriFor('contentTypeSafetyConcept')],
             ], $attributes),
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,4 +149,4 @@ @@
                 }
             }
         }
-    }
+    }