Author: bleny Date: 2010-12-09 14:44:32 +0000 (Thu, 09 Dec 2010) New Revision: 829 Log: remove profiles on delete user Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-09 13:41:30 UTC (rev 828) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-09 14:44:32 UTC (rev 829) @@ -603,7 +603,7 @@ "canWrite BOOLEAN NOT NULL," + "CONSTRAINT waoUser_fkey FOREIGN KEY (waoUser) " + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION);"); + "ON UPDATE NO ACTION ON DELETE CASCADE);"); } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-12-09 13:41:30 UTC (rev 828) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-12-09 14:44:32 UTC (rev 829) @@ -392,12 +392,16 @@ } } - // FIXME 2010-12-09 bleny remove profiles - WaoUserDAO dao = WaoDAOHelper.getWaoUserDAO(transaction); + WaoUser actualUser = dao.findByTopiaId(user.getTopiaId()); - dao.delete(user); + // remove all profiles + UserProfileDAO userProfileDAO = WaoDAOHelper.getUserProfileDAO(transaction); + for (UserProfile userProfile : actualUser.getUserProfile()) { + userProfileDAO.delete(userProfile); + } + dao.delete(actualUser); transaction.commitTransaction(); } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)