Author: echatellier Date: 2014-06-30 10:01:09 +0200 (Mon, 30 Jun 2014) New Revision: 293 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/293 Log: Fix fake ldap admin user group Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 07:47:30 UTC (rev 292) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 08:01:09 UTC (rev 293) @@ -24,7 +24,14 @@ * #L% */ +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; + import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupImpl; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.service.LdapService; @@ -40,17 +47,39 @@ protected FaxToMailUser getFakeFaxToMailUser() { if (fakeUser == null) { - FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - fakeUser = dao.forAll().findAnyOrNull(); + fakeUser = userDao.forAll().findAnyOrNull(); + + // create user if (fakeUser == null) { fakeUser = new FaxToMailUserImpl(); fakeUser.setTrigraph("fkr"); fakeUser.setFirstName("Test ldap"); fakeUser.setLastName("Test ldap"); fakeUser.setLogin("test"); - dao.create(fakeUser); + fakeUser = userDao.create(fakeUser); } + + // add user to fake group + FaxToMailUserGroup fakeGroup = null; + List<String> adminGroups = getApplicationConfig().getLdapAdminGroups(); + if (CollectionUtils.isNotEmpty(adminGroups)) { + fakeGroup = groupDao.forCompleteNameEquals(adminGroups.get(0)).findAnyOrNull(); + if (fakeGroup == null) { + fakeGroup = new FaxToMailUserGroupImpl(); + fakeGroup.setName("fake group"); + fakeGroup.setName(adminGroups.get(0)); + fakeGroup = groupDao.create(fakeGroup); + } + + if (!fakeUser.containsUserGroups(fakeGroup)) { + fakeUser.addUserGroups(fakeGroup); + } + } + + getPersistenceContext().commit(); } return fakeUser; }