4565: Fixed template commands

Author: tuj

src/Command/TemplatesInstallCommand.php

@@ -4,6 +4,7 @@
 
 namespace App\Command;
 
+use App\Model\TemplateData;
 use App\Service\TemplateService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -41,10 +42,8 @@ final protected function execute(InputInterface $input, OutputInterface $output)
         $templates = $this->templateService->getAllTemplates();
 
         if ($all) {
-            foreach ($templates as $templateArray) {
-                if (!$templateArray['installed']) {
-                    $this->templateService->installTemplate($templateArray);
-                }
+            foreach ($templates as $templateToInstall) {
+                $this->templateService->installTemplate($templateToInstall);
             }
 
             $io->success("Installed all available templates");
@@ -58,24 +57,20 @@ final protected function execute(InputInterface $input, OutputInterface $output)
             return Command::INVALID;
         }
 
-        $templateToInstall = array_find($templates, function (array $template) use ($templateUlid): bool {
-            return $template['id'] === $templateUlid;
+        $templatesFound = array_find($templates, function (TemplateData $templateData) use ($templateUlid): bool {
+            return $templateData->id === $templateUlid;
         });
 
-        if ($templateToInstall !== null) {
-            if ($templateToInstall['installed']) {
-                $io->warning("Template ULID already installed");
-                return Command::INVALID;
-            } else {
-                $this->templateService->installTemplate($templateToInstall);
-                $io->success("Template " .$templateToInstall['title'] . " installed");
-            }
-        } else {
-            $io->warning("Template files not found.");
-            return Command::INVALID;
+        if (count($templatesFound) !== 1) {
+            $io->error("Template not found.");
+            return Command::FAILURE;
         }
 
+        $templateToInstall = $templatesFound[0];
+
+        $this->templateService->installTemplate($templateToInstall);
+        $io->success("Template " .$templateToInstall->title . " installed");
+
         return Command::SUCCESS;
     }
-
 }

src/Command/TemplatesListCommand.php

@@ -4,6 +4,7 @@
 
 namespace App\Command;
 
+use App\Model\TemplateData;
 use App\Service\TemplateService;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -38,11 +39,11 @@ final protected function execute(InputInterface $input, OutputInterface $output)
 
             $customTemplates = $this->templateService->getCustomTemplates();
 
-            $io->table(['ID', 'Title', 'Status', 'Type'], array_map(fn (array $templateArray) => [
-                $templateArray['id'],
-                $templateArray['title'],
-                $templateArray['installed'] ? 'Installed' : 'Not Installed',
-                $templateArray['type'],
+            $io->table(['ID', 'Title', 'Status', 'Type'], array_map(fn (TemplateData $templateData) => [
+                $templateData->id,
+                $templateData->title,
+                $templateData->installed ? 'Installed' : 'Not Installed',
+                $templateData->type,
             ], array_merge($templates, $customTemplates)));
 
             return Command::SUCCESS;

src/Model/TemplateData.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Model;
+
+use App\Entity\Template;
+
+class TemplateData
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $title,
+        public readonly array $adminForm,
+        public readonly object $options,
+        public readonly ?Template $templateEntity,
+        public readonly bool $installed,
+        public readonly string $type,
+    ) {}
+}

src/Service/TemplateService.php

@@ -3,6 +3,7 @@
 namespace App\Service;
 
 use App\Entity\Template;
+use App\Model\TemplateData;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Id\AssignedGenerator;
 use JsonSchema\Constraints\Factory;
@@ -19,18 +20,24 @@ public function __construct(
     ) {
     }
 
-    public function installTemplate($templateData): void
+    public function installTemplate(TemplateData $templateData): void
     {
-        $template = new Template();
-        $template->setTitle($templateData['title']);
+        $template = $templateData->templateEntity;
 
-        $metadata = $this->entityManager->getClassMetaData($template::class);
-        $metadata->setIdGenerator(new AssignedGenerator());
+        if ($template === null) {
+            $template = new Template();
 
-        $ulid = Ulid::fromString($templateData['id']);
-        $template->setId($ulid);
+            $metadata = $this->entityManager->getClassMetaData($template::class);
+            $metadata->setIdGenerator(new AssignedGenerator());
+
+            $ulid = Ulid::fromString($templateData->id);
+            $template->setId($ulid);
+
+            $this->entityManager->persist($template);
+        }
+
+        $template->setTitle($templateData->title);
 
-        $this->entityManager->persist($template);
         $this->entityManager->flush();
     }
 
@@ -99,15 +106,15 @@ public function getTemplates(iterable $finder, bool $customTemplates = false): a
             $repository = $this->entityManager->getRepository(Template::class);
             $template = $repository->findOneBy(['id' => Ulid::fromString($content->id)]);
 
-            $templates[] = [
-                'id' => $content->id,
-                'title' => $content->title,
-                'adminForm' => $content->adminForm,
-                'options' => $content->options,
-                'templateEntity' => $template,
-                'installed' => $template !== null,
-                'type' => $customTemplates ? 'Custom' : 'Core',
-            ];
+            $templates[] = new TemplateData(
+                $content->id,
+                $content->title,
+                $content->adminForm,
+                $content->options,
+                $template,
+                $template !== null,
+                $customTemplates ? 'Custom' : 'Core',
+            );
         }
 
         return $templates;