Messaging engine email sending and replacing placeholder tags

cmsWebApp/src/performa/batch/MessagingEngineBatch.java

@@ -14,9 +14,12 @@ import oneit.objstore.ObjectTransaction;
 import oneit.objstore.StorageException;
 import oneit.objstore.rdbms.filters.LessThanEqualFilter;
 import oneit.utils.InitialisationException;
+import oneit.utils.StringUtils;
 import oneit.utils.parsers.FieldException;
+import performa.orm.JobApplication;
 import performa.orm.ScheduledEmail;
 import performa.orm.SentEmail;
+import performa.orm.types.PlaceholderOptions;
 
 
 public class MessagingEngineBatch extends ORMBatch implements InitialisationParticipant
@@ -34,25 +37,48 @@ public class MessagingEngineBatch extends ORMBatch implements InitialisationPart
         
         for (ScheduledEmail scheduledEmail : scheduledEmails)
         {
-            String          messageContent      =   scheduledEmail.getMessageContent();
+            LogMgr.log (MESSAGING_ENGINE_BATCH, LogLevel.PROCESSING1, "Starting to create email for scheduled email : " , scheduledEmail);
+            
+            JobApplication  jobApplication      =   scheduledEmail.getJobApplication();
             // replace tags
+            String          messageContent      =   StringUtils.replace(scheduledEmail.getMessageContent(), 
+                                                                new String[] {PlaceholderOptions.FIRST_NAME.getPlaceholder(), 
+                                                                                PlaceholderOptions.SURNAME.getPlaceholder(), 
+                                                                                PlaceholderOptions.EMAIL_ADDRESS.getPlaceholder(), 
+                                                                                PlaceholderOptions.LOCATION.getPlaceholder(), 
+                                                                                PlaceholderOptions.JOB_TITLE.getPlaceholder(), 
+                                                                                PlaceholderOptions.JOB_REFERENCE.getPlaceholder()},
+                                                                new String[] {jobApplication.getCandidate().getFirstName(), 
+                                                                                jobApplication.getCandidate().getUser().getLastName(), 
+                                                                                jobApplication.getCandidate().getUser().getEmail(), 
+                                                                                jobApplication.getJob().getGoogleAddressText(), 
+                                                                                jobApplication.getJob().getJobTitle(), 
+                                                                                jobApplication.getJob().getReferenceNumber()});
+            
+            LogMgr.log (MESSAGING_ENGINE_BATCH, LogLevel.PROCESSING1, "Replaced tags of message content : " , messageContent);
             
-            TextDataSource  mesgBodyDataSource  =   new TextDataSource(messageContent);               
-            String          toEmail             =   scheduledEmail.getJobApplication().getCandidate().getUser().getEmail();
-            String          fromEmail           =   scheduledEmail.getJobApplication().getJob().getCreatedBy().getUser().getEmail();
+            TextDataSource  mesgBodyDataSource  =   new TextDataSource(StringUtils.fromHTML(messageContent));               
+            String          toEmail             =   jobApplication.getCandidate().getUser().getEmail();
+            String          fromEmail           =   jobApplication.getJob().getCreatedBy().getUser().getEmail();
             SentEmail       sentEmail           =   SentEmail.createSentEmail(ot);
             
             emailEngine.sendEmail(new String[] {toEmail}, fromEmail, scheduledEmail.getSubject() , new DataSource[]{mesgBodyDataSource});
             
+            LogMgr.log (MESSAGING_ENGINE_BATCH, LogLevel.PROCESSING1, "Email sent to : " , toEmail, " from : ", fromEmail);
+            
             sentEmail.setSubject(scheduledEmail.getSubject());
             sentEmail.setSentDate(new Date());
             sentEmail.setApplicationStatus(scheduledEmail.getApplicationStatus());
             sentEmail.setMessageContent(messageContent);
             sentEmail.setEmailTo(toEmail);
-            sentEmail.setJobApplication(scheduledEmail.getJobApplication());
+            sentEmail.setJobApplication(jobApplication);
+                    
+            LogMgr.log (MESSAGING_ENGINE_BATCH, LogLevel.PROCESSING1, "SentEmail object created to store sent email details : " , sentEmail);
             
             scheduledEmail.delete();
         }
+        
+        LogMgr.log (MESSAGING_ENGINE_BATCH, LogLevel.PROCESSING1, "End of Messaging Engine Batch");
     }
     
     @Override

cmsWebApp/src/performa/orm/JobApplication.java

@@ -67,7 +67,7 @@ public class JobApplication extends BaseJobApplication
                         TimeZone    jobTimeZone =   getJob().getHiringTeam().getCompany().getDefaultTimeZone();
                         Calendar    cal         =   new GregorianCalendar();
                         
-                        cal.setTime(now);
+                        cal.setTime(scheduledDate);
                         
                         scheduledDate   =   MessagingUtils.getWithinBusinessHours(cal, jobTimeZone != null ? java.util.TimeZone.getTimeZone(jobTimeZone.getTimeZoneCode()) : cal.getTimeZone());
                     }