Author: fdesbois Date: 2010-04-02 09:47:50 +0000 (Fri, 02 Apr 2010) New Revision: 412 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java Log: Evo #1960 : send email to admin for new comment on sampleRow Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-02 09:12:15 UTC (rev 411) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-02 09:47:50 UTC (rev 412) @@ -408,7 +408,11 @@ } @Override - public void sendEmail(String to, String subject, String msg) throws EmailException { + public void sendEmail(String to, String subject, String msg) + throws EmailException { + if (log.isInfoEnabled()) { + log.info("Send an email to " + to + " : " + subject); + } SimpleEmail email = new SimpleEmail(); email.setHostName(WaoProperty.EMAIL_HOST.getValue()); email.setSmtpPort(Integer.parseInt(WaoProperty.EMAIL_PORT.getValue())); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-04-02 09:12:15 UTC (rev 411) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-04-02 09:47:50 UTC (rev 412) @@ -23,6 +23,8 @@ EMAIL_PORT("wao.email.port"), /** From for email **/ EMAIL_FROM("wao.email.from"), + /** Contact email (same as from) **/ + EMAIL_CONTACT(EMAIL_FROM.getKey()), /** App version **/ APP_VERSION("wao.version"), /** Server path **/ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-02 09:12:15 UTC (rev 411) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-02 09:47:50 UTC (rev 412) @@ -4,6 +4,7 @@ import fr.ifremer.wao.entity.ActivityCalendar; import java.io.IOException; import java.util.Date; +import org.apache.commons.mail.EmailException; import org.apache.log4j.Level; import org.apache.log4j.PatternLayout; import org.apache.log4j.RollingFileAppender; @@ -129,6 +130,11 @@ return context.beginTransaction(); } + public static void sendEmail(String to, String subject, String msg) + throws EmailException { + context.sendEmail(to, subject, msg); + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-02 09:12:15 UTC (rev 411) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-02 09:47:50 UTC (rev 412) @@ -24,6 +24,8 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoProperty; +import fr.ifremer.wao.bean.UserRole; import java.io.Serializable; import java.util.ArrayList; import java.util.Calendar; @@ -300,8 +302,8 @@ public void saveSampleRowLog(SampleRowLog rowLog) throws WaoException { TopiaContext transaction = null; try { - if (log.isInfoEnabled()) { - WaoUser author = rowLog.getAuthor(); + WaoUser author = rowLog.getAuthor(); + if (log.isInfoEnabled()) { log.info("W:[ saveSampleRowLog ] : " + "authorName = " + author.getFullName() + " _ authorRole = " + author.getUserRole()); @@ -317,7 +319,24 @@ transaction.commitTransaction(); // Send mail to admin if author is a coordinator : - // WaoContext.PROP_EMAIL_FROM + if (author.getUserRole().equals(UserRole.COORDINATOR)) { + String sampleRowCode = rowLog.getSampleRow().getCode(); + String to = WaoProperty.EMAIL_CONTACT.getValue(); + String subject = "[WAO] Ajout d'un commentaire sur la ligne " + + sampleRowCode; + String msg = "Bonjour,\n\n" + + "Un nouveau commentaire a été ajouté par " + + author.getFullName() + " de la société " + + author.getCompany().getName() + " :\n " + + "\t" + rowLog.getComment() + "\n\n" + + "Vous pouvez consulter l'historique de la ligne " + + sampleRowCode + " sur la page :\n" + + "http://" + WaoProperty.SERVER_PATH.getValue() + + "/samplerowhistoric/" + sampleRowCode + "\n\n" + + "Cordialement,\n\n" + + "L'Equipe WAO"; + WaoUtils.sendEmail(to, subject, msg); + } } catch (Exception eee) { WaoUtils.treateError(transaction, eee,