Refactor Backend and Frontend for Activity-Layout

backend/content-type/eCampSingleText/src/Entity/SingleText.php

@@ -13,7 +13,7 @@ class SingleText extends BaseContentTypeEntity {
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private ?string $text;
+    private ?string $text = null;
 
     public function getText(): ?string {
         return $this->text;

backend/module/eCampApi/config/Rest/activity.config.php

@@ -49,7 +49,7 @@
             'validators' => [],
         ],
         5 => [
-            'name' => 'activityCategoryId',
+            'name' => 'categoryId',
             'required' => false,
             'filters' => [],
             'validators' => [],

backend/module/eCampApi/config/Rest/activityCategory.config.php → backend/module/eCampApi/config/Rest/category.config.php

@@ -2,21 +2,21 @@
 
 use eCampApi\ConfigFactory;
 
-$config = ConfigFactory::createConfig('ActivityCategory', 'ActivityCategories');
+$config = ConfigFactory::createConfig('Category', 'Categories');
 
 array_push(
-    $config['api-tools-rest']['eCampApi\\V1\\Rest\\ActivityCategory\\Controller']['collection_query_whitelist'],
+    $config['api-tools-rest']['eCampApi\\V1\\Rest\\Category\\Controller']['collection_query_whitelist'],
     'campId'
 );
 
 $config['api-tools-content-validation'] = [
-    'eCampApi\\V1\\Rest\\ActivityCategory\\Controller' => [
-        'input_filter' => 'eCampApi\\V1\\Rest\\ActivityCategory\\Validator',
+    'eCampApi\\V1\\Rest\\Category\\Controller' => [
+        'input_filter' => 'eCampApi\\V1\\Rest\\Category\\Validator',
     ],
 ];
 
 $config['input_filter_specs'] = [
-    'eCampApi\\V1\\Rest\\ActivityCategory\\Validator' => [
+    'eCampApi\\V1\\Rest\\Category\\Validator' => [
         0 => [
             'name' => 'short',
             'required' => true,

backend/module/eCampApi/config/Rest/contentTypeConfig.config.php → backend/module/eCampApi/config/Rest/categoryContent.config.php

@@ -2,7 +2,7 @@
 
 use eCampApi\ConfigFactory;
 
-$entity = 'ContentTypeConfig';
+$entity = 'CategoryContent';
 $config = ConfigFactory::createConfig($entity);
 
 return $config;

backend/module/eCampApi/config/Rest/contentTypeConfigTemplate.config.php → backend/module/eCampApi/config/Rest/categoryContentTemplate.config.php

@@ -2,7 +2,7 @@
 
 use eCampApi\ConfigFactory;
 
-$entity = 'ContentTypeConfigTemplate';
+$entity = 'CategoryContentTemplate';
 $config = ConfigFactory::createConfig($entity);
 
 // read-only endpoint
@@ -11,7 +11,7 @@
 
 array_push(
     $config['api-tools-rest']["eCampApi\\V1\\Rest\\{$entity}\\Controller"]['collection_query_whitelist'],
-    'activityCategoryTemplateId'
+    'categoryTemplateId'
 );
 
 return $config;

backend/module/eCampApi/config/Rest/categoryContentType.config.php

@@ -0,0 +1,8 @@
+<?php
+
+use eCampApi\ConfigFactory;
+
+$entity = 'CategoryContentType';
+$config = ConfigFactory::createConfig($entity);
+
+return $config;

backend/module/eCampApi/config/Rest/categoryContentTypeTemplate.config.php

@@ -0,0 +1,17 @@
+<?php
+
+use eCampApi\ConfigFactory;
+
+$entity = 'CategoryContentTypeTemplate';
+$config = ConfigFactory::createConfig($entity);
+
+// read-only endpoint
+$config['api-tools-rest']["eCampApi\\V1\\Rest\\{$entity}\\Controller"]['entity_http_methods'] = ['GET'];
+$config['api-tools-rest']["eCampApi\\V1\\Rest\\{$entity}\\Controller"]['collection_http_methods'] = ['GET'];
+
+array_push(
+    $config['api-tools-rest']["eCampApi\\V1\\Rest\\{$entity}\\Controller"]['collection_query_whitelist'],
+    'categoryTemplateId'
+);
+
+return $config;

backend/module/eCampApi/config/Rest/activityCategoryTemplate.config.php → backend/module/eCampApi/config/Rest/categoryTemplate.config.php

@@ -2,15 +2,15 @@
 
 use eCampApi\ConfigFactory;
 
-$entity = 'ActivityCategoryTemplate';
+$entity = 'CategoryTemplate';
 $config = ConfigFactory::createConfig($entity);
 
 // read-only endpoint
 $config['api-tools-rest']["eCampApi\\V1\\Rest\\{$entity}\\Controller"]['entity_http_methods'] = ['GET'];
 $config['api-tools-rest']["eCampApi\\V1\\Rest\\{$entity}\\Controller"]['collection_http_methods'] = ['GET'];
 
 array_push(
-    $config['api-tools-rest']['eCampApi\\V1\\Rest\\ActivityCategoryTemplate\\Controller']['collection_query_whitelist'],
+    $config['api-tools-rest']['eCampApi\\V1\\Rest\\CategoryTemplate\\Controller']['collection_query_whitelist'],
     'campTemplateId'
 );
 

backend/module/eCampApi/src/eCampApi/V1/Rest/Category/CategoryCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\Category;
+
+use eCamp\Lib\Entity\BaseCollection;
+
+class CategoryCollection extends BaseCollection {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/Category/CategoryResource.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\Category;
+
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
+
+class CategoryResource extends DoctrineResource {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContent/CategoryContentCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContent;
+
+use eCamp\Lib\Entity\BaseCollection;
+
+class CategoryContentCollection extends BaseCollection {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContent/CategoryContentResource.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContent;
+
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
+
+class CategoryContentResource extends DoctrineResource {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContentTemplate/CategoryContentTemplateCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContentTemplate;
+
+use eCamp\Lib\Entity\BaseCollection;
+
+class CategoryContentTemplateCollection extends BaseCollection {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContentTemplate/CategoryContentTemplateResource.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContentTemplate;
+
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
+
+class CategoryContentTemplateResource extends DoctrineResource {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContentType/CategoryContentTypeCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContentType;
+
+use eCamp\Lib\Entity\BaseCollection;
+
+class CategoryContentTypeCollection extends BaseCollection {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContentType/CategoryContentTypeResource.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContentType;
+
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
+
+class CategoryContentTypeResource extends DoctrineResource {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContentTypeTemplate/CategoryContentTypeTemplateCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContentTypeTemplate;
+
+use eCamp\Lib\Entity\BaseCollection;
+
+class CategoryContentTypeTemplateCollection extends BaseCollection {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryContentTypeTemplate/CategoryContentTypeTemplateResource.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryContentTypeTemplate;
+
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
+
+class CategoryContentTypeTemplateResource extends DoctrineResource {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryTemplate/CategoryTemplateCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryTemplate;
+
+use eCamp\Lib\Entity\BaseCollection;
+
+class CategoryTemplateCollection extends BaseCollection {
+}

backend/module/eCampApi/src/eCampApi/V1/Rest/CategoryTemplate/CategoryTemplateResource.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace eCampApi\V1\Rest\CategoryTemplate;
+
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
+
+class CategoryTemplateResource extends DoctrineResource {
+}

backend/module/eCampApi/test/Rest/ActivityResponsibleTest.php

@@ -90,7 +90,7 @@ public function testCreateSuccess() {
         $activity = new Activity();
         $activity->setCamp($this->activityResponsible->getCamp());
         $activity->setTitle('Activity1');
-        $activity->setActivityCategory($this->activityResponsible->getActivity()->getActivityCategory());
+        $activity->setCategory($this->activityResponsible->getActivity()->getCategory());
 
         $this->getEntityManager()->persist($activity);
         $this->getEntityManager()->flush();