Author: athimel Date: 2012-03-29 18:17:06 +0200 (Thu, 29 Mar 2012) New Revision: 167 Url: http://chorem.org/repositories/revision/vradi/167 Log: Add a TU about a potential internal usage Added: trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java Modified: trunk/pom.xml trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java trunk/vradi-services/src/test/resources/vradi-services.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/pom.xml 2012-03-29 16:17:06 UTC (rev 167) @@ -569,7 +569,6 @@ </reporting> <repositories> - <repository> <id>vradi-group</id> <name>Vradi Repository</name> @@ -585,7 +584,6 @@ </repositories> <pluginRepositories> - <pluginRepository> <id>vradi-group</id> <name>Vradi Repository</name> Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java 2012-03-29 16:17:06 UTC (rev 167) @@ -537,12 +537,12 @@ log.debug("getFormsFromStream(" + stream.getName()); } - if (stream.getFormTypeName() == null) { + String formTypeName = stream.getFormTypeName(); + if (formTypeName == null) { throw new VradiException("xmlStream.formTypeName is null"); } - WikittyExtension formType = formTypeManager.getFormType( - stream.getFormTypeName()); + WikittyExtension formType = formTypeManager.getFormType(formTypeName); if (formType == null) { throw new VradiException("Extension of name xmlStream.formTypeName does not exists"); } @@ -575,7 +575,8 @@ } List<Form> forms = new ArrayList<Form>(); - List<String> xmlFieldBindingIds = new ArrayList<String>(stream.getXmlFieldBinding()); + Set<String> xmlFieldBinding = stream.getXmlFieldBinding(); + List<String> xmlFieldBindingIds = new ArrayList<String>(xmlFieldBinding); List<XmlFieldBinding> bindings = wikittyProxy.restore(XmlFieldBinding.class, xmlFieldBindingIds); String formDateId = VradiConstants.FORM_ID_DATE_FORMAT.format(new Date()); String toTreatId = formManager.getNonTraiteStatus().getWikittyId(); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2012-03-29 16:17:06 UTC (rev 167) @@ -24,6 +24,7 @@ package org.chorem.vradi.services.managers; +import com.google.common.collect.Sets; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -688,7 +689,7 @@ * @param sessionId the session wikitty id */ public void generatePDFForSession(String sessionId) throws VradiException { - List<String> formsIdsToGenerate = new ArrayList<String>(); + Set<String> formsIdsToGenerate = Sets.newLinkedHashSet(); org.chorem.vradi.entities.Session session = wikittyProxy.restore(org.chorem.vradi.entities.Session.class, sessionId); @@ -705,12 +706,7 @@ Set<String> formsIds = SendingHelper.extractForms(wikittyProxy, sending.getGroupForms()); if (formsIds != null) { - for (String formId : formsIds) { - - if (!formsIdsToGenerate.contains(formId)) { - formsIdsToGenerate.add(formId); - } - } + formsIdsToGenerate.addAll(formsIds); } } } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java 2012-03-29 16:17:06 UTC (rev 167) @@ -61,7 +61,7 @@ } // Bind all forms - session= formManager.bindForms(session); + session = formManager.bindForms(session); String sessionId = session.getWikittyId(); Added: trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java (rev 0) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java 2012-03-29 16:17:06 UTC (rev 167) @@ -0,0 +1,115 @@ +package org.chorem.vradi.services; + +import com.google.common.collect.ImmutableSet; +import org.chorem.vradi.VradiTestAbstract; +import org.chorem.vradi.beans.FormPagedResult; +import org.chorem.vradi.beans.QueryParameters; +import org.chorem.vradi.entities.FieldTypeEnum; +import org.chorem.vradi.entities.Form; +import org.chorem.vradi.entities.XmlFieldBinding; +import org.chorem.vradi.entities.XmlFieldBindingImpl; +import org.chorem.vradi.entities.XmlStream; +import org.chorem.vradi.entities.XmlStreamImpl; +import org.chorem.vradi.services.managers.BindingManager; +import org.chorem.vradi.services.managers.FormManager; +import org.chorem.vradi.services.managers.FormTypeManager; +import org.chorem.vradi.services.managers.SearchManager; +import org.chorem.vradi.services.managers.ThesaurusManager; +import org.chorem.vradi.services.tasks.ImportXmlStreamTasks; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.WikittyExtension; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Arnaud Thimel <thimel@codelutin.com> + */ +public class InternalUsageTest extends VradiTestAbstract { + + public static final String APPEL_OFFRES_FORM_TYPE = "APPEL_OFFRES"; + + protected BindingManager bindingManager; + protected FormTypeManager formTypeManager; + protected ThesaurusManager thesaurusManager; + protected SearchManager searchManager; + protected FormManager formManager; + + @Before + public void initBindingManager() throws VradiException { + formTypeManager = new FormTypeManager(config, wikittyProxy); + thesaurusManager = new ThesaurusManager(wikittyProxy); + searchManager = new SearchManager(wikittyProxy, thesaurusManager); + formManager = new FormManager(config, wikittyProxy, thesaurusManager, searchManager); + bindingManager = new BindingManager(config, wikittyProxy, formTypeManager, formManager); + createAPPEL_OFFRESFormType(); + } + + protected WikittyExtension createAPPEL_OFFRESFormType() throws VradiException { + Map<String, FieldType> fields = new LinkedHashMap<String, FieldType>(); + fields.put("URL_AO", FieldTypeEnum.STRING.getFieldType()); + fields.put("Contact_technique", FieldTypeEnum.STRING.getFieldType()); + fields.put("Site_acheteur", FieldTypeEnum.STRING.getFieldType()); + fields.put("Contact_administratif", FieldTypeEnum.STRING.getFieldType()); + + return createFormType(APPEL_OFFRES_FORM_TYPE, fields); + } + + + protected XmlFieldBinding createXmlFieldBinding(String xmlField, String formField) throws VradiException { + XmlFieldBinding binding = new XmlFieldBindingImpl(); + binding.setXmlField(ImmutableSet.of(xmlField)); + binding.setFormField(formField); + + XmlFieldBinding result = wikittyProxy.store(binding); + return result; + } + + public XmlStream createAPPEL_OFFRESXmlStream(String name, String url) throws Exception { + XmlStream stream = new XmlStreamImpl(); + stream.setName(name); + stream.setUrl(url); + stream.setFormTypeName(APPEL_OFFRES_FORM_TYPE); + stream.addXmlFieldBinding(createXmlFieldBinding("title", "Infogene.objet").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("link", "Infogene.sourceURL").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("pubDate", "Form.datePub").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("creator", "Infogene.entity").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("description", "Infogene.description").getWikittyId()); + wikittyProxy.store(stream); + + return stream; + } + + @Test + @Ignore + public void registerMarchesOnlineXmlStream() throws Exception { + XmlStream marchesOnlineStream = createAPPEL_OFFRESXmlStream("Marchés Online", "http://www.marchesonline.com/mol/rss/appels-d-offres-services-informatiques...."); + + List<XmlStream> allXmlStreams = bindingManager.getAllXmlStreams(); + Assert.assertEquals(1, allXmlStreams.size()); + + XmlStream ediTenderStream = createAPPEL_OFFRESXmlStream("Edi Tender", "http://www.edi-tender.com/rss/marchespublics.xml"); + XmlStream eMarchesPublicsStream = createAPPEL_OFFRESXmlStream("e-Marchés Publics", "https://www.e-marchespublics.com/rss/rss.php?v=2&l=200&c=Service"); + + allXmlStreams = bindingManager.getAllXmlStreams(); + Assert.assertEquals(3, allXmlStreams.size()); + + for (XmlStream stream : allXmlStreams) { + ImportXmlStreamTasks task = new ImportXmlStreamTasks(config, wikittyProxy, bindingManager, stream.getWikittyId()); + task.run(); + } + + FormPagedResult result = searchManager.findForms(new QueryParameters("Java"), new FormPagedResult()); +// Assert.assertEquals(941, result.getTotalFoundFormNb()); + List<String> formsIdsToShow = result.getFormsIdsToShow(); + for (String id : formsIdsToShow) { + Form form = wikittyProxy.restore(Form.class, id); + System.out.println(form); + } + } +} Modified: trunk/vradi-services/src/test/resources/vradi-services.properties =================================================================== --- trunk/vradi-services/src/test/resources/vradi-services.properties 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/test/resources/vradi-services.properties 2012-03-29 16:17:06 UTC (rev 167) @@ -70,3 +70,6 @@ jcs.default= jcs.default.cacheattributes.MaxObjects=10000 #jcs.priority.cacheattributes.MaxObjects=10000 + +vradi.mail.admin=thimel@codelutin.com +vradi.smtp.host=smtp