r2737 - in trunk: pollen-business/src/main/java/org/chorem/pollen/business/services pollen-business/src/test/java/org/chorem/pollen/business/business pollen-business/src/test/java/org/chorem/pollen/business/services pollen-ui/src/main/java/org/chorem/pollen/ui/components pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services
Author: nrannou Date: 2009-08-20 15:00:52 +0200 (Thu, 20 Aug 2009) New Revision: 2737 Added: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/LoginComponent.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Account.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java Log: modification tests et logs Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -27,11 +27,21 @@ public interface ServiceAuth { /** - * Identification d'un utilisateur + * Identification d'un utilisateur. Vérification du couple login, password. * - * @param login loin de l'utilisateur qui s'authentifie + * @param login le login de l'utilisateur à identifié * @param password le password entré par l'utilisateur - * @return l'utilisateur dont le login est login + * @return vrai si l'utilisateur est identifié, false sinon */ - public UserDTO isLoginRight(String login, String password); + public boolean isLoginRight(String login, String password); + + /** + * Identification d'un utilisateur. Récupération des informations de cet + * utilisateur. + * + * @param login le login de l'utilisateur à identifié + * @param password le password entré par l'utilisateur + * @return l'utilisateur identifié par le login + */ + public UserDTO getUser(String login, String password); } \ No newline at end of file Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -46,8 +46,38 @@ } @Override - public UserDTO isLoginRight(String login, String password) { + public boolean isLoginRight(String login, String password) { TopiaContext transaction = null; + boolean result = false; + try { + transaction = rootContext.beginTransaction(); + + userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); + + UserAccount userEntity = userDAO.findByLogin(login); + if (userEntity != null && password.equals(userEntity.getPassword())) { + result = true; + } + + transaction.commitTransaction(); + transaction.closeContext(); + + if (log.isDebugEnabled()) { + log.debug("Entity found: " + + ((userEntity == null) ? "null" : userEntity + .getLogin())); + } + + return result; + } catch (TopiaException e) { + ContextUtil.doCatch(e, transaction); + return false; + } + } + + @Override + public UserDTO getUser(String login, String password) { + TopiaContext transaction = null; UserDTO result = null; try { transaction = rootContext.beginTransaction(); @@ -57,15 +87,13 @@ UserAccount userEntity = userDAO.findByLogin(login); if (userEntity != null && password.equals(userEntity.getPassword())) { result = converter.createUserDTO(userEntity); - } else { - result = null; } transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getLogin())); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -67,8 +67,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -126,8 +126,8 @@ } transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + choiceDTO.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + choiceDTO.getId()); } return resu; @@ -151,8 +151,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + choiceId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + choiceId); } return true; @@ -181,8 +181,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -215,8 +215,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -252,8 +252,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -70,8 +70,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -125,8 +125,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + comment.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + comment.getId()); } return true; @@ -150,8 +150,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + commentId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + commentId); } return true; @@ -180,8 +180,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -217,8 +217,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -91,8 +91,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -161,8 +161,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + votingList.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + votingList.getId()); } return true; @@ -186,8 +186,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + votingListId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + votingListId); } return true; @@ -218,8 +218,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -249,8 +249,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -288,8 +288,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -326,8 +326,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -406,8 +406,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + personList.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + personList.getId()); } return true; @@ -431,8 +431,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + personListId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + personListId); } return true; @@ -465,8 +465,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info(personListEntities.size() + if (log.isDebugEnabled()) { + log.debug(personListEntities.size() + " entities deleted for user: " + userId); } @@ -498,8 +498,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -529,8 +529,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -563,8 +563,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -602,8 +602,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -76,8 +76,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; } catch (TopiaException e) { @@ -112,8 +112,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return pollAccountEntity; @@ -170,8 +170,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + pollAccountId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + pollAccountId); } return true; @@ -205,8 +205,8 @@ transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + pollAccountDTO.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + pollAccountDTO.getId()); } return resu; @@ -237,8 +237,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -270,8 +270,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -303,8 +303,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -343,8 +343,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -70,11 +70,6 @@ Poll pollEntity = pollDAO.create(); - if (log.isDebugEnabled()) { - log.debug("service " + pollDTO.getVoteCounting() + " " - + pollDTO.getPollType()); - } - // Identifiant du sondage String id = UUID.randomUUID().toString(); pollDTO.setPollId(id.replaceAll("-", "")); @@ -84,18 +79,16 @@ // Création du pollAccount associé au sondage ServicePollAccount spa = new ServicePollAccountImpl(); - if (log.isDebugEnabled()) { - log.debug("userId : " + pollDTO.getUserId()); - } PollAccount pollAccountEntity = spa.createPollAccount(pollDTO .getCreatorId(), pollDTO.getCreatorEmail(), pollDTO .getUserId()); + pollEntity.setCreator(pollAccountEntity); + if (log.isDebugEnabled()) { - log - .debug("pollAccountEntity created: " - + pollAccountEntity != null); + log.debug("userId: " + pollDTO.getUserId() + + ", pollAccountEntity created: " + + (pollAccountEntity != null)); } - pollEntity.setCreator(pollAccountEntity); topiaId = pollEntity.getTopiaId(); @@ -125,8 +118,8 @@ if (log.isDebugEnabled()) { log.debug("creator after creation: " + pollEntity.getCreator()); } - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -157,8 +150,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + pollDTO.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + pollDTO.getId()); } return true; @@ -182,8 +175,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + pollId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + pollId); } return true; @@ -212,8 +205,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -243,8 +236,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -273,8 +266,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -307,8 +300,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -344,8 +337,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -393,8 +386,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -434,8 +427,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -471,8 +464,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -504,8 +497,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + pollId); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + pollId); } return true; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -68,8 +68,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -132,8 +132,8 @@ } transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + preventRuleDTO.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + preventRuleDTO.getId()); } return resu; @@ -159,8 +159,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + preventRuleId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + preventRuleId); } return true; @@ -191,8 +191,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -231,8 +231,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -79,15 +79,6 @@ public List<UserDTO> selectUsers(Map<String, Object> properties); /** - * Ajout d'un compte à un utilisateur - * - * @param login identifiant de l'utilisateur - * @param pollAccountId identifiant du compte à ajouter - * @return true si le compte a été ajouté - */ - public boolean addPollAccountToUser(String login, String pollAccountId); - - /** * Mise à jour du mot de passe d'un utilisateur * * @param user l'utilisateur Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -23,8 +23,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.business.converters.DataUserConverter; import org.chorem.pollen.business.dto.UserDTO; -import org.chorem.pollen.business.persistence.PollAccount; -import org.chorem.pollen.business.persistence.PollAccountDAO; import org.chorem.pollen.business.persistence.PollenModelDAOHelper; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.UserAccountDAO; @@ -59,7 +57,8 @@ userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); if (userDAO.findByLogin(user.getLogin()) != null - || userDAO.findByEmail(user.getEmail()) != null) { + || (!"".equals(user.getEmail()) && userDAO.findByEmail(user + .getEmail()) != null)) { return null; } @@ -70,8 +69,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -95,8 +94,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + userEntity.getTopiaId()); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + userEntity.getTopiaId()); } return true; @@ -119,8 +118,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + userEntity.getTopiaId()); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + userEntity.getTopiaId()); } return true; @@ -149,8 +148,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity found: " + if (log.isDebugEnabled()) { + log.debug("Entity found: " + ((result == null) ? "null" : result.getId())); } @@ -186,8 +185,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } @@ -215,8 +214,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + user.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + user.getId()); } return true; @@ -228,35 +227,6 @@ } @Override - public boolean addPollAccountToUser(String login, String pollAccountId) { - TopiaContext transaction = null; - try { - transaction = rootContext.beginTransaction(); - - userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); - - UserAccount userEntity = userDAO.findByLogin(login); - PollAccountDAO pollAccountDAO = PollenModelDAOHelper - .getPollAccountDAO(transaction); - PollAccount pollAccountEntity = pollAccountDAO - .findByTopiaId(pollAccountId); - userEntity.addPollAccount(pollAccountEntity); - userEntity.update(); - transaction.commitTransaction(); - transaction.closeContext(); - - if (log.isInfoEnabled()) { - log.info("Entity updated: " + userEntity.getTopiaId()); - } - - return true; - } catch (TopiaException e) { - ContextUtil.doCatch(e, transaction); - return false; - } - } - - @Override public boolean updatePasswordUser(UserDTO user, String newPassword) { TopiaContext transaction = null; try { @@ -271,8 +241,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + user.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + user.getId()); } return true; @@ -295,6 +265,11 @@ } transaction.closeContext(); + + if (log.isDebugEnabled()) { + log.debug("Entity exists for the login " + login + ": " + + userExists); + } } catch (TopiaException e) { ContextUtil.doCatch(e, transaction); return true; @@ -315,6 +290,11 @@ } transaction.closeContext(); + + if (log.isDebugEnabled()) { + log.debug("Entity exists for the email " + email + ": " + + userExists); + } } catch (TopiaException e) { ContextUtil.doCatch(e, transaction); return true; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -92,8 +92,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity created: " + topiaId); + if (log.isDebugEnabled()) { + log.debug("Entity created: " + topiaId); } return topiaId; @@ -118,8 +118,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity updated: " + voteDTO.getId()); + if (log.isDebugEnabled()) { + log.debug("Entity updated: " + voteDTO.getId()); } return true; @@ -142,8 +142,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entity deleted: " + voteId); + if (log.isDebugEnabled()) { + log.debug("Entity deleted: " + voteId); } return true; @@ -179,8 +179,8 @@ transaction.commitTransaction(); transaction.closeContext(); - if (log.isInfoEnabled()) { - log.info("Entities found: " + if (log.isDebugEnabled()) { + log.debug("Entities found: " + ((results == null) ? "null" : results.size())); } Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -61,7 +61,7 @@ @Test public void testPrintAction() { PreventRuleDTO preventRule = new PreventRuleDTO("test", 2, false, - PreventRuleManager.PRINT_ACTION); + PreventRuleManager.NULL_ACTION); manager = new PreventRuleManager(preventRule); assertTrue(manager.execute()); @@ -82,7 +82,7 @@ @Test public void testPrintActionRepeat() { PreventRuleDTO preventRule = new PreventRuleDTO("test", 2, true, - PreventRuleManager.PRINT_ACTION); + PreventRuleManager.NULL_ACTION); manager = new PreventRuleManager(preventRule); assertTrue(manager.execute()); @@ -100,7 +100,7 @@ @Test public void testPrintActionOneTime() { PreventRuleDTO preventRule = new PreventRuleDTO("test", 2, false, - PreventRuleManager.PRINT_ACTION); + PreventRuleManager.NULL_ACTION); preventRule.setOneTime(true); manager = new PreventRuleManager(preventRule); Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -17,12 +17,11 @@ package org.chorem.pollen.business.services; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.chorem.pollen.business.dto.UserDTO; -import org.chorem.pollen.business.services.ServiceAuthImpl; -import org.chorem.pollen.business.services.ServiceUser; -import org.chorem.pollen.business.services.ServiceUserImpl; import org.chorem.pollen.business.utils.ContextUtil; import org.junit.After; import org.junit.AfterClass; @@ -63,16 +62,34 @@ */ @Test public void testIsLoginRight() { - String login = "testLogin"; - String password = "testPassword"; - UserDTO result1 = instance.isLoginRight(login, password); + String login = "login_isLoginRight"; + String password = "password_isLoginRight"; + boolean result1 = instance.isLoginRight(login, password); + assertFalse(result1); + + UserDTO dto = new UserDTO(); + dto.setLogin(login); + ServiceUser smu = new ServiceUserImpl(); + smu.createUser(dto, password); + boolean result2 = instance.isLoginRight(login, password); + assertTrue(result2); + } + + /** + * Test of getUser method, of class ServiceAuthImpl. + */ + @Test + public void testGetUser() { + String login = "login_getUser"; + String password = "password_getUser"; + UserDTO result1 = instance.getUser(login, password); assertNull(result1); UserDTO dto = new UserDTO(); dto.setLogin(login); ServiceUser smu = new ServiceUserImpl(); smu.createUser(dto, password); - UserDTO result2 = instance.isLoginRight(login, password); + UserDTO result2 = instance.getUser(login, password); assertEquals(login, result2.getLogin()); } } \ No newline at end of file Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -21,13 +21,13 @@ import java.util.Date; import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.dto.PollAccountDTO; import org.chorem.pollen.business.dto.PollDTO; import org.chorem.pollen.business.dto.UserDTO; -import org.chorem.pollen.business.services.ServicePollImpl; -import org.chorem.pollen.business.services.ServiceUser; -import org.chorem.pollen.business.services.ServiceUserImpl; +import org.chorem.pollen.business.dto.VoteDTO; import org.chorem.pollen.business.utils.ContextUtil; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; @@ -185,7 +185,8 @@ // création de l'utilisateur UserDTO user = new UserDTO(); - user.setLogin("login"); + user.setLogin("login_findPollsByUser"); + user.setEmail("email_findPollsByUser"); ServiceUser su = new ServiceUserImpl(); String userId = su.createUser(user, "password"); @@ -201,6 +202,40 @@ } /** + * Test of findParticipatedPolls method, of class ServicePollImpl. + */ + @Test + public void testFindParticipatedPolls() { + + // création de l'utilisateur + UserDTO user = new UserDTO(); + user.setLogin("login_findParticipatedPolls"); + user.setEmail("email_findParticipatedPolls"); + ServiceUser su = new ServiceUserImpl(); + String userId = su.createUser(user, "password"); + + // création du compte associé à l'utilisateur + PollAccountDTO account = new PollAccountDTO(); + account.setUserId(userId); + ServicePollAccount spa = new ServicePollAccountImpl(); + String accountId = spa.createPollAccount(account); + + // création du sondage + PollDTO poll = new PollDTO(); + poll.setTitle("Test_findParticipatedPolls"); + String pollId = instance.createPoll(poll); + + // création du vote + VoteDTO vote = new VoteDTO(accountId, pollId, null); + ServiceVote sv = new ServiceVoteImpl(); + sv.createVote(vote, account); + + // recherche des sondages de l'utilisateur + List<PollDTO> result = instance.findParticipatedPolls(userId); + assertEquals(result.size(), 1); + } + + /** * Test of findRunningPolls method, of class ServicePollImpl. */ @Test Added: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java (rev 0) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -0,0 +1,181 @@ +/* *##% Pollen + * Copyright (C) 2009 CodeLutin + * + * 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/>. ##%*/ + +package org.chorem.pollen.business.services; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.List; + +import org.chorem.pollen.business.dto.UserDTO; +import org.chorem.pollen.business.utils.ContextUtil; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests du service de gestion des utilisateurs. + * + * @author rannou + * @version $Id$ + */ +public class ServiceUserImplTest { + private ServiceUserImpl instance; + + @BeforeClass + public static void setUpClass() throws Exception { + ContextUtil.getInstance().buildContext(); + } + + @AfterClass + public static void tearDownClass() throws Exception { + ContextUtil.getInstance().getContext().clear(false); + } + + @Before + public void setUp() { + instance = new ServiceUserImpl(); + } + + @After + public void tearDown() { + } + + /** + * Test of createUser method, of class ServiceUserImpl. + */ + @Test + public void testCreateUser() { + UserDTO user = new UserDTO(); + user.setLogin("login_CreateUser"); + String result = instance.createUser(user, "password"); + assertTrue(result.length() > 0); + } + + /** + * Test of updateUser method, of class ServiceUserImpl. + */ + @Test + public void testUpdateUser() { + UserDTO user = new UserDTO(); + user.setLogin("login_UpdateUser"); + String userId = instance.createUser(user, "password"); + user.setId(userId); + user.setFirstName("firstName_UpdateUser"); + boolean result = instance.updateUser(user); + assertTrue(result); + } + + /** + * Test of deleteUser method, of class ServiceUserImpl. + */ + @Test + public void testDeleteUser() { + + // delete with dto + UserDTO user = new UserDTO(); + user.setLogin("login_DeleteUser"); + user.setId(instance.createUser(user, "password")); + boolean result = instance.deleteUser(user); + assertTrue(result); + + // delete with login + UserDTO user2 = new UserDTO(); + user2.setLogin("login_DeleteUser"); + String userId2 = instance.createUser(user2, "password"); + boolean result2 = instance.deleteUser("login_DeleteUser"); + assertTrue(result2); + } + + /** + * Test of findUserById method, of class ServiceUserImpl. + */ + @Test + public void testFindUserById() { + UserDTO user = new UserDTO(); + user.setLogin("login_FindUserById"); + String userId = instance.createUser(user, "password"); + UserDTO result = instance.findUserById(userId); + String resultId = result.getId(); + assertEquals(userId, resultId); + } + + /** + * Test of selectUsers method, of class ServiceUserImpl. + */ + @Test + public void testSelectUsers() { + UserDTO user = new UserDTO(); + user.setLogin("login_SelectUsers"); + String userId = instance.createUser(user, "password"); + List<UserDTO> result = instance.selectUsers(null); + assertTrue(result.size() > 1); + } + + /** + * Test of updatePasswordUser method, of class ServiceUserImpl. + */ + @Test + public void testUpdatePasswordUser() { + UserDTO user = new UserDTO(); + user.setLogin("login_UpdatePasswordUser"); + user.setId(instance.createUser(user, "password")); + instance.updatePasswordUser(user, "newPassword"); + + ServiceAuth sa = new ServiceAuthImpl(); + UserDTO result = sa.getUser(user.getLogin(), "newPassword"); + assertNotNull(result); + } + + /** + * Test of isUserLoginExisting method, of class ServiceUserImpl. + */ + @Test + public void testIsUserLoginExisting() { + UserDTO user = new UserDTO(); + user.setLogin("login_IsUserLoginExisting"); + user.setEmail("email_IsUserLoginExisting"); + String userId = instance.createUser(user, "password"); + + boolean result = instance + .isUserLoginExisting("login_IsUserLoginExisting"); + boolean result2 = instance.isUserLoginExisting("login_False"); + assertTrue(result); + assertFalse(result2); + } + + /** + * Test of isUserEmailExisting method, of class ServiceUserImpl. + */ + @Test + public void testIsUserEmailExisting() { + UserDTO user = new UserDTO(); + user.setLogin("login_IsUserEmailExisting"); + user.setEmail("email_IsUserEmailExisting"); + String userId = instance.createUser(user, "password"); + + boolean result = instance + .isUserEmailExisting("email_IsUserEmailExisting"); + boolean result2 = instance.isUserEmailExisting("email_False"); + assertTrue(result); + assertFalse(result2); + } +} \ No newline at end of file Property changes on: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Rev Revision" Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -164,7 +164,7 @@ * @return la zone à mettre à jour */ Object onSuccessFromLoginForm() { - UserDTO userDTO = serviceAuth.isLoginRight(login, MD5.encode(password)); + UserDTO userDTO = serviceAuth.getUser(login, MD5.encode(password)); if (userDTO != null) { user = userDTO; feedback.addInfo(messages.get("loginOk")); Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/LoginComponent.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/LoginComponent.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/LoginComponent.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -77,7 +77,7 @@ Object onSuccessFromLoginCompForm() { // Récupération de l'utilisateur identifié - UserDTO userDTO = serviceAuth.isLoginRight(loginComp, MD5 + UserDTO userDTO = serviceAuth.getUser(loginComp, MD5 .encode(passwordComp)); if (userDTO != null) { user = userDTO; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Account.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Account.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Account.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -131,7 +131,7 @@ modify = true; // L'utilisateur a renseigné le mauvais mot de passe - if (serviceAuth.isLoginRight(newUser.getLogin(), MD5.encode(password)) == null) { + if (!serviceAuth.isLoginRight(newUser.getLogin(), MD5.encode(password))) { myAccountForm.recordError(passwordField, messages .get("badPassword")); } Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -146,7 +146,7 @@ if (!registerForm.getHasErrors()) { if (serviceUser.createUser(newUser, MD5.encode(password1)) != null) { sendMailNotification(); - user = serviceAuth.isLoginRight(newUser.getLogin(), MD5 + user = serviceAuth.getUser(newUser.getLogin(), MD5 .encode(password1)); return "Index"; } Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2009-08-19 15:48:01 UTC (rev 2736) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2009-08-20 13:00:52 UTC (rev 2737) @@ -100,6 +100,11 @@ * @return resultat */ private VoteCountingResultDTO execute(PollDTO poll) { + if (log.isInfoEnabled()) { + log.info("Dépouillement (byGroup=" + isByGroup + ") du sondage " + + poll.getPollId()); + } + // Création et remplissage du contexte this.createContext(poll.getVoteCounting()); this.fillContext(poll); @@ -120,8 +125,8 @@ resChoice.setValue(choice.getValue()); resChoice.setPercentage(Utils.calculatePercentage(choice, choices)); resChoice.setResult(this.isChoiceResult(choice)); - if (log.isInfoEnabled()) { - log.info(choice + " _ result ? " + resChoice.isResult()); + if (log.isDebugEnabled()) { + log.debug(choice + " _ result ? " + resChoice.isResult()); } resChoices.add(resChoice); } @@ -165,8 +170,8 @@ * @param poll : Sondage */ private void fillContext(PollDTO poll) { - if (log.isInfoEnabled()) { - log.info("Ajout poll : " + poll.getPollId()); + if (log.isDebugEnabled()) { + log.debug("Ajout poll : " + poll.getPollId()); } for (Object o : poll.getChoices()) { PollChoiceDTO choice = (PollChoiceDTO) o; @@ -184,8 +189,8 @@ * @param group : groupe lié au sondage */ private void routeGroup(VotingGroupDTO group) { - if (log.isInfoEnabled()) { - log.info("Ajout group : " + group.getIdGroup() + " _ weight=" + if (log.isDebugEnabled()) { + log.debug("Ajout group : " + group.getIdGroup() + " _ weight=" + group.getWeight()); } this.context.addGroup(group.getIdGroup(), group.getWeight()); @@ -202,8 +207,8 @@ * @param person : personne ayant voté */ private void routePerson(VotingPersonDTO person) { - if (log.isInfoEnabled()) { - log.info("Ajout person : " + person.getVotingId() + " _ weight=" + if (log.isDebugEnabled()) { + log.debug("Ajout person : " + person.getVotingId() + " _ weight=" + person.getWeight()); } for (Object o : person.getChoices()) { @@ -221,8 +226,8 @@ */ private void addVoteToContext(VoteToChoiceDTO vote, double weight, String votingID) { - if (log.isInfoEnabled()) { - log.info("Ajout vote : " + vote.getValue() + " _ choice=" + if (log.isDebugEnabled()) { + log.debug("Ajout vote : " + vote.getValue() + " _ choice=" + vote.getIdChoice()); } this.context.getChoice(vote.getIdChoice())
participants (1)
-
nrannou＠users.chorem.org