fix #4036 【メール】送信情報をデータベースに保存しない場合にファイルを添付すると送信に失敗する (#4093)

Author: seto1

plugins/bc-mail/src/Service/Front/MailFrontService.php

@@ -248,18 +248,19 @@ public function sendMail(EntityInterface $mailContent, EntityInterface $mailMess
                     $sendEmailOptions
                 ]);
             }
-            if ($mailContent->save_info) return;
-            foreach($mailFields as $field) {
-                if ($field->type !== 'file') continue;
-                // 削除フラグをセット
-                $mailMessage->{$field->field_name . '_delete'} = true;
-            }
-            // TODO ucmitz 未検証
-            $mailMessagesTable = TableRegistry::getTableLocator()->get('BcMail.MailMessages');
-            $mailMessagesTable->getFileUploader()->deleteFiles($mailMessage, $mailMessage);
         } catch (\Throwable $e) {
+            if (!$mailContent->save_info) {
+                /** @var MailMessagesService $mailMessagesService */
+                $mailMessagesService = $this->getService(MailMessagesServiceInterface::class);
+                $mailMessagesService->delete($mailMessage->id);
+            }
             throw $e;
         }
+        if (!$mailContent->save_info) {
+            /** @var MailMessagesService $mailMessagesService */
+            $mailMessagesService = $this->getService(MailMessagesServiceInterface::class);
+            $mailMessagesService->delete($mailMessage->id);
+        }
     }
 
     /**

plugins/bc-mail/src/Service/MailMessagesService.php

@@ -143,11 +143,7 @@ public function create(EntityInterface $mailContent, $postData)
             $mailFieldsTable = TableRegistry::getTableLocator()->get('BcMail.MailFields');
             $mailFields = $mailFieldsTable->find()->where(['MailFields.mail_content_id' => $mailContent->id, 'MailFields.use_field' => true])->all();
             $this->MailMessages->convertToDb($mailFields, $entity);
-            if ($mailContent->save_info) {
-                return $this->MailMessages->saveOrFail($entity);
-            } else {
-                return $entity;
-            }
+            return $this->MailMessages->saveOrFail($entity);
         }
         throw new PersistenceFailedException($entity, __d('baser_core', '入力エラーです。内容を見直してください。'));
     }