From bc93cc9d20919110e01335bd23694931bbe1b37d Mon Sep 17 00:00:00 2001
From: dheeyi william <dheeyi@gmail.com>
Date: Wed, 15 Mar 2017 13:31:28 -0400
Subject: [PATCH 1/2] HOR-2870 Slow query detected when a case is deleted
 (APP_MESSAGE table)

---
 workflow/engine/config/schema.xml     | 3 +++
 workflow/engine/data/mysql/schema.sql | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index bf73a609d..184b6da82 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -337,6 +337,9 @@
     <column name="APP_MSG_SEND_DATE" type="TIMESTAMP" required="true"/>
     <column name="APP_MSG_SHOW_MESSAGE" type="TINYINT" required="true" default="1"/>
     <column name="APP_MSG_ERROR" type="LONGVARCHAR" required="false"/>
+    <index name="indexForAppUid">
+      <index-column name="APP_UID"/>
+    </index>
   </table>
   <table name="APP_OWNER">
     <vendor type="mysql">
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index adff561d6..e01e78dce 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -161,7 +161,8 @@ CREATE TABLE `APP_MESSAGE`
 	`APP_MSG_SEND_DATE` DATETIME  NOT NULL,
 	`APP_MSG_SHOW_MESSAGE` TINYINT default 1 NOT NULL,
 	`APP_MSG_ERROR` MEDIUMTEXT,
-	PRIMARY KEY (`APP_MSG_UID`)
+	PRIMARY KEY (`APP_MSG_UID`),
+	KEY `indexForAppUid`(`APP_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
 #-----------------------------------------------------------------------------
 #-- APP_OWNER

From 0519a1515f6144347871375f299630ebd24e7719 Mon Sep 17 00:00:00 2001
From: dheeyi william <dheeyi@gmail.com>
Date: Thu, 16 Mar 2017 09:37:12 -0400
Subject: [PATCH 2/2] HOR-2881 Notifications: Default email account is not
 working when export the process

---
 workflow/engine/classes/class.case.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index d4cc5db0c..76b7b67d3 100644
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -5357,8 +5357,9 @@ class Cases
                 if (!class_exists('System')) {
                     G::LoadClass('system');
                 }
-                $aConfiguration = ($aTaskInfo['TAS_EMAIL_SERVER_UID'] != '') ?
-                    $eServer->getEmailServer($aTaskInfo['TAS_EMAIL_SERVER_UID'], true) : $eServer->getEmailServerDefault();
+                $aConfiguration = (!is_null(\EmailServerPeer::retrieveByPK($aTaskInfo['TAS_EMAIL_SERVER_UID']))) ?
+                    $eServer->getEmailServer($aTaskInfo['TAS_EMAIL_SERVER_UID'], true) :
+                    $eServer->getEmailServerDefault();
                 $msgError = '';
                 if (empty($aConfiguration)) {
                     $msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION');
@@ -5440,8 +5441,9 @@ class Cases
                 if (!class_exists('System')) {
                     G::LoadClass('system');
                 }
-                $aConfiguration = ($aTaskInfo['TAS_RECEIVE_SERVER_UID'] != '') ?
-                    $eServer->getEmailServer($aTaskInfo['TAS_RECEIVE_SERVER_UID'], true) : $eServer->getEmailServerDefault();
+                $aConfiguration = (!is_null(\EmailServerPeer::retrieveByPK($aTaskInfo['TAS_RECEIVE_SERVER_UID']))) ?
+                    $eServer->getEmailServer($aTaskInfo['TAS_RECEIVE_SERVER_UID'], true) :
+                    $eServer->getEmailServerDefault();
                 $msgError = '';
                 if (empty($aConfiguration)) {
                     $msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION');