Author: bleny Date: 2013-04-04 11:13:13 +0200 (Thu, 04 Apr 2013) New Revision: 68 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add clearDatabase in magaliePersistenceContext Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-03 10:20:27 UTC (rev 67) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-04 09:13:13 UTC (rev 68) @@ -85,4 +85,14 @@ entityTransaction = entityManager.getTransaction(); entityTransaction.begin(); } + + @Override + public void clearDatabase() { + entityTransaction.rollback(); + entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + JpaUtil.cleanDatabase(entityManager); + entityTransaction.commit(); + entityTransaction.begin(); + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-03 10:20:27 UTC (rev 67) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-04 09:13:13 UTC (rev 68) @@ -34,4 +34,6 @@ void rollback(); + void clearDatabase(); + } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-03 10:20:27 UTC (rev 67) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-04 09:13:13 UTC (rev 68) @@ -1,6 +1,6 @@ package com.franciaflex.magalie.services.service; -import com.franciaflex.magalie.persistence.JpaUtil; +import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.SiteDao; @@ -32,8 +32,20 @@ this.serviceContext = serviceContext; } + public void cleanDatabaseAndLoadFixtures() { + + loadFixtures(true); + + } + public void loadFixtures() { + loadFixtures(false); + + } + + protected void loadFixtures(boolean cleanDatabase) { + boolean devMode = serviceContext.getMagalieApplicationConfig().isDevMode(); if (devMode) { @@ -51,12 +63,14 @@ EntityManager entityManager = ((DefaultMagalieServiceContext) serviceContext).getEntityManager(); - // serviceContext.getPersistenceContext(); + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - JpaUtil.cleanDatabase(entityManager); + if (cleanDatabase) { - serviceContext.getPersistenceContext().commit(); + persistenceContext.clearDatabase(); + } + MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao(); Collection<MagalieUser> users = fixtures.fixture("users"); @@ -67,7 +81,7 @@ } - serviceContext.getPersistenceContext().commit(); + persistenceContext.commit(); SiteDao siteDao = serviceContext.getSiteDao(); @@ -79,7 +93,7 @@ } - serviceContext.getPersistenceContext().commit(); + persistenceContext.commit(); ArticleDao articleDao = serviceContext.getArticleDao(); @@ -91,7 +105,7 @@ } - serviceContext.getPersistenceContext().commit(); + persistenceContext.commit(); StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); @@ -103,7 +117,7 @@ } - serviceContext.getPersistenceContext().commit(); + persistenceContext.commit(); } else { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-04-03 10:20:27 UTC (rev 67) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-04-04 09:13:13 UTC (rev 68) @@ -74,7 +74,7 @@ FixturesService fixturesService = serviceContext.newService(FixturesService.class); - fixturesService.loadFixtures(); + fixturesService.cleanDatabaseAndLoadFixtures(); fixturesLoaded = true; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-03 10:20:27 UTC (rev 67) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-04 09:13:13 UTC (rev 68) @@ -19,7 +19,7 @@ @Override public String execute() throws Exception { - service.loadFixtures(); + service.cleanDatabaseAndLoadFixtures(); addActionMessage("Jeu de données initial restauré");