Author: sletellier Date: 2011-10-27 11:51:29 +0200 (Thu, 27 Oct 2011) New Revision: 140 Url: http://chorem.org/repositories/revision/vradi/140 Log: - Pass to eugene SNAPSHOT - Remove duplicated email field (use login) - Add test using criteria select Added: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java Modified: trunk/pom.xml trunk/vradi-entities/src/main/xmi/vradi.zargo trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/pom.xml 2011-10-27 09:51:29 UTC (rev 140) @@ -116,7 +116,7 @@ <!-- libraries version --> <jaxxVersion>2.4</jaxxVersion> - <eugenePluginVersion>2.3.5</eugenePluginVersion> + <eugenePluginVersion>2.4.1-SNAPSHOT</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> Added: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java =================================================================== --- trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java (rev 0) +++ trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/VradiUserImpl.java 2011-10-27 09:51:29 UTC (rev 140) @@ -0,0 +1,17 @@ +package org.chorem.vradi.entities; + +/** + * @author sletellier + */ +public class VradiUserImpl extends VradiUserAbstract { + + @Override + public String getEmail() { + return super.getLogin(); + } + + @Override + public void setEmail(String email) { + super.setLogin(email); + } +} Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo =================================================================== (Binary files differ) Modified: trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/services/managers/SearchManagerTest.java 2011-10-27 09:51:29 UTC (rev 140) @@ -32,6 +32,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; import java.util.ArrayList; import java.util.List; @@ -93,5 +97,11 @@ for (Group groupWithQuery : groupsWithQuery) { Assert.assertTrue(groupWithQuery instanceof Group); } + + // Get all query for group "codelutin" using select + Criteria criteria = Search.query().eq(Group.FQ_FIELD_GROUP_NAME, "codelutin").criteria(); + criteria.setSelect(Group.FQ_FIELD_GROUP_QUERIES); + PagedResult<Query> allByCriteria = wikittyProxy.findAllByCriteria(Query.class, criteria); + Assert.assertEquals(1, allByCriteria.size()); } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-27 09:51:29 UTC (rev 140) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import freemarker.template.utility.Collections12; import java.util.Collections; import javax.mail.MessagingException; import javax.mail.internet.AddressException; @@ -118,9 +117,7 @@ String md5 = StringUtil.encodeMD5(password); newUser.setPassword(md5); - // Login and email are the same in vradi web newUser.setLogin(email); - newUser.setEmail(email); newUser.setNoSend(Collections.EMPTY_SET); newUser.setNoReceived(Collections.EMPTY_SET); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-12 16:20:34 UTC (rev 139) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-27 09:51:29 UTC (rev 140) @@ -190,7 +190,7 @@ } // Remove connected user email - recipient.remove(getUser().getEmail()); + recipient.remove(getUser().getLogin()); // Get mail url String url = VradiWebHelper.encodeAndGetUrl(SHOW_INVITATION_ACTION, noteId, sender.getWikittyId(), StringUtils.join(note.getPartners(), ","), message); @@ -205,7 +205,7 @@ } protected List<String> extractEmail(Collection<VradiUser> users) { - List<String> emails = WikittyUtil.getFieldValuesFromFQFieldName(VradiUser.FQ_FIELD_VRADIUSER_EMAIL, users); + List<String> emails = WikittyUtil.getFieldValuesFromFQFieldName(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, users); return emails; } }