Author: bleny Date: 2013-04-09 15:05:01 +0200 (Tue, 09 Apr 2013) New Revision: 81 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refactor fixtures save DeliveredRequestedArticle Added: trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml Removed: trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-web/src/main/resources/fixtures.yaml 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/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.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-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-09 08:33:34 UTC (rev 80) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-09 13:05:01 UTC (rev 81) @@ -14,10 +14,13 @@ import com.franciaflex.magalie.services.MagalieFixtures; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.Collection; +import java.util.Map; public class FixturesService implements MagalieService { @@ -25,37 +28,39 @@ protected MagalieServiceContext serviceContext; - protected static MagalieFixtures fixtures; + protected Map<String, MagalieFixtures> fixtureSets = Maps.newHashMap(); @Override public void setServiceContext(MagalieServiceContext serviceContext) { this.serviceContext = serviceContext; } - public void cleanDatabaseAndLoadFixtures() { + public MagalieFixtures cleanDatabaseAndLoadFixtures(String fixturesSetName) { - loadFixtures(true); + return loadFixtures(fixturesSetName, true); } - public void loadFixtures() { + public MagalieFixtures loadFixtures(String fixturesSetName) { - loadFixtures(false); + return loadFixtures(fixturesSetName, false); } - protected void loadFixtures(boolean cleanDatabase) { + protected MagalieFixtures loadFixtures(String fixturesSetName, boolean cleanDatabase) { boolean devMode = serviceContext.getMagalieApplicationConfig().isDevMode(); - if (devMode) { + Preconditions.checkState(devMode); - if (fixtures == null) { + MagalieFixtures fixtures = fixtureSets.get(fixturesSetName); - fixtures = new MagalieFixtures("fixtures"); + if (fixtures == null) { - } + fixtures = new MagalieFixtures(fixturesSetName); + fixtureSets.put(fixturesSetName, fixtures); + if (log.isInfoEnabled()) { log.info("will restore database with fixture set"); } @@ -128,17 +133,10 @@ persistenceContext.commit(); - } else { - - if (log.isWarnEnabled()) { - log.warn("tried to load fixtures with devMode disabled, did nothing"); - } - } - } + return fixtures; - public <E> E fixture(String id) { - return fixtures.fixture(id); } + } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-09 08:33:34 UTC (rev 80) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-09 13:05:01 UTC (rev 81) @@ -23,9 +23,12 @@ * #L% */ +import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.RequestedArticles; +import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; @@ -33,6 +36,7 @@ import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException; import com.franciaflex.magalie.services.exception.UnavailableArticleException; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import org.apache.commons.logging.Log; @@ -102,9 +106,11 @@ boolean requiredDriverLicence = false; + RequestedArticle requestedArticle = null; + while (storageMovementOrder == null && requestedArticleIterator.hasNext()) { - RequestedArticle requestedArticle = requestedArticleIterator.next(); + requestedArticle = requestedArticleIterator.next(); Article article = requestedArticle.getArticle(); @@ -150,6 +156,26 @@ } } + if (storageMovementOrder != null) { + + Preconditions.checkState(requestedArticle != null); + + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + DeliveredRequestedArticleDao dao = persistenceContext.getDeliveredRequestedArticleDao(); + + DeliveredRequestedArticle newDeliveredRequestedArticle = new DeliveredRequestedArticle(); + + newDeliveredRequestedArticle.setRequestedArticle(requestedArticle); + + newDeliveredRequestedArticle.setStorageMovementOrder(storageMovementOrder); + + dao.persist(newDeliveredRequestedArticle); + + persistenceContext.commit(); + + } + return storageMovementOrder; } Deleted: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-09 08:33:34 UTC (rev 80) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-09 13:05:01 UTC (rev 81) @@ -1,168 +0,0 @@ -alexandre: - &alexandre !user - id: magalie_user_alexandre - login: ale - name: Alexandre - accreditationLevel: 9 - -basile: - &basile !user - id: magalie_user_basile - login: bas - name: Basile - accreditationLevel: 0 - -cathy: - &cathy !user - id: magalie_user_cathy - login: cat - name: Cathy - accreditationLevel: 9 - -david: - &david !user - id: magalie_user_david - login: dav - name: David - accreditationLevel: 0 - -users: - - *alexandre - - *basile - - *cathy - - *david - -site1: - &site1 !site - id: site1 - storeCode: UO1 - locationCode: A1 - requiredAccreditationLevel: 0 - -site2: - &site2 !site - id: site2 - storeCode: UO1 - locationCode: B2 - requiredAccreditationLevel: 9 - -site3: - &site3 !site - id: site3 - storeCode: UO1 - locationCode: C3 - requiredAccreditationLevel: 0 - -site4: - &site4 !site - id: site4 - storeCode: UO1 - locationCode: D4 - requiredAccreditationLevel: 9 - -site5: - &site5 !site - id: site5 - storeCode: UO2 - locationCode: A1 - requiredAccreditationLevel: 0 - -sites: - - *site1 - - *site2 - - *site3 - - *site4 - - *site5 - -article1: - &article1 !article - id: article1 - fixedSites: - - *site1 - code: 111111111 - quantityInKanban: 10 - unit: kg - description: very big screws - -article2: - &article2 !article - id: article2 - code: 222222222 - quantityInKanban: 2 - unit: box - description: little buttons - -article3: - &article3 !article - id: article3 - fixedSites: - - *site2 - code: 333333333 - quantityInKanban: 50 - unit: g - description: magic powder - -articles: - - *article1 - - *article2 - - *article3 - -storedArticle1: - &storedArticle1 !stored-article - id: storedArticle1 - article: *article1 - site: *site1 - quantity: 50 - -storedArticle2: - &storedArticle2 !stored-article - id: storedArticle2 - article: *article1 - site: *site2 - quantity: 20 - -storedArticle3: - &storedArticle3 !stored-article - id: storedArticle3 - article: *article2 - site: *site1 - quantity: 10 - -storedArticle4: - &storedArticle4 !stored-article - id: storedArticle4 - article: *article3 - site: *site4 - quantity: 1000 - -storedArticles: - - *storedArticle1 - - *storedArticle2 - - *storedArticle3 - - *storedArticle4 - -storedArticlesForArticle1: - - *storedArticle1 - - *storedArticle2 - -requestedArticle1: - &requestedArticle1 !requested-article - id: requestedArticle1 - article: *article3 - quantity: 100 - requestList: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: true - -requestedArticle2: - &requestedArticle2 !requested-article - id: requestedArticle2 - article: *article3 - quantity: 250 - requestList: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: false - -requestedArticles: - - *requestedArticle1 - - *requestedArticle2 Copied: trunk/magalie-services/src/main/resources/fixtures.yaml (from rev 79, trunk/magalie-web/src/main/resources/fixtures.yaml) =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml (rev 0) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-09 13:05:01 UTC (rev 81) @@ -0,0 +1,398 @@ +pascal: + &pascal !user + id: magalie_user_pascal + login: phe + name: Pascal Heinz + accreditationLevel: 9 + +bruno: + &bruno !user + id: magalie_user_bruno + login: bmr + name: Bruno Menager + accreditationLevel: 9 + +corinne: + &corinne !user + id: magalie_user_corinne + login: ccr + name: Corinne Cocolon + accreditationLevel: 0 + +xavier: + &xavier !user + id: magalie_user_xavier + login: xbe + name: Xavier Bertini + accreditationLevel: 0 + +users: + - *bruno + - *corinne + - *pascal + - *xavier + +site1: + &site1 !site + id: site1 + storeCode: U01 + locationCode: A01 + requiredAccreditationLevel: 0 + +site2: + &site2 !site + id: site2 + storeCode: U01 + locationCode: B02 + requiredAccreditationLevel: 9 + +site3: + &site3 !site + id: site3 + storeCode: U01 + locationCode: C03 + requiredAccreditationLevel: 0 + +site4: + &site4 !site + id: site4 + storeCode: U01 + locationCode: D04 + requiredAccreditationLevel: 9 + +site5: + &site5 !site + id: site5 + storeCode: U02 + locationCode: F01 + requiredAccreditationLevel: 0 + +site6: + &site6 !site + id: site6 + storeCode: U02 + locationCode: G02 + requiredAccreditationLevel: 0 + +site7: + &site7 !site + id: site7 + storeCode: U02 + locationCode: H03 + requiredAccreditationLevel: 9 + +site8: + &site8 !site + id: site8 + storeCode: U04 + locationCode: A010 + requiredAccreditationLevel: 0 + +site9: + &site9 !site + id: site9 + storeCode: SOM + locationCode: B10 + requiredAccreditationLevel: 0 + +site10: + &site10 !site + id: site10 + storeCode: SOM + locationCode: B24 + requiredAccreditationLevel: 0 + +site11: + &site11 !site + id: site11 + storeCode: SOM + locationCode: B77 + requiredAccreditationLevel: 0 + +site12: + &site12 !site + id: site12 + storeCode: SOM + locationCode: C12 + requiredAccreditationLevel: 0 + +site13: + &site13 !site + id: site13 + storeCode: U01 + locationCode: REC + requiredAccreditationLevel: 0 + +sites: + - *site1 + - *site2 + - *site3 + - *site4 + - *site5 + - *site6 + - *site7 + - *site8 + - *site9 + - *site10 + - *site11 + - *site12 + - *site13 + +article1: + &article1 !article + id: article1 + fixedSites: + - *site4 + - *site8 + code: 4034108 + quantityInKanban: 50 + unit: M + description: Jonc Souple D5 + +article2: + &article2 !article + id: article2 + fixedSites: + - *site11 + code: 4033079 + quantityInKanban: 3 + unit: PCE + description: Moteur Oréa Slt 50 RTS 50/12 + +article3: + &article3 !article + id: article3 + fixedSites: + - *site1 + code: 4092459 + quantityInKanban: 50 + unit: PCE + description: Interface ASA/SOMFY + clip + +article4: + &article4 !article + id: article4 + code: 4019450 + quantityInKanban: 20 + unit: PCE + description: Kit Tr.PM Fixe 122G D40Plat 10 + +article5: + &article5 !article + id: article5 + fixedSites: + - *site5 + code: 4020012 + quantityInKanban: 10 + unit: B60 + description: Caisson 2005 3F 6000 Brun + +article6: + &article6 !article + id: article6 + fixedSites: + - *site3 + code: 1421812 + quantityInKanban: 9 + unit: PCE + description: Ensemble SOLIRIS UNO + +articles: + - *article1 + - *article2 + - *article3 + - *article4 + - *article5 + - *article6 + +storedArticle1: + &storedArticle1 !stored-article + id: storedArticle1 + article: *article1 + site: *site4 + quantity: 40 + +storedArticle2: + &storedArticle2 !stored-article + id: storedArticle2 + article: *article1 + site: *site8 + quantity: 20 + +storedArticle3: + &storedArticle3 !stored-article + id: storedArticle3 + article: *article2 + site: *site10 + quantity: 2 + +storedArticle4: + &storedArticle4 !stored-article + id: storedArticle4 + article: *article3 + site: *site1 + quantity: 90 + +storedArticle5: + &storedArticle5 !stored-article + id: storedArticle5 + article: *article1 + site: *site13 + quantity: 30 + +storedArticle6: + &storedArticle6 !stored-article + id: storedArticle6 + article: *article2 + site: *site11 + quantity: 100 + +storedArticle7: + &storedArticle7 !stored-article + id: storedArticle7 + article: *article2 + site: *site12 + quantity: 10 + +storedArticle8: + &storedArticle8 !stored-article + id: storedArticle8 + article: *article3 + site: *site2 + quantity: 500 + +storedArticle9: + &storedArticle9 !stored-article + id: storedArticle9 + article: *article3 + site: *site3 + quantity: 50 + +storedArticle10: + &storedArticle10 !stored-article + id: storedArticle10 + article: *article5 + site: *site5 + quantity: 5 + +storedArticle11: + &storedArticle11 !stored-article + id: storedArticle11 + article: *article5 + site: *site6 + quantity: 2 + +storedArticle12: + &storedArticle12 !stored-article + id: storedArticle12 + article: *article5 + site: *site7 + quantity: 25 + +storedArticle13: + &storedArticle13 !stored-article + id: storedArticle13 + article: *article6 + site: *site3 + quantity: 70 + +storedArticles: + - *storedArticle1 + - *storedArticle2 + - *storedArticle3 + - *storedArticle4 + - *storedArticle5 + - *storedArticle6 + - *storedArticle7 + - *storedArticle8 + - *storedArticle9 + - *storedArticle10 + - *storedArticle11 + - *storedArticle12 + - *storedArticle13 + +storedArticlesForArticle1: + - *storedArticle1 + - *storedArticle2 + - *storedArticle5 + +storedArticlesForArticle2: + - *storedArticle3 + - *storedArticle6 + - *storedArticle7 + +storedArticlesForArticle3: + - *storedArticle4 + - *storedArticle8 + - *storedArticle9 + +storedArticlesForArticle5: + - *storedArticle10 + - *storedArticle11 + - *storedArticle12 + +storedArticlesForArticle6: + - *storedArticle13 + +requestedArticle1: + &requestedArticle1 !requested-article + id: requestedArticle1 + article: *article1 + quantity: 80 + requestList: 123456789 + requestDate: 2013-04-08 12:00:00 + urgent: true + +requestedArticle2: + &requestedArticle2 !requested-article + id: requestedArticle2 + article: *article2 + quantity: 11 + requestList: 123456789 + requestDate: 2013-04-08 12:00:00 + urgent: false + +requestedArticle3: + &requestedArticle3 !requested-article + id: requestedArticle3 + article: *article3 + quantity: 111 + requestList: 123456789 + requestDate: 2013-04-08 12:00:00 + urgent: true + +requestedArticle4: + &requestedArticle4 !requested-article + id: requestedArticle4 + article: *article4 + quantity: 2 + requestList: 123456789 + requestDate: 2013-04-08 12:00:00 + urgent: true + +requestedArticle5: + &requestedArticle5 !requested-article + id: requestedArticle5 + article: *article5 + quantity: 5 + requestList: 987654321 + requestDate: 2013-04-08 12:00:00 + urgent: true + +requestedArticle6: + &requestedArticle6 !requested-article + id: requestedArticle6 + article: *article6 + quantity: 27 + requestList: 987654321 + requestDate: 2013-04-08 12:00:00 + urgent: true + + +requestedArticles: + - *requestedArticle1 + - *requestedArticle2 + - *requestedArticle3 + - *requestedArticle4 + - *requestedArticle5 + - *requestedArticle6 Copied: trunk/magalie-services/src/main/resources/fixtures2.yaml (from rev 75, trunk/magalie-services/src/main/resources/fixtures.yaml) =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml (rev 0) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-09 13:05:01 UTC (rev 81) @@ -0,0 +1,168 @@ +alexandre: + &alexandre !user + id: magalie_user_alexandre + login: ale + name: Alexandre + accreditationLevel: 9 + +basile: + &basile !user + id: magalie_user_basile + login: bas + name: Basile + accreditationLevel: 0 + +cathy: + &cathy !user + id: magalie_user_cathy + login: cat + name: Cathy + accreditationLevel: 9 + +david: + &david !user + id: magalie_user_david + login: dav + name: David + accreditationLevel: 0 + +users: + - *alexandre + - *basile + - *cathy + - *david + +site1: + &site1 !site + id: site1 + storeCode: UO1 + locationCode: A1 + requiredAccreditationLevel: 0 + +site2: + &site2 !site + id: site2 + storeCode: UO1 + locationCode: B2 + requiredAccreditationLevel: 9 + +site3: + &site3 !site + id: site3 + storeCode: UO1 + locationCode: C3 + requiredAccreditationLevel: 0 + +site4: + &site4 !site + id: site4 + storeCode: UO1 + locationCode: D4 + requiredAccreditationLevel: 9 + +site5: + &site5 !site + id: site5 + storeCode: UO2 + locationCode: A1 + requiredAccreditationLevel: 0 + +sites: + - *site1 + - *site2 + - *site3 + - *site4 + - *site5 + +article1: + &article1 !article + id: article1 + fixedSites: + - *site1 + code: 111111111 + quantityInKanban: 10 + unit: kg + description: very big screws + +article2: + &article2 !article + id: article2 + code: 222222222 + quantityInKanban: 2 + unit: box + description: little buttons + +article3: + &article3 !article + id: article3 + fixedSites: + - *site2 + code: 333333333 + quantityInKanban: 50 + unit: g + description: magic powder + +articles: + - *article1 + - *article2 + - *article3 + +storedArticle1: + &storedArticle1 !stored-article + id: storedArticle1 + article: *article1 + site: *site1 + quantity: 50 + +storedArticle2: + &storedArticle2 !stored-article + id: storedArticle2 + article: *article1 + site: *site2 + quantity: 20 + +storedArticle3: + &storedArticle3 !stored-article + id: storedArticle3 + article: *article2 + site: *site1 + quantity: 10 + +storedArticle4: + &storedArticle4 !stored-article + id: storedArticle4 + article: *article3 + site: *site4 + quantity: 1000 + +storedArticles: + - *storedArticle1 + - *storedArticle2 + - *storedArticle3 + - *storedArticle4 + +storedArticlesForArticle1: + - *storedArticle1 + - *storedArticle2 + +requestedArticle1: + &requestedArticle1 !requested-article + id: requestedArticle1 + article: *article3 + quantity: 100 + requestList: 123456789 + requestDate: 2013-04-08 12:00:00 + urgent: true + +requestedArticle2: + &requestedArticle2 !requested-article + id: requestedArticle2 + article: *article3 + quantity: 250 + requestList: 123456789 + requestDate: 2013-04-08 12:00:00 + urgent: false + +requestedArticles: + - *requestedArticle1 + - *requestedArticle2 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-04-09 08:33:34 UTC (rev 80) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-04-09 13:05:01 UTC (rev 81) @@ -11,15 +11,13 @@ protected static final double DELTA = 0.0001; - protected static MagalieFixtures fixtures; - protected static MagalieApplicationConfig magalieApplicationConfig; protected JpaEntityManagerRule jpaEntityManagerRule; protected FakeMagalieServiceContext serviceContext; - protected FixturesService fixturesService; + protected MagalieFixtures magalieFixtures; protected static MagalieApplicationConfig getMagalieApplicationConfig() { @@ -53,17 +51,17 @@ } - protected <E> E fixture(String id) { + protected void loadFixtures(String fixturesSetName) { - if (fixturesService == null) { + FixturesService fixturesService = getServiceContext().newService(FixturesService.class); - fixturesService = getServiceContext().newService(FixturesService.class); + magalieFixtures = fixturesService.loadFixtures(fixturesSetName); - fixturesService.loadFixtures(); + } - } + protected <E> E fixture(String id) { - return fixturesService.fixture(id); + return magalieFixtures.fixture(id); } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-09 08:33:34 UTC (rev 80) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-09 13:05:01 UTC (rev 81) @@ -27,6 +27,8 @@ @Before public void setUp() throws ParseException { + loadFixtures("fixtures2"); + service = newService(ArticleStorageService.class); serviceContext.setDate(new Date(1363948427576l)); Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-09 08:33:34 UTC (rev 80) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-09 13:05:01 UTC (rev 81) @@ -18,6 +18,8 @@ @Before public void setUp() throws ParseException { + loadFixtures("fixtures"); + service = newService(RequestedArticleService.class); serviceContext.setDate(new Date(1363948427576l)); 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-09 08:33:34 UTC (rev 80) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-04-09 13:05:01 UTC (rev 81) @@ -74,7 +74,7 @@ FixturesService fixturesService = serviceContext.newService(FixturesService.class); - fixturesService.cleanDatabaseAndLoadFixtures(); + fixturesService.cleanDatabaseAndLoadFixtures("fixtures"); 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-09 08:33:34 UTC (rev 80) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-09 13:05:01 UTC (rev 81) @@ -17,9 +17,9 @@ } @Override - public String execute() throws Exception { + public String execute() { - service.cleanDatabaseAndLoadFixtures(); + service.cleanDatabaseAndLoadFixtures("fixtures"); addActionMessage("Jeu de données initial restauré"); Deleted: trunk/magalie-web/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-web/src/main/resources/fixtures.yaml 2013-04-09 08:33:34 UTC (rev 80) +++ trunk/magalie-web/src/main/resources/fixtures.yaml 2013-04-09 13:05:01 UTC (rev 81) @@ -1,398 +0,0 @@ -pascal: - &pascal !user - id: magalie_user_pascal - login: phe - name: Pascal Heinz - accreditationLevel: 9 - -bruno: - &bruno !user - id: magalie_user_bruno - login: bmr - name: Bruno Menager - accreditationLevel: 9 - -corinne: - &corinne !user - id: magalie_user_corinne - login: ccr - name: Corinne Cocolon - accreditationLevel: 0 - -xavier: - &xavier !user - id: magalie_user_xavier - login: xbe - name: Xavier Bertini - accreditationLevel: 0 - -users: - - *bruno - - *corinne - - *pascal - - *xavier - -site1: - &site1 !site - id: site1 - storeCode: U01 - locationCode: A01 - requiredAccreditationLevel: 0 - -site2: - &site2 !site - id: site2 - storeCode: U01 - locationCode: B02 - requiredAccreditationLevel: 9 - -site3: - &site3 !site - id: site3 - storeCode: U01 - locationCode: C03 - requiredAccreditationLevel: 0 - -site4: - &site4 !site - id: site4 - storeCode: U01 - locationCode: D04 - requiredAccreditationLevel: 9 - -site5: - &site5 !site - id: site5 - storeCode: U02 - locationCode: F01 - requiredAccreditationLevel: 0 - -site6: - &site6 !site - id: site6 - storeCode: U02 - locationCode: G02 - requiredAccreditationLevel: 0 - -site7: - &site7 !site - id: site7 - storeCode: U02 - locationCode: H03 - requiredAccreditationLevel: 9 - -site8: - &site8 !site - id: site8 - storeCode: U04 - locationCode: A010 - requiredAccreditationLevel: 0 - -site9: - &site9 !site - id: site9 - storeCode: SOM - locationCode: B10 - requiredAccreditationLevel: 0 - -site10: - &site10 !site - id: site10 - storeCode: SOM - locationCode: B24 - requiredAccreditationLevel: 0 - -site11: - &site11 !site - id: site11 - storeCode: SOM - locationCode: B77 - requiredAccreditationLevel: 0 - -site12: - &site12 !site - id: site12 - storeCode: SOM - locationCode: C12 - requiredAccreditationLevel: 0 - -site13: - &site13 !site - id: site13 - storeCode: U01 - locationCode: REC - requiredAccreditationLevel: 0 - -sites: - - *site1 - - *site2 - - *site3 - - *site4 - - *site5 - - *site6 - - *site7 - - *site8 - - *site9 - - *site10 - - *site11 - - *site12 - - *site13 - -article1: - &article1 !article - id: article1 - fixedSites: - - *site4 - - *site8 - code: 4034108 - quantityInKanban: 50 - unit: M - description: Jonc Souple D5 - -article2: - &article2 !article - id: article2 - fixedSites: - - *site11 - code: 4033079 - quantityInKanban: 3 - unit: PCE - description: Moteur Oréa Slt 50 RTS 50/12 - -article3: - &article3 !article - id: article3 - fixedSites: - - *site1 - code: 4092459 - quantityInKanban: 50 - unit: PCE - description: Interface ASA/SOMFY + clip - -article4: - &article4 !article - id: article4 - code: 4019450 - quantityInKanban: 20 - unit: PCE - description: Kit Tr.PM Fixe 122G D40Plat 10 - -article5: - &article5 !article - id: article5 - fixedSites: - - *site5 - code: 4020012 - quantityInKanban: 10 - unit: B60 - description: Caisson 2005 3F 6000 Brun - -article6: - &article6 !article - id: article6 - fixedSites: - - *site3 - code: 1421812 - quantityInKanban: 9 - unit: PCE - description: Ensemble SOLIRIS UNO - -articles: - - *article1 - - *article2 - - *article3 - - *article4 - - *article5 - - *article6 - -storedArticle1: - &storedArticle1 !stored-article - id: storedArticle1 - article: *article1 - site: *site4 - quantity: 40 - -storedArticle2: - &storedArticle2 !stored-article - id: storedArticle2 - article: *article1 - site: *site8 - quantity: 20 - -storedArticle3: - &storedArticle3 !stored-article - id: storedArticle3 - article: *article2 - site: *site10 - quantity: 2 - -storedArticle4: - &storedArticle4 !stored-article - id: storedArticle4 - article: *article3 - site: *site1 - quantity: 90 - -storedArticle5: - &storedArticle5 !stored-article - id: storedArticle5 - article: *article1 - site: *site13 - quantity: 30 - -storedArticle6: - &storedArticle6 !stored-article - id: storedArticle6 - article: *article2 - site: *site11 - quantity: 100 - -storedArticle7: - &storedArticle7 !stored-article - id: storedArticle7 - article: *article2 - site: *site12 - quantity: 10 - -storedArticle8: - &storedArticle8 !stored-article - id: storedArticle8 - article: *article3 - site: *site2 - quantity: 500 - -storedArticle9: - &storedArticle9 !stored-article - id: storedArticle9 - article: *article3 - site: *site3 - quantity: 50 - -storedArticle10: - &storedArticle10 !stored-article - id: storedArticle10 - article: *article5 - site: *site5 - quantity: 5 - -storedArticle11: - &storedArticle11 !stored-article - id: storedArticle11 - article: *article5 - site: *site6 - quantity: 2 - -storedArticle12: - &storedArticle12 !stored-article - id: storedArticle12 - article: *article5 - site: *site7 - quantity: 25 - -storedArticle13: - &storedArticle13 !stored-article - id: storedArticle13 - article: *article6 - site: *site3 - quantity: 70 - -storedArticles: - - *storedArticle1 - - *storedArticle2 - - *storedArticle3 - - *storedArticle4 - - *storedArticle5 - - *storedArticle6 - - *storedArticle7 - - *storedArticle8 - - *storedArticle9 - - *storedArticle10 - - *storedArticle11 - - *storedArticle12 - - *storedArticle13 - -storedArticlesForArticle1: - - *storedArticle1 - - *storedArticle2 - - *storedArticle5 - -storedArticlesForArticle2: - - *storedArticle3 - - *storedArticle6 - - *storedArticle7 - -storedArticlesForArticle3: - - *storedArticle4 - - *storedArticle8 - - *storedArticle9 - -storedArticlesForArticle5: - - *storedArticle10 - - *storedArticle11 - - *storedArticle12 - -storedArticlesForArticle6: - - *storedArticle13 - -requestedArticle1: - &requestedArticle1 !requested-article - id: requestedArticle1 - article: *article1 - quantity: 80 - requestList: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: true - -requestedArticle2: - &requestedArticle2 !requested-article - id: requestedArticle2 - article: *article2 - quantity: 11 - requestList: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: false - -requestedArticle3: - &requestedArticle3 !requested-article - id: requestedArticle3 - article: *article3 - quantity: 111 - requestList: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: true - -requestedArticle4: - &requestedArticle4 !requested-article - id: requestedArticle4 - article: *article4 - quantity: 2 - requestList: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: true - -requestedArticle5: - &requestedArticle5 !requested-article - id: requestedArticle5 - article: *article5 - quantity: 5 - requestList: 987654321 - requestDate: 2013-04-08 12:00:00 - urgent: true - -requestedArticle6: - &requestedArticle6 !requested-article - id: requestedArticle6 - article: *article6 - quantity: 27 - requestList: 987654321 - requestDate: 2013-04-08 12:00:00 - urgent: true - - -requestedArticles: - - *requestedArticle1 - - *requestedArticle2 - - *requestedArticle3 - - *requestedArticle4 - - *requestedArticle5 - - *requestedArticle6