Author: echatellier Date: 2014-05-26 12:25:20 +0200 (Mon, 26 May 2014) New Revision: 94 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/94 Log: Remove company and brand from model Removed: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-26 10:25:20 UTC (rev 94) @@ -35,9 +35,6 @@ com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.filename.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true -# Company -com.franciaflex.faxtomail.persistence.entities.Company.attribute.name.tagvalue.naturalId=true - # MailFolder com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.notNull=false Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-05-26 10:25:20 UTC (rev 94) @@ -26,7 +26,6 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.service.CompanyService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.FaxToMailWebApplicationContext; @@ -68,10 +67,6 @@ return newService(DecoratorService.class); } - public CompanyService getCompanyService() { - return newService(CompanyService.class); - } - public ConfigurationService getConfigurationService() { return newService(ConfigurationService.class); } Deleted: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java 2014-05-26 10:25:20 UTC (rev 94) @@ -1,134 +0,0 @@ -package com.franciaflex.faxtomail.services.service; - -/* - * #%L - * FaxToMail :: Service - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.franciaflex.faxtomail.persistence.entities.Company; -import com.franciaflex.faxtomail.persistence.entities.CompanyTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.EmailAccount; -import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; -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.services.FaxToMailServiceSupport; -import com.google.common.base.Function; -import com.google.common.base.Preconditions; -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntities; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * @author kmorin <kmorin@codelutin.com> - * @since x.x - */ -public class CompanyService extends FaxToMailServiceSupport { - - private static final Log log = LogFactory.getLog(CompanyService.class); - - public List<Company> getAllCompanies() { - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - List<Company> companies = new ArrayList<>(dao.findAll()); - return companies; - } - - public Company getCompany(String id) { - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - Company company = dao.findByTopiaId(id); - return company; - } - - public Company getCompanyByName(String name) { - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - Company company = dao.forNameEquals(name).findAny(); - return company; - } - - /*public Company saveCompany(Company company, Collection<MailFolder> mailFolders, Map<MailFilter, String> mailFilters) { - Preconditions.checkNotNull(company); - - ConfigurationService configurationService = getConfigurationService(); - configurationService.saveConfiguration(company.getConfiguration()); - - MailFolderService mailFolderService = getMailFolderService(); - mailFolders = mailFolderService.saveMailFolders(mailFolders); - company.setMailFolder(mailFolders); - - if (mailFilters != null) { - Map<String, MailFolder> foldersById = Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction()); - for (MailFilter filter : mailFilters.keySet()) { - MailFolder folder = foldersById.get(mailFilters.get(filter)); - filter.setMailFolder(folder); - } - } - Collection<MailFilter> filters = saveMailFilters(mailFilters.keySet()); - company.setMailFilter(filters); - - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - company = dao.update(company); - - getPersistenceContext().commit(); - - return company; - }*/ - - public Collection<MailFilter> saveMailFilters(Collection<MailFilter> mailFilters) { - MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); - - Collection<MailFilter> result = new ArrayList<>(); - for (MailFilter mailFilter : mailFilters) { - - MailFilter filter; - boolean create = mailFilter.getTopiaId() == null; - if (create) { - filter = dao.newInstance(); - } else { - filter = dao.findByTopiaId(mailFilter.getTopiaId()); - } - filter.setExpression(mailFilter.getExpression()); - filter.setMailFolder(mailFilter.getMailFolder()); - - if (create) { - filter = dao.create(filter); - } else { - filter = dao.update(filter); - } - result.add(filter); - } - return result; - } - - public Collection<EmailAccount> getEmailAccounts() { - EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); - return new ArrayList<>(emailAccountTopiaDao.findAll()); - } -} 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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-05-26 10:25:20 UTC (rev 94) @@ -24,6 +24,8 @@ * #L% */ +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; @@ -32,6 +34,10 @@ 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.EmailAccount; +import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.MailFilter; +import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Lists; @@ -73,5 +79,35 @@ getPersistenceContext().commit(); return config; } + + public Collection<MailFilter> saveMailFilters(Collection<MailFilter> mailFilters) { + MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); + Collection<MailFilter> result = new ArrayList<>(); + for (MailFilter mailFilter : mailFilters) { + + MailFilter filter; + boolean create = mailFilter.getTopiaId() == null; + if (create) { + filter = dao.newInstance(); + } else { + filter = dao.findByTopiaId(mailFilter.getTopiaId()); + } + filter.setExpression(mailFilter.getExpression()); + filter.setMailFolder(mailFilter.getMailFolder()); + + if (create) { + filter = dao.create(filter); + } else { + filter = dao.update(filter); + } + result.add(filter); + } + return result; + } + + public Collection<EmailAccount> getEmailAccounts() { + EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); + return new ArrayList<>(emailAccountTopiaDao.findAll()); + } } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-26 10:25:20 UTC (rev 94) @@ -26,8 +26,6 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.persistence.entities.Company; -import com.franciaflex.faxtomail.persistence.entities.CompanyTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; @@ -234,39 +232,23 @@ int etatAttenteSize = etatAttentes.size(); - // root folders + // root folders (~companies) + MailFolder franciaflex = folderDao.create(MailFolder.PROPERTY_NAME, "Franciaflex"); + MailFolder faber = folderDao.create(MailFolder.PROPERTY_NAME, "Faber"); + MailFolder franceFermeture = folderDao.create(MailFolder.PROPERTY_NAME, "France-fermeture"); + + // categories MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", + MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_REPLY_ADRESSES, Lists.newArrayList("no-reply@franciaflex.com")); folders.put("Chargés de clientèle", chargesClientelle); Collections.shuffle(etatAttentes); MailFolder sav = folderDao.create(MailFolder.PROPERTY_NAME, "SAV", + MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(0, random.nextInt(etatAttenteSize - 8) + 2)); folders.put("SAV", sav); - // companies - CompanyTopiaDao companyTopiaDao = getPersistenceContext().getCompanyDao(); - ConfigurationTopiaDao configurationTopiaDao = getPersistenceContext().getConfigurationDao(); -// Configuration configuration = configurationTopiaDao.create(Configuration.PROPERTY_TABLE_COLUMNS, -// Email.PROPERTY_PRIORITY + "," + -// Email.PROPERTY_DEMAND_TYPE + "," + -// Email.PROPERTY_OBJECT + "," + -// "clientCode," + -// Email.PROPERTY_SENDER + "," + -// Email.PROPERTY_RECEPTION_DATE + "," + -// Email.PROPERTY_DEMAND_STATUS + "," + -// "pfNb,savNb," + -// Email.PROPERTY_TAKEN_BY + "," + -// "lastAttachmentOpeningUser," + -// Email.PROPERTY_ATTACHMENT -// ); - //Configuration configuration = configurationTopiaDao.create(); - Company fx = companyTopiaDao.create(Company.PROPERTY_NAME, "Franciaflex"/*, - Company.PROPERTY_CONFIGURATION, configuration, - Company.PROPERTY_MAIL_FOLDER, folders.values()*/); - companyTopiaDao.create(Company.PROPERTY_NAME, "Faber"/*, Company.PROPERTY_CONFIGURATION, configurationTopiaDao.create()*/); - companyTopiaDao.create(Company.PROPERTY_NAME, "France Fermeture"/*, Company.PROPERTY_CONFIGURATION, configurationTopiaDao.create()*/); - // user folders Collections.shuffle(etatAttentes); MailFolder cyrilFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Cyril", @@ -306,11 +288,7 @@ try { InputStream emailAccountsPropertiesStream = ClassLoader.getSystemResourceAsStream("email_accounts.csv"); if (emailAccountsPropertiesStream != null) { - - List<EmailAccount> emailAccounts = getReferentielService().importEmailAccounts(emailAccountsPropertiesStream); - - fx.addAllEmailAccount(emailAccounts); - companyTopiaDao.update(fx); + getReferentielService().importEmailAccounts(emailAccountsPropertiesStream); } } catch(Exception e) { @@ -318,14 +296,10 @@ } // email filters - try { InputStream emailFiltersPropertiesStream = ClassLoader.getSystemResourceAsStream("email_filters.csv"); if (emailFiltersPropertiesStream != null) { - List<MailFilter> mailFilters = getReferentielService().importEmailFilters(emailFiltersPropertiesStream, folders); - - //fx.addAllMailFilter(mailFilters); - //companyTopiaDao.update(fx); + getReferentielService().importEmailFilters(emailFiltersPropertiesStream, folders); } } catch(Exception e) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-05-26 10:25:20 UTC (rev 94) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.Company; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; @@ -32,7 +31,6 @@ import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.persistence.RessourceClassLoader; -import com.franciaflex.faxtomail.services.service.CompanyService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.InitFaxToMailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -533,10 +531,6 @@ return serviceContext.newService(MailFolderService.class); } - public CompanyService getCompanyService() { - return serviceContext.newService(CompanyService.class); - } - public UserService getUserService() { return serviceContext.newService(UserService.class); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-26 10:25:20 UTC (rev 94) @@ -26,7 +26,6 @@ import com.ezware.oxbow.swingbits.table.filter.ITableFilter; import com.ezware.oxbow.swingbits.table.filter.JTableFilter; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; -import com.franciaflex.faxtomail.persistence.entities.Company; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-05-26 10:25:20 UTC (rev 94) @@ -24,7 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Company; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-05-26 10:25:20 UTC (rev 94) @@ -25,8 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.Company; -import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -65,7 +63,6 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableModel; import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; 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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-05-26 10:25:20 UTC (rev 94) @@ -75,7 +75,7 @@ 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.CompanyService; +import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -96,8 +96,8 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = (FaxToMailServiceContext) jobExecutionContext.getMergedJobDataMap().get(SERVICE_CONTEXT); - CompanyService companyService = serviceContext.newService(CompanyService.class); - Collection<EmailAccount> emailAccounts = companyService.getEmailAccounts(); + ConfigurationService configurationService = serviceContext.newService(ConfigurationService.class); + Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); for (EmailAccount account : emailAccounts) { if ("pop3".equals(account.getProtocol().toLowerCase())) {