- Faxtomail-commits - mailman.cloud.codelutin.com

r244 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 17:26:54 +0200 (Fri, 20 Jun 2014) New Revision: 244 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/244 Log: Surcharge des delete() topia qui font n'importe quoi Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 14:29:53 UTC (rev 243) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 15:26:54 UTC (rev 244) @@ -34,6 +34,11 @@ @Override public void delete(EtatAttente entity) { + // code from AbstractTopiaDao + topiaJpaSupport.delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + // do nothing just to disable strange topia code // org.postgresql.util.PSQLException: Le nom de colonne topiaVersion n'a pas été trouvé dans ce ResultSet. // org.postgresql.jdbc2.AbstractJdbc2ResultSet.findColumn(AbstractJdbc2ResultSet.java:2728) Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java 2014-06-20 15:26:54 UTC (rev 244) @@ -0,0 +1,26 @@ +package com.franciaflex.faxtomail.persistence.entities; + +public class MailFilterTopiaDao extends AbstractMailFilterTopiaDao<MailFilter> { + + @Override + public void delete(MailFilter entity) { + + // code from AbstractTopiaDao + topiaJpaSupport.delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + +// do nothing just to disable strange topia code +// org.hibernate.PropertyValueException: not-null property references a null or transient value : com.franciaflex.faxtomail.persistence.entities.MailFilterImpl.mailFolder +// org.hibernate.engine.internal.Nullability.checkNullability(Nullability.java:106) +// org.hibernate.event.internal.DefaultDeleteEventListener.deleteEntity(DefaultDeleteEventListener.java:279) +// org.hibernate.event.internal.DefaultDeleteEventListener.onDelete(DefaultDeleteEventListener.java:160) +// org.hibernate.event.internal.DefaultDeleteEventListener.onDelete(DefaultDeleteEventListener.java:73) +// org.hibernate.internal.SessionImpl.fireDelete(SessionImpl.java:920) +// org.hibernate.internal.SessionImpl.delete(SessionImpl.java:896) +// org.nuiton.topia.persistence.internal.support.HibernateTopiaJpaSupport.delete(HibernateTopiaJpaSupport.java:218) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao.delete(AbstractTopiaDao.java:335) + + } + +} //MailFilterTopiaDao Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java 2014-06-20 15:26:54 UTC (rev 244) @@ -0,0 +1,28 @@ +package com.franciaflex.faxtomail.persistence.entities; + +public class MailFolderTopiaDao extends AbstractMailFolderTopiaDao<MailFolder> { + + @Override + public void delete(MailFolder entity) { + + // code from AbstractTopiaDao + topiaJpaSupport.delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + +// do nothing just to disable strange topia code +// org.nuiton.topia.persistence.TopiaException: An error occurs during query operation: from com.franciaflex.faxtomail.persistence.entities.Email topiaEntity_ where topiaEntity_.mailFolder = :mailFolder0 : not-null property references a null or transient value : com.franciaflex.faxtomail.persistence.entities.MailFilterImpl.mailFolder +// org.nuiton.topia.persistence.internal.support.HibernateTopiaJpaSupport.findAll(HibernateTopiaJpaSupport.java:116) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao.findAll(AbstractTopiaDao.java:540) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao$InnerTopiaQueryBuilderRunQueryStep.findAll(AbstractTopiaDao.java:1084) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao$InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep.findAll(AbstractTopiaDao.java:944) +// com.franciaflex.faxtomail.persistence.entities.GeneratedMailFolderTopiaDao.delete(GeneratedMailFolderTopiaDao.java:59) +// com.franciaflex.faxtomail.persistence.entities.GeneratedMailFolderTopiaDao.delete(GeneratedMailFolderTopiaDao.java:1) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao.deleteAll(AbstractTopiaDao.java:343) +// com.franciaflex.faxtomail.services.service.ConfigurationService.saveMailFolders(ConfigurationService.java:239) +// com.franciaflex.faxtomail.services.service.ConfigurationService.save(ConfigurationService.java:139) +// com.franciaflex.faxtomail.web.action.admin.ConfigurationAction.execute(ConfigurationAction.java:126) + + } + +} //MailFolderTopiaDao Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r243 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 16:29:53 +0200 (Fri, 20 Jun 2014) New Revision: 243 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/243 Log: Override ugly topia generated code Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 13:35:32 UTC (rev 242) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 14:29:53 UTC (rev 243) @@ -30,6 +30,42 @@ public class EtatAttenteTopiaDao extends AbstractEtatAttenteTopiaDao<EtatAttente> { + + @Override + public void delete(EtatAttente entity) { + +// do nothing just to disable strange topia code +// org.postgresql.util.PSQLException: Le nom de colonne topiaVersion n'a pas été trouvé dans ce ResultSet. +// org.postgresql.jdbc2.AbstractJdbc2ResultSet.findColumn(AbstractJdbc2ResultSet.java:2728) +// org.postgresql.jdbc2.AbstractJdbc2ResultSet.getLong(AbstractJdbc2ResultSet.java:2594) +// com.mchange.v2.c3p0.impl.NewProxyResultSet.getLong(NewProxyResultSet.java:2625) +// org.hibernate.type.descriptor.sql.BigIntTypeDescriptor$2.doExtract(BigIntTypeDescriptor.java:74) +// org.hibernate.type.descriptor.sql.BasicExtractor.extract(BasicExtractor.java:64) +// org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:267) +// org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:263) +// org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:253) +// org.hibernate.type.AbstractStandardBasicType.hydrate(AbstractStandardBasicType.java:338) +// org.hibernate.persister.entity.AbstractEntityPersister.hydrate(AbstractEntityPersister.java:2969) +// org.hibernate.loader.Loader.loadFromResultSet(Loader.java:1695) +// org.hibernate.loader.Loader.instanceNotYetLoaded(Loader.java:1627) +// org.hibernate.loader.Loader.getRow(Loader.java:1514) +// org.hibernate.loader.Loader.getRowFromResultSet(Loader.java:725) +// org.hibernate.loader.Loader.processResultSet(Loader.java:952) +// org.hibernate.loader.Loader.doQuery(Loader.java:920) +// org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:354) +// org.hibernate.loader.Loader.doList(Loader.java:2553) +// org.hibernate.loader.Loader.doList(Loader.java:2539) +// org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2369) +// org.hibernate.loader.Loader.list(Loader.java:2364) +// org.hibernate.loader.custom.CustomLoader.list(CustomLoader.java:353) +// org.hibernate.internal.SessionImpl.listCustomQuery(SessionImpl.java:1873) +// org.hibernate.internal.AbstractSessionImpl.list(AbstractSessionImpl.java:311) +// org.hibernate.internal.SQLQueryImpl.list(SQLQueryImpl.java:141) +// com.franciaflex.faxtomail.persistence.entities.GeneratedEtatAttenteTopiaDao.delete(GeneratedEtatAttenteTopiaDao.java:65) +// com.franciaflex.faxtomail.persistence.entities.GeneratedEtatAttenteTopiaDao.delete(GeneratedEtatAttenteTopiaDao.java:1) + + } + public Map<String, Long> getEtatAttenteCountByFolder() { String query = "SELECT etatAttente.topiaId, count(*) FROM " + Email.class.getName() + " group by etatAttente.topiaId";

1 0

r242 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 15:35:32 +0200 (Fri, 20 Jun 2014) New Revision: 242 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/242 Log: Fix NPE Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-20 09:44:35 UTC (rev 241) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-20 13:35:32 UTC (rev 242) @@ -139,12 +139,13 @@ protected void populateUser(FaxToMailSession faxToMailSession, FaxToMailServiceContext serviceContext) { if (StringUtils.isNotBlank(faxToMailSession.getAuthenticatedUserId())) { LdapService ldapService = serviceContext.newService(LdapService.class); + // return can be null FaxToMailUser user = ldapService.getUserBean(faxToMailSession.getAuthenticatedUserId()); faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); - if (CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { + if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { for (FaxToMailUserGroup group : user.getUserGroups()) { if (adminGroups.contains(group.getFullPath())) { faxToMailSession.setAdmin(true);

1 0

r241 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 11:44:35 +0200 (Fri, 20 Jun 2014) New Revision: 241 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/241 Log: Fix filters accordion Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:38:28 UTC (rev 240) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:44:35 UTC (rev 241) @@ -767,48 +767,51 @@ <div id="tabs-filters" class="tab-pane" ng-controller="ConfigurationFilterController"> <input type="hidden" name="mailFiltersJson" value="{{mailFilters}}" /> - <div class="panel panel-default"> - <div class="panel-heading" ng-repeat-start="mailFolder in mailFolders"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#mailFilerAccordion{{$index}}"> - Filtre du dossier {{mailFolder.name}} - </a> - </h4> - </div> - <div id="mailFilerAccordion{{$index}}" class="panel-collapse collapse" ng-repeat-end> - <div class="panel-body"> - <table class="table table-hover table-bordered"> - <thead> - <tr> - <th>Filtre</th> - <th>Dossier</th> - <th/> - </tr> - </thead> - <tbody ui-sortable="sortableOptions" ng-model="rootFolderMailFilters[mailFolder.topiaId]"> - <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> - <td>{{mailFilter.expression}}</td> - <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> - <span class="glyphicon glyphicon-remove"></span> - </a></td> - </tr> - </tbody> - </table> - - <div role="form"> - <div class="form-group"> - <label for="filterField">Filtre</label> - <input type="text" class="form-control" id="folderField" ng-model="newFilter.expression"> + <div class="panel-group" id="accordionFilters"> + + <div class="panel panel-default" ng-repeat="mailFolder in mailFolders"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordionFilters" href="#mailFilerAccordion{{$index}}"> + Filtre du dossier {{mailFolder.name}} + </a> + </h4> + </div> + <div id="mailFilerAccordion{{$index}}" class="panel-collapse collapse"> + <div class="panel-body"> + <table class="table table-hover table-bordered"> + <thead> + <tr> + <th>Filtre</th> + <th>Dossier</th> + <th/> + </tr> + </thead> + <tbody ui-sortable="sortableOptions" ng-model="rootFolderMailFilters[mailFolder.topiaId]"> + <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> + <td>{{mailFilter.expression}}</td> + <td>{{mailFilter.mailFolder.$fullPath}}</td> + <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> + <span class="glyphicon glyphicon-remove"></span> + </a></td> + </tr> + </tbody> + </table> + + <div role="form"> + <div class="form-group"> + <label for="filterField">Filtre</label> + <input type="text" class="form-control" id="folderField" ng-model="newFilter.expression"> + </div> + <div class="form-group"> + <label for="folderField">Dossier</label> + <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> + </div> </div> - <div class="form-group"> - <label for="folderField">Dossier</label> - <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> - </div> + <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> + <i class="glyphicon glyphicon-plus"></i> Ajouter + </button> </div> - <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> - <i class="glyphicon glyphicon-plus"></i> Ajouter - </button> </div> </div> </div>

1 0

r240 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 11:38:28 +0200 (Fri, 20 Jun 2014) New Revision: 240 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/240 Log: Refactoring de la sauvegarde de la conf pour avoir un seul et unique commit. Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 09:38:28 UTC (rev 240) @@ -46,10 +46,16 @@ import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationImpl; import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.DemandType; +import com.franciaflex.faxtomail.persistence.entities.DemandTypeImpl; +import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountImpl; import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; +import com.franciaflex.faxtomail.persistence.entities.EtatAttente; +import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; +import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; @@ -59,6 +65,8 @@ import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolderImpl; +import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Function; import com.google.common.collect.Lists; @@ -87,37 +95,192 @@ } /** + * Get all mail filter ordered by position. + * + * @return all mail filter + */ + public List<MailFilter> getMailFilters() { + MailFilterTopiaDao mailFilterDao = getPersistenceContext().getMailFilterDao(); + List<MailFilter> result = mailFilterDao.forAll().setOrderByArguments(MailFilter.PROPERTY_POSITION + " asc").findAll(); + return result; + } + + /** * Save configuration. * * @param config configuration to save */ - public void saveConfiguration(Configuration config) { + protected void saveConfiguration(Configuration config) { ConfigurationTopiaDao dao = getPersistenceContext().getConfigurationDao(); if (config.isPersisted()) { config = dao.update(config); } else { config = dao.create(config); } + } + + /** + * Sauve l'ensemble de la configuration. + * + * @param configuration configuration + * @param demandTypes types de demande + * @param etatAttentes etat d'attentes + * @param mailFolders mail folder + * @param mailFilters mail filters + * @param emailAccounts mail accounts + */ + public void save(Configuration configuration, List<DemandType> demandTypes, List<EtatAttente> etatAttentes, List<MailFolder> mailFolders, + List<MailFilter> mailFilters, List<EmailAccount> emailAccounts) { + + saveConfiguration(configuration); + saveDemandTypes(demandTypes); + saveMailFolders(mailFolders); // save before etat d'attente to remove reference + saveEtatAttente(etatAttentes); + saveMailFilters(mailFilters); + saveEmailAccounts(emailAccounts); + + // unique commit pour toute la conf getPersistenceContext().commit(); } + protected void saveDemandTypes(List<DemandType> demandTypes) { + Binder<DemandType, DemandType> binderDemandType = BinderFactory.newBinder(DemandType.class); + DemandTypeTopiaDao demandTypeDAO = getPersistenceContext().getDemandTypeDao(); + + List<DemandType> allDemandType = demandTypeDAO.findAll(); + Map<String, DemandType> allDemandTypeIndex = new HashMap<>(Maps.uniqueIndex(allDemandType, TopiaEntities.getTopiaIdFunction())); + for (DemandType demandType : demandTypes) { + // get current etat attente + DemandType currentDemandType; + if (StringUtils.isBlank(demandType.getTopiaId()) || demandType.getTopiaId().startsWith("new_")) { + currentDemandType = new DemandTypeImpl(); + } else { + currentDemandType = allDemandTypeIndex.remove(demandType.getTopiaId()); + } + + // copy + binderDemandType.copyExcluding(demandType, currentDemandType, + EtatAttente.PROPERTY_TOPIA_ID, + EtatAttente.PROPERTY_TOPIA_CREATE_DATE, + EtatAttente.PROPERTY_TOPIA_VERSION); + + // persist + if (currentDemandType.isPersisted()) { + demandTypeDAO.update(currentDemandType); + } else { + demandTypeDAO.create(currentDemandType); + } + } + } + + protected void saveEtatAttente(Collection<EtatAttente> etatAttentes) { + + Binder<EtatAttente, EtatAttente> binderEtatAttente = BinderFactory.newBinder(EtatAttente.class); + EtatAttenteTopiaDao etatAttenteDAO = getPersistenceContext().getEtatAttenteDao(); + + List<EtatAttente> allEtatAttente = etatAttenteDAO.findAll(); + Map<String, EtatAttente> allEtatAttenteIndex = new HashMap<>(Maps.uniqueIndex(allEtatAttente, TopiaEntities.getTopiaIdFunction())); + for (EtatAttente etatAttente : etatAttentes) { + // get current etat attente + EtatAttente currentEtatAttente; + if (StringUtils.isBlank(etatAttente.getTopiaId()) || etatAttente.getTopiaId().startsWith("new_")) { + currentEtatAttente = new EtatAttenteImpl(); + } else { + currentEtatAttente = allEtatAttenteIndex.remove(etatAttente.getTopiaId()); + } + + // copy + binderEtatAttente.copyExcluding(etatAttente, currentEtatAttente, + EtatAttente.PROPERTY_TOPIA_ID, + EtatAttente.PROPERTY_TOPIA_CREATE_DATE, + EtatAttente.PROPERTY_TOPIA_VERSION); + + // persist + if (currentEtatAttente.isPersisted()) { + etatAttenteDAO.update(currentEtatAttente); + } else { + etatAttenteDAO.create(currentEtatAttente); + } + } + + // delete remaining + etatAttenteDAO.deleteAll(allEtatAttenteIndex.values()); + } + /** - * Get all mail filter ordered by position. + * Save mail folder without commit. * - * @return all mail filter + * @param newMailFolders mail folders */ - public List<MailFilter> getMailFilters() { - MailFilterTopiaDao mailFilterDao = getPersistenceContext().getMailFilterDao(); - List<MailFilter> result = mailFilterDao.forAll().setOrderByArguments(MailFilter.PROPERTY_POSITION + " asc").findAll(); + protected void saveMailFolders(Collection<MailFolder> newMailFolders) { + // get current folders + MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); + List<MailFolder> mailFolders = dao.findAll(); + Map<String, MailFolder> mailFolderMap = new HashMap<>(Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction())); + + // recursive update + saveMailFolders(dao, mailFolderMap, null, newMailFolders); + + // if map is not empty after recursive iteration, remaining folder must be deleted + dao.deleteAll(mailFolderMap.values()); + } + + /** + * Save mail folder without commit. + * + * @param dao + * @param mailFolderMap + * @param parent + * @param mailFolders + * @return + */ + protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, MailFolder> mailFolderMap, + MailFolder parent, Collection<MailFolder> mailFolders) { + + Collection<MailFolder> result = Lists.newArrayList(); + if (mailFolders == null) { + return result; + } + + Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); + for (MailFolder mailFolder : mailFolders) { + + MailFolder currentMailFolder; + if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) { + currentMailFolder = new MailFolderImpl(); + } else { + currentMailFolder = mailFolderMap.remove(mailFolder.getTopiaId()); + } + + binderMailFolder.copyExcluding(mailFolder, currentMailFolder, + MailFolder.PROPERTY_TOPIA_ID, + MailFolder.PROPERTY_TOPIA_CREATE_DATE, + MailFolder.PROPERTY_TOPIA_VERSION, + MailFolder.PROPERTY_CHILDREN, + MailFolder.PROPERTY_PARENT); + + currentMailFolder.setParent(parent); + + if (!currentMailFolder.isPersisted()) { + currentMailFolder = dao.create(currentMailFolder); + } + + Collection<MailFolder> children = saveMailFolders(dao, mailFolderMap, currentMailFolder, mailFolder.getChildren()); + currentMailFolder.setChildren(children); + dao.update(currentMailFolder); + + result.add(currentMailFolder); + } + return result; } /** - * Save all mail filters. + * Save all mail filters without commit. * * @param mailFilters mail filters to save */ - public void saveMailFilters(List<MailFilter> mailFilters) { + protected void saveMailFilters(List<MailFilter> mailFilters) { MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); int position = 0; @@ -146,7 +309,6 @@ } dao.deleteAll(filterById.values()); - getPersistenceContext().commit(); } /** @@ -177,10 +339,11 @@ } /** + * Save email account without commit. * * @param newEmailAccounts new email account list to save */ - public void saveEmailAccounts(List<EmailAccount> newEmailAccounts) { + protected void saveEmailAccounts(List<EmailAccount> newEmailAccounts) { EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); List<EmailAccount> emailAccounts = emailAccountTopiaDao.findAll(); Map<String, EmailAccount> emailAccountMap = new HashMap<>(Maps.uniqueIndex(emailAccounts, TopiaEntities.getTopiaIdFunction())); @@ -213,7 +376,6 @@ } emailAccountTopiaDao.deleteAll(emailAccountMap.values()); - getPersistenceContext().commit(); } public List<FaxToMailUser> getAllUsers() { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-20 09:38:28 UTC (rev 240) @@ -94,62 +94,6 @@ return new ArrayList<MailFolder>(dao.forTopiaIdIn(ids).findAll()); } - public void saveMailFolders(Collection<MailFolder> newMailFolders) { - // get current folders - MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); - List<MailFolder> mailFolders = dao.findAll(); - Map<String, MailFolder> mailFolderMap = new HashMap<>(Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction())); - - // recursive update - saveMailFolders(dao, mailFolderMap, null, newMailFolders); - - // if map is not empty after recursive iteration, remaining folder must be deleted - dao.deleteAll(mailFolderMap.values()); - - getPersistenceContext().commit(); - } - - protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, MailFolder> mailFolderMap, - MailFolder parent, Collection<MailFolder> mailFolders) { - - Collection<MailFolder> result = Lists.newArrayList(); - if (mailFolders == null) { - return result; - } - - Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); - for (MailFolder mailFolder : mailFolders) { - - MailFolder currentMailFolder; - if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) { - currentMailFolder = new MailFolderImpl(); - } else { - currentMailFolder = mailFolderMap.remove(mailFolder.getTopiaId()); - } - - binderMailFolder.copyExcluding(mailFolder, currentMailFolder, - MailFolder.PROPERTY_TOPIA_ID, - MailFolder.PROPERTY_TOPIA_CREATE_DATE, - MailFolder.PROPERTY_TOPIA_VERSION, - MailFolder.PROPERTY_CHILDREN, - MailFolder.PROPERTY_PARENT); - - currentMailFolder.setParent(parent); - - if (!currentMailFolder.isPersisted()) { - currentMailFolder = dao.create(currentMailFolder); - } - - Collection<MailFolder> children = saveMailFolders(dao, mailFolderMap, currentMailFolder, mailFolder.getChildren()); - currentMailFolder.setChildren(children); - dao.update(currentMailFolder); - - result.add(currentMailFolder); - } - - return result; - } - public Collection<MailFolder> getFoldersWithEtatAttente(EtatAttente etatAttente) { Collection<MailFolder> result = new HashSet<>(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-20 09:38:28 UTC (rev 240) @@ -103,74 +103,6 @@ return result; } - public void saveEtatAttente(Collection<EtatAttente> etatAttentes) { - - Binder<EtatAttente, EtatAttente> binderEtatAttente = BinderFactory.newBinder(EtatAttente.class); - EtatAttenteTopiaDao etatAttenteDAO = getPersistenceContext().getEtatAttenteDao(); - - List<EtatAttente> allEtatAttente = getAllEtatAttente(); - Map<String, EtatAttente> allEtatAttenteIndex = new HashMap<>(Maps.uniqueIndex(allEtatAttente, TopiaEntities.getTopiaIdFunction())); - for (EtatAttente etatAttente : etatAttentes) { - // get current etat attente - EtatAttente currentEtatAttente; - if (StringUtils.isBlank(etatAttente.getTopiaId()) || etatAttente.getTopiaId().startsWith("new_")) { - currentEtatAttente = new EtatAttenteImpl(); - } else { - currentEtatAttente = allEtatAttenteIndex.remove(etatAttente.getTopiaId()); - } - - // copy - binderEtatAttente.copyExcluding(etatAttente, currentEtatAttente, - EtatAttente.PROPERTY_TOPIA_ID, - EtatAttente.PROPERTY_TOPIA_CREATE_DATE, - EtatAttente.PROPERTY_TOPIA_VERSION); - - // persist - if (currentEtatAttente.isPersisted()) { - etatAttenteDAO.update(currentEtatAttente); - } else { - etatAttenteDAO.create(currentEtatAttente); - } - } - - // delete remaining - etatAttenteDAO.deleteAll(allEtatAttenteIndex.values()); - - getPersistenceContext().commit(); - } - - public void saveDemandTypes(List<DemandType> demandTypes) { - Binder<DemandType, DemandType> binderDemandType = BinderFactory.newBinder(DemandType.class); - DemandTypeTopiaDao demandTypeDAO = getPersistenceContext().getDemandTypeDao(); - - List<DemandType> allDemandType = getAllDemandType(); - Map<String, DemandType> allDemandTypeIndex = new HashMap<>(Maps.uniqueIndex(allDemandType, TopiaEntities.getTopiaIdFunction())); - for (DemandType demandType : demandTypes) { - // get current etat attente - DemandType currentDemandType; - if (StringUtils.isBlank(demandType.getTopiaId()) || demandType.getTopiaId().startsWith("new_")) { - currentDemandType = new DemandTypeImpl(); - } else { - currentDemandType = allDemandTypeIndex.remove(demandType.getTopiaId()); - } - - // copy - binderDemandType.copyExcluding(demandType, currentDemandType, - EtatAttente.PROPERTY_TOPIA_ID, - EtatAttente.PROPERTY_TOPIA_CREATE_DATE, - EtatAttente.PROPERTY_TOPIA_VERSION); - - // persist - if (currentDemandType.isPersisted()) { - demandTypeDAO.update(currentDemandType); - } else { - demandTypeDAO.create(currentDemandType); - } - } - - getPersistenceContext().commit(); - } - public List<Client> getAllClients() { ClientTopiaDao dao = getPersistenceContext().getClientDao(); return new ArrayList<>(dao.findAll()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-20 09:38:28 UTC (rev 240) @@ -67,7 +67,6 @@ import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import org.nuiton.util.DesktopUtil; import org.nuiton.util.FileUtil; import com.franciaflex.faxtomail.persistence.entities.Attachment; Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:38:28 UTC (rev 240) @@ -123,12 +123,7 @@ public String execute() throws Exception { String result = super.execute(); - configurationService.saveConfiguration(configuration); - referentielService.saveDemandTypes(demandTypes); - mailFolderService.saveMailFolders(mailFolders); // before etat attente - referentielService.saveEtatAttente(etatAttentes); - configurationService.saveMailFilters(mailFilters); - configurationService.saveEmailAccounts(emailAccounts); + configurationService.save(configuration, demandTypes, etatAttentes, mailFolders, mailFilters, emailAccounts); return result; }

1 0

r239 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web/action/admin webapp/WEB-INF/content/admin webapp/js
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 11:16:31 +0200 (Fri, 20 Jun 2014) New Revision: 239 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/239 Log: Correction d'un bug si les etats d'attente supprim?\195?\169s sont utilis?\195?\169s par la configuration des mailFolders Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:14:33 UTC (rev 238) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:16:31 UTC (rev 239) @@ -124,9 +124,9 @@ String result = super.execute(); configurationService.saveConfiguration(configuration); + referentielService.saveDemandTypes(demandTypes); + mailFolderService.saveMailFolders(mailFolders); // before etat attente referentielService.saveEtatAttente(etatAttentes); - referentielService.saveDemandTypes(demandTypes); - mailFolderService.saveMailFolders(mailFolders); configurationService.saveMailFilters(mailFilters); configurationService.saveEmailAccounts(emailAccounts); Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:14:33 UTC (rev 238) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:16:31 UTC (rev 239) @@ -155,7 +155,7 @@ ng-click="editEtatAttente(etatAttente)"> <td>{{etatAttente.label}} - <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteEtatAttente($index)" + <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteEtatAttente(etatAttente, $index)" ng-disabled="etatAttentesUsage[etatAttente.topiaId] > 0" tooltip="{{etatAttentesUsage[etatAttente.topiaId] > 0 && 'Cet état d\'attente est utilisé et ne peut pas être supprimé'|| 'Supprimer cet état d\'attente'}}"> <span class="glyphicon glyphicon-remove"></span></a> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 09:14:33 UTC (rev 238) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 09:16:31 UTC (rev 239) @@ -174,12 +174,31 @@ }; // suppression d'un etat d'attente non utilisé - $scope.deleteEtatAttente = function(index) { + $scope.deleteEtatAttente = function(etatAttente, index) { if ($window.confirm("Êtes-vous sûr de vouloir supprimer cet état d'attente ?")) { $scope.etatAttentes.splice(index, 1); } + + // suppression de cet etat d'attente dans les mail folder (sinon, ca fait + // un resauvegarde d'un etat d'attente supprimé et donc un bug) + removeEtatAttenteFromMailFolder(etatAttente, $scope.mailFolders); }; + // suppression de cet etat d'attente dans les mail folder (sinon, ca fait + // un resauvegarde d'un etat d'attente supprimé et donc un bug) + var removeEtatAttenteFromMailFolder = function(etatAttente, mailFolders) { + if (mailFolders) { + angular.forEach(mailFolders, function(mailFolder) { + var index = mailFolder.etatAttentes.indexOfByTopiaId(etatAttente); + if (index != -1) { + console.log("Remove etat from " + mailFolder.name); + mailFolder.etatAttentes.splice(index, 1); + } + removeEtatAttenteFromMailFolder(etatAttente, mailFolder.children); + }); + } + }; + // selection/deselection d'une action $scope.changeEtatAttenteValidAction = function(action) { var index = $scope.selectedEtatAttente.validFormDisabledActions.indexOf(action);

1 0

r238 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 11:14:33 +0200 (Fri, 20 Jun 2014) New Revision: 238 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/238 Log: Remove tests Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-20 07:58:45 UTC (rev 237) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-20 09:14:33 UTC (rev 238) @@ -37,10 +37,6 @@ return _p8() + _p8(true) + _p8(true) + _p8(); } -console.log("abc" === "abc");// true -console.log("abc" === new String("abc")); // false -console.log(new String("abc") === new String("abc")); // false - /** * Même fonction que indexOf mais qui compare par topiaId au lieu des références. */

1 0

r237 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 09:58:45 +0200 (Fri, 20 Jun 2014) New Revision: 237 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/237 Log: Gestion du cas o?\195?\185 le pdf convertit est vide Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 16:09:40 UTC (rev 236) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-20 07:58:45 UTC (rev 237) @@ -64,6 +64,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -468,10 +469,17 @@ // read output to save into attachment byte[] outContent = FileUtils.readFileToByteArray(outfile); - AttachmentFile editedFile = new AttachmentFileImpl(); - editedFile.setContent(outContent); - editedFile.setFilename(basename + "-converted.pdf"); - attachment.setEditedFile(editedFile); + + // on va dire que normalement un pdf ca fait plus de 1 octet + if (outContent.length >= 1) { + AttachmentFile editedFile = new AttachmentFileImpl(); + editedFile.setContent(outContent); + editedFile.setFilename(basename + "-converted.pdf"); + attachment.setEditedFile(editedFile); + } else if (log.isWarnEnabled()) { + log.warn("Can't convert extension to pdf (content is empty)"); + } + } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Cannot run convert command", e);

1 0

r236 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 18:09:40 +0200 (Thu, 19 Jun 2014) New Revision: 236 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/236 Log: Conversion des pi?\195?\168ces jointes en PDF ?\195?\160 la r?\195?\169ception Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-19 15:08:04 UTC (rev 235) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-19 16:09:40 UTC (rev 236) @@ -67,6 +67,7 @@ import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; +import org.nuiton.util.DesktopUtil; import org.nuiton.util.FileUtil; import com.franciaflex.faxtomail.persistence.entities.Attachment; Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 15:08:04 UTC (rev 235) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 16:09:40 UTC (rev 236) @@ -26,6 +26,8 @@ import static org.nuiton.i18n.I18n.t; +import java.io.File; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.text.DateFormat; @@ -53,27 +55,33 @@ import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; -import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.services.service.ClientService; - +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.Charsets; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailImpl; +import com.franciaflex.faxtomail.persistence.entities.ExtensionCommand; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -88,6 +96,7 @@ protected FaxToMailServiceContext serviceContext; + protected ConfigurationService configurationService; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = getServiceContext(jobExecutionContext); @@ -96,7 +105,7 @@ log.debug("Running MailFilterJob at " + serviceContext.getNow()); } - ConfigurationService configurationService = serviceContext.newService(ConfigurationService.class); + configurationService = serviceContext.newService(ConfigurationService.class); Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); for (EmailAccount account : emailAccounts) { @@ -373,6 +382,7 @@ DataHandler dh = bp.getDataHandler(); + // create new attachment Attachment attachment = new AttachmentImpl(); attachment.setAddedByUser(false); AttachmentFile attachmentFile = emailService.getAttachmentFileFromStream(dh.getInputStream()); @@ -380,7 +390,10 @@ attachment.setOriginalFile(attachmentFile); attachment.setContentId(contentID); - //email.addAttachment(attachment); + // convert attachment if defined by admin + convertIfNecessary(attachment); + + // save attachment attachments.add(attachment); } } @@ -392,4 +405,83 @@ Charset charset = Charsets.toCharset(charsetName); return charset; } + + /** + * Retourne un input stream sur une piece jointe convertie ou pas. + * + * @param attachment to convert + * @return attachment + * @throws IOException + */ + protected Attachment convertIfNecessary(Attachment attachment) throws IOException { + + // get file extension + String filename = attachment.getOriginalFileName(); + String extension = FilenameUtils.getExtension(filename); + + Collection<ExtensionCommand> commands = CollectionUtils.emptyIfNull(configurationService.getConfiguration().getExtensionCommands()); + for (ExtensionCommand command : commands) { + if (extension.equalsIgnoreCase(command.getExtension())) { + attachment = convertToPdf(attachment, command); + break; + } + } + return attachment; + } + + /** + * Convert attachment to pdf. + * + * @param attachment attchment to convert + * @param extensionCommand command + * @return + * @throws IOException + */ + protected Attachment convertToPdf(Attachment attachment, ExtensionCommand extensionCommand) throws IOException { + + // get file extension + String filename = attachment.getOriginalFileName(); + String basename = FilenameUtils.getBaseName(filename); + String extension = FilenameUtils.getExtension(filename); + + // copy file to temp file + File file = File.createTempFile("faxtomail-" + basename, "." + extension); + file.deleteOnExit(); + File outfile = File.createTempFile("faxtomail-" + basename, ".pdf"); + outfile.deleteOnExit(); + FileUtils.writeByteArrayToFile(file, attachment.getOriginalFile().getContent()); + + // get process command + String command = extensionCommand.getConvertToPdfCommand(); + command = StringUtils.replaceOnce(command, "%f", "\"" + file.getAbsolutePath() + "\""); + command = StringUtils.replaceOnce(command, "%o", "\"" + outfile.getAbsolutePath() + "\""); + + String[] args = StringUtil.split(command, " "); + List<String> comArgs = Arrays.asList(args); + ProcessBuilder pb = new ProcessBuilder(comArgs); + // run process + if (log.isDebugEnabled()) { + log.debug("Convert attachment with command : " + comArgs); + } + try { + pb.start(); + + // read output to save into attachment + byte[] outContent = FileUtils.readFileToByteArray(outfile); + AttachmentFile editedFile = new AttachmentFileImpl(); + editedFile.setContent(outContent); + editedFile.setFilename(basename + "-converted.pdf"); + attachment.setEditedFile(editedFile); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Cannot run convert command", e); + } + } + + // cleanup + //file.delete(); + //outfile.delete(); + + return attachment; + } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-19 15:08:04 UTC (rev 235) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-19 16:09:40 UTC (rev 236) @@ -119,6 +119,7 @@ <div class="form-group"> <label for="convertToToPdfField">Conversion en pdf :</label> <input id="convertToToPdfField" type="text" class="form-control" ng-model="extensionCommand.convertToPdfCommand" placeholder="" /> + <p class="help-block">Utilisez <code>%f</code> et <code>%o</code> pour representer respectivement le fichier en entrée et en sortie de la commande</p> </div> <div class="form-group"> <label for="openAttachmentCommandField">Ouverture :</label>

1 0

r235 - trunk
by echatellier＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: echatellier Date: 2014-06-19 17:08:04 +0200 (Thu, 19 Jun 2014) New Revision: 235 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/235 Log: ddu Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-19 15:01:03 UTC (rev 234) +++ trunk/pom.xml 2014-06-19 15:08:04 UTC (rev 235) @@ -105,7 +105,7 @@ <nuitonWebVersion>1.16</nuitonWebVersion> <eugeneVersion>2.10</eugeneVersion> - <topiaVersion>3.0-beta-5</topiaVersion> + <topiaVersion>3.0-beta-6</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> @@ -525,7 +525,7 @@ <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-core</artifactId> - <version>1.7.5</version> + <version>1.7.6</version> <scope>runtime</scope> </dependency>

1 0