Merge pull request #50 from akagane99/master

MailSettingテーブルの定型文だけ別テーブルに切り出し
NetCommons3 · Apr 14, 2016 · c9b256e · c9b256e
2 parents 613625b + 293d155
commit c9b256e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/Config/Migration/002_mail_setting_records.php b/Config/Migration/002_mail_setting_records.php
@@ -8,14 +8,21 @@
  * @copyright Copyright 2014, NetCommons Project
  */
 
-App::uses('NetCommonsMigration', 'NetCommons.Config/Migration');
+App::uses('MailsMigration', 'Mails.Config/Migration');
 
 /**
  * メール設定データのMigration
  *
  * @package NetCommons\Mails\Config\Migration
  */
-class BbsMailSettingRecords extends NetCommonsMigration {
+class BbsMailSettingRecords extends MailsMigration {
+
+/**
+ * プラグインキー
+ *
+ * @var string
+ */
+	const PLUGIN_KEY = 'bbses';
 
 /**
  * Migration description
@@ -41,14 +48,21 @@ class BbsMailSettingRecords extends NetCommonsMigration {
  */
 	public $records = array(
 		'MailSetting' => array(
-			//コンテンツ通知
+			//コンテンツ通知 - 設定
+			array(
+				'plugin_key' => self::PLUGIN_KEY,
+				'block_key' => null,
+				'is_mail_send' => false,
+			),
+		),
+		'MailSettingFixedPhrase' => array(
+			//コンテンツ通知 - 定型文
 			// * 英語
 			array(
 				'language_id' => '1',
-				'plugin_key' => 'bbses',
+				'plugin_key' => self::PLUGIN_KEY,
 				'block_key' => null,
 				'type_key' => 'contents',
-				'is_mail_send' => false,
 				'mail_fixed_phrase_subject' => '[{X-SITE_NAME}-{X-PLUGIN_NAME}]{X-SUBJECT}({X-ROOM} {X-BBS_NAME})',
 				'mail_fixed_phrase_body' => 'You are receiving this email because a message was posted to BBS.
 Room\'s name:{X-ROOM}
@@ -65,10 +79,9 @@ class BbsMailSettingRecords extends NetCommonsMigration {
 			// * 日本語
 			array(
 				'language_id' => '2',
-				'plugin_key' => 'bbses',
+				'plugin_key' => self::PLUGIN_KEY,
 				'block_key' => null,
 				'type_key' => 'contents',
-				'is_mail_send' => false,
 				'mail_fixed_phrase_subject' => '[{X-SITE_NAME}-{X-PLUGIN_NAME}]{X-SUBJECT}({X-ROOM} {X-BBS_NAME})',
 				'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}に投稿されたのでお知らせします。
 ルーム名:{X-ROOM}
@@ -102,11 +115,6 @@ public function before($direction) {
  * @return bool Should process continue
  */
 	public function after($direction) {
-		foreach ($this->records as $model => $records) {
-			if (!$this->updateRecords($model, $records)) {
-				return false;
-			}
-		}
-		return true;
+		return parent::updateAndDelete($direction, self::PLUGIN_KEY);
 	}
 }
diff --git a/Test/Case/Controller/BbsMailSettingsController/EditTest.php b/Test/Case/Controller/BbsMailSettingsController/EditTest.php
@@ -31,6 +31,7 @@ class BbsMailSettingsControllerEditTest extends NetCommonsControllerTestCase {
 		'plugin.bbses.bbs_frame_setting',
 		'plugin.bbses.bbs_setting',
 		'plugin.bbses.bbs',
+		'plugin.mails.mail_setting_fixed_phrase',
 	);
 
 /**