email template api endpoint

application/Espo/Controllers/EmailTemplate.php

@@ -29,48 +29,7 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\BadRequest;
-
-use Espo\Core\Exceptions\ForbiddenSilent;
-use Espo\Core\Exceptions\NotFound;
-use Espo\Tools\EmailTemplate\Data;
-use Espo\Tools\EmailTemplate\Service;
-
-use Espo\Core\Api\Request;
 use Espo\Core\Controllers\Record;
 
-use stdClass;
-
 class EmailTemplate extends Record
-{
-    /**
-     * @throws BadRequest
-     * @throws NotFound
-     * @throws ForbiddenSilent
-     */
-    public function actionParse(Request $request): stdClass
-    {
-        $id = $request->getQueryParam('id');
-
-        if ($id === null) {
-            throw new BadRequest("No `id`.");
-        }
-
-        $data = Data::create()
-            ->withRelatedType($request->getQueryParam('relatedType'))
-            ->withRelatedId($request->getQueryParam('relatedId'))
-            ->withParentType($request->getQueryParam('parentType'))
-            ->withParentId($request->getQueryParam('parentId'))
-            ->withEmailAddress($request->getQueryParam('emailAddress'));
-
-        $result = $this->getEmailTemplateService()->process($id, $data);
-
-        return $result->getValueMap();
-
-    }
-
-    private function getEmailTemplateService(): Service
-    {
-        return $this->injectableFactory->create(Service::class);
-    }
-}
+{}

application/Espo/Resources/routes.json

@@ -314,6 +314,11 @@
         "method": "post",
         "actionClassName": "Espo\\Tools\\Attachment\\Api\\PostCopy"
     },
+    {
+        "route": "/EmailTemplate/:id/prepare",
+        "method": "post",
+        "actionClassName": "Espo\\Tools\\EmailTemplate\\Api\\PostPrepare"
+    },
     {
         "route": "/Email/:id/attachments/copy",
         "method": "post",

application/Espo/Tools/EmailTemplate/Api/PostPrepare.php

@@ -0,0 +1,68 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Tools\EmailTemplate\Api;
+
+use Espo\Core\Api\Action;
+use Espo\Core\Api\Request;
+use Espo\Core\Api\Response;
+use Espo\Core\Api\ResponseComposer;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Tools\EmailTemplate\Data;
+use Espo\Tools\EmailTemplate\Service;
+
+/**
+ * Prepares an email data with an email template applied.
+ */
+class PostPrepare implements Action
+{
+    public function __construct(private Service $service) {}
+
+    public function process(Request $request): Response
+    {
+        $id = $request->getRouteParam('id');
+
+        if ($id === null) {
+            throw new BadRequest();
+        }
+
+        $body = $request->getParsedBody();
+
+        $data = Data::create()
+            ->withRelatedType($body->relatedType ?? null)
+            ->withRelatedId($body->relatedId ?? null)
+            ->withParentType($body->parentType ?? null)
+            ->withParentId($body->parentId ?? null)
+            ->withEmailAddress($body->emailAddress ?? null);
+
+        $result = $this->service->process($id, $data);
+
+        return ResponseComposer::json($result->getValueMap());
+    }
+}

application/Espo/Tools/EmailTemplate/Service.php

@@ -32,29 +32,18 @@ namespace Espo\Tools\EmailTemplate;
 use Espo\Core\Acl;
 use Espo\Core\Exceptions\ForbiddenSilent;
 use Espo\Core\Exceptions\NotFound;
-use Espo\Core\Record\ServiceContainer;
 use Espo\Entities\EmailTemplate;
 use Espo\Entities\User;
 use Espo\ORM\EntityManager;
 
 class Service
 {
-    private Processor $processor;
-    private User $user;
-    private Acl $acl;
-    private EntityManager $entityManager;
-
     public function __construct(
-        Processor $processor,
-        User $user,
-        Acl $acl,
-        EntityManager $entityManager
-    ) {
-        $this->processor = $processor;
-        $this->user = $user;
-        $this->acl = $acl;
-        $this->entityManager = $entityManager;
-    }
+        private Processor $processor,
+        private User $user,
+        private Acl $acl,
+        private EntityManager $entityManager
+    ) {}
 
     /**
      * Prepare an email data with an applied template.

client/src/views/email/fields/select-template.js

@@ -63,8 +63,7 @@ define('views/email/fields/select-template', ['views/fields/link'], function (De
             }
 
             Espo.Ajax
-                .getRequest('EmailTemplate/action/parse', {
-                    id: id,
+                .postRequest(`EmailTemplate/${id}/prepare`, {
                     emailAddress: emailAddress,
                     parentType: this.model.get('parentType'),
                     parentId: this.model.get('parentId'),