Fix saving entity

Author: avstudnitz

Command/AsyncEvent/SaveCommand.php

@@ -4,9 +4,8 @@
 namespace MageOS\AsyncEventsAdminUi\Command\AsyncEvent;
 
 use Exception;
+use Magento\Framework\Encryption\EncryptorInterface;
 use MageOS\AsyncEvents\Api\Data\AsyncEventInterface;
-use MageOS\AsyncEvents\Model\AsyncEvent as AsyncEventModel;
-use MageOS\AsyncEvents\Model\AsyncEventFactory as AsyncEventModelFactory;
 use MageOS\AsyncEvents\Model\ResourceModel\AsyncEvent as AsyncEventResource;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Psr\Log\LoggerInterface;
@@ -17,16 +16,14 @@
 class SaveCommand
 {
     private LoggerInterface $logger;
-    private AsyncEventModelFactory $modelFactory;
     private AsyncEventResource $resource;
 
     public function __construct(
         LoggerInterface        $logger,
-        AsyncEventModelFactory $modelFactory,
-        AsyncEventResource     $resource
+        AsyncEventResource     $resource,
+        private readonly EncryptorInterface $encryptor
     ) {
         $this->logger = $logger;
-        $this->modelFactory = $modelFactory;
         $this->resource = $resource;
     }
 
@@ -38,15 +35,15 @@ public function __construct(
     public function execute(AsyncEventInterface $asyncEvent): int
     {
         try {
-            /** @var AsyncEventModel $model */
-            $model = $this->modelFactory->create();
-            $model->addData($asyncEvent->getData());
-            $model->setHasDataChanges(true);
+            $asyncEvent->setHasDataChanges(true);
 
-            if (!$model->getSubscriptionId()) {
-                $model->isObjectNew(true);
+            if (!$asyncEvent->getSubscriptionId()) {
+                $asyncEvent->isObjectNew(true);
+                $asyncEvent->setSubscribedAt((new \DateTime())->format(\DateTimeInterface::ATOM));
+                $secretVerificationToken = $this->encryptor->encrypt($asyncEvent->getVerificationToken());
+                $asyncEvent->setVerificationToken($secretVerificationToken);
             }
-            $this->resource->save($model);
+            $this->resource->save($asyncEvent);
         } catch (Exception $exception) {
             $this->logger->error(
                 __('Could not save Asynchronous Event Subscriber. Original message: {message}'),
@@ -58,6 +55,6 @@ public function execute(AsyncEventInterface $asyncEvent): int
             throw new CouldNotSaveException(__('Could not save Asynchronous Event Subscriber.'));
         }
 
-        return (int)$model->getSubscriptionId();
+        return (int)$asyncEvent->getSubscriptionId();
     }
 }

Controller/Adminhtml/Events/Save.php

@@ -12,7 +12,6 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\DataObject;
 use Magento\Framework\Exception\CouldNotSaveException;
 
 /**
@@ -29,7 +28,7 @@ class Save extends Action implements HttpPostActionInterface
 
     private DataPersistorInterface $dataPersistor;
     private SaveCommand $saveCommand;
-    private AsyncEventInterfaceFactory $entityDataFactory;
+    private AsyncEventInterfaceFactory $asyncEventFactory;
 
     public function __construct(
         Context                    $context,
@@ -40,7 +39,7 @@ public function __construct(
         parent::__construct($context);
         $this->dataPersistor = $dataPersistor;
         $this->saveCommand = $saveCommand;
-        $this->entityDataFactory = $entityDataFactory;
+        $this->asyncEventFactory = $entityDataFactory;
     }
 
     /**
@@ -52,11 +51,17 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         $params = $this->getRequest()->getParams();
+        if (isset($params['general'])) {
+            $params = $params['general'];
+        }
+        if ($params['subscription_id'] === '') {
+            unset($params['subscription_id']);
+        }
 
         try {
-            /** @var AsyncEventInterface|DataObject $entityModel */
-            $entityModel = $this->entityDataFactory->create();
-            $entityModel->addData($params['general']);
+            /** @var AsyncEventInterface $entityModel */
+            $entityModel = $this->asyncEventFactory->create();
+            $entityModel->addData($params);
             $this->saveCommand->execute($entityModel);
             $this->messageManager->addSuccessMessage(
                 __('The Asynchronous Event Subscriber data was saved successfully')

view/adminhtml/ui_component/async_events_events_form.xml

@@ -72,19 +72,6 @@
                 <dataScope>recipient_url</dataScope>
             </settings>
         </field>
-        <field name="verification_token" sortOrder="20" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">verification_token</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>string</dataType>
-                <label translate="true">Verification Token</label>
-                <notice translate="true">Leave empty to auto-generate</notice>
-                <dataScope>verification_token</dataScope>
-            </settings>
-        </field>
         <field name="status" sortOrder="30" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">