Author: bleny Date: 2014-05-12 15:42:35 +0200 (Mon, 12 May 2014) New Revision: 1927 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1927 Log: refs #4481 add unique on WaoUser#canReadBoats and WaoUser#allegroWallet Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-05-12 13:26:09 UTC (rev 1926) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-05-12 13:42:35 UTC (rev 1927) @@ -46,8 +46,10 @@ import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.StringUtil; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; public class WaoUsersService extends WaoServiceSupport { @@ -161,7 +163,7 @@ waoUser.clearCanReadBoats(); if (waoUser.hasUserRole(UserRole.PROFESSIONAL, obsProgram)) { - List<Boat> boatsFromImmatriculations = getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats()); + Set<Boat> boatsFromImmatriculations = new HashSet<>(getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats())); waoUser.setCanReadBoats(boatsFromImmatriculations); }