This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 12ab91ad0501a52c8378c64927f887022aea9c44 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 23 16:34:44 2015 +0100 correction lenteurs recherche archives --- .../persistence/entities/EmailTopiaDao.java | 10 ++++----- .../services/service/EmailServiceImpl.java | 26 +--------------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index cf30a4a..68b036c 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -480,14 +480,14 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { return result; } - public Collection<Email> findArchivedEmails(String commandQuotationNumber, Collection<MailFolder> folders) { + public Collection<Email> findArchivedEmails(String commandQuotationNumber, String company) { StringBuilder query = new StringBuilder(); Map<String, Object> args = new HashMap<>(); Set<Email> result = new HashSet<>(); - query.append(newFromClause("E") + " WHERE E." + Email.PROPERTY_MAIL_FOLDER + " in (:folders)"); - args.put("folders", folders); + query.append(newFromClause("E") + " WHERE E." + Email.PROPERTY_MAIL_FOLDER + "." + MailFolder.PROPERTY_COMPANY + " = (:company)"); + args.put("company", company); query.append(" AND E." + Email.PROPERTY_DEMAND_STATUS + " = :archiveStatus"); args.put("archiveStatus", DemandStatus.ARCHIVED); @@ -502,7 +502,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { StringBuilder query1 = new StringBuilder(query); query1.append(" AND (EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); - query1.append(" AND lower(RR." + RangeRow.PROPERTY_COMMAND_NUMBER + ") LIKE lower(:" + SearchFilter.PROPERTY_COMMAND_NB + "))"); + query1.append(" AND RR." + RangeRow.PROPERTY_COMMAND_NUMBER + " LIKE :" + SearchFilter.PROPERTY_COMMAND_NB + ")"); args.put(SearchFilter.PROPERTY_COMMAND_NB, "%" + commandQuotationNumber + "%"); @@ -511,7 +511,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { result.addAll(this.<Email>findAll(query1.toString(), args)); StringBuilder query2 = new StringBuilder(query); - query2.append(" AND (lower(E." + Email.PROPERTY_COMPANY_REFERENCE + ") LIKE lower(:" + SearchFilter.PROPERTY_COMMAND_NB + ")"); + query2.append(" AND (E." + Email.PROPERTY_COMPANY_REFERENCE + " LIKE :" + SearchFilter.PROPERTY_COMMAND_NB); query2.append(")"); result.addAll(this.<Email>findAll(query2.toString(), args)); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index f16c517..e3aa7d6 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -987,32 +987,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe Preconditions.checkArgument(StringUtils.isNotBlank(commandQuotationNumber)); Preconditions.checkArgument(StringUtils.isNotBlank(company)); - MailFolderTopiaDao mailFolderDao = getPersistenceContext().getMailFolderDao(); - Collection<MailFolder> companyFolders = mailFolderDao.forCompanyEquals(company).findAll(); - Set<MailFolder> archiveFolders = new HashSet<>(companyFolders); -// for (MailFolder folder : companyFolders) { -// Collection<MailFolder> children = folder.getChildren(); -// if (children != null) { -// for (MailFolder child : children) { -// findCompanyFoldersChildren(child, archiveFolders); -// } -// } -// } - EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - return emailDao.findArchivedEmails(commandQuotationNumber, archiveFolders); - } - - protected void findCompanyFoldersChildren(MailFolder folder, Set<MailFolder> archiveFolders) { - if (!folder.isUseCurrentLevelCompany()) { - archiveFolders.add(folder); - Collection<MailFolder> children = folder.getChildren(); - if (children != null) { - for (MailFolder child : children) { - findCompanyFoldersChildren(child, archiveFolders); - } - } - } + return emailDao.findArchivedEmails(commandQuotationNumber, company); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.