This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit a6faeb2cc1bfef659b5618b7009c82db6593b9e4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 18:30:25 2015 +0200 suppression des methodes de creations de configuration d'export --- .../service/report/ReportGenerationService.java | 29 ++++++++++++++++++++-- .../GenericFormatExportServiceAno5804Test.java | 14 ++++++++++- .../GenericFormatExportServiceTest.java | 27 ++++++++++++++++++-- 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java index d435bd2..a2de34b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java @@ -29,6 +29,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.genericformat.GenericFormatExportConfiguration; @@ -92,7 +93,7 @@ public class ReportGenerationService extends AbstractTuttiService { // export fishing operation progressionModel.increments(t("tutti.report.step.export.fishingOperation")); GenericFormatExportService service = getService(GenericFormatExportService.class); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForFishingOperation(request.getProgramId(), request.getCruiseId(), request.getFishingOperationId(), null); + GenericFormatExportConfiguration exportConfiguration = createExportConfigurationForFishingOperation(request.getProgramId(), request.getCruiseId(), request.getFishingOperationId(), null); GenericFormatExportResult exportResult = service.export(exportConfiguration, progressionModel); @@ -112,6 +113,30 @@ public class ReportGenerationService extends AbstractTuttiService { } + protected GenericFormatExportConfiguration createExportConfigurationForFishingOperation(String programId, String cruiseId, String fishingOperationId, File exportFile) { + + Preconditions.checkNotNull(programId); + Preconditions.checkNotNull(cruiseId); + Preconditions.checkNotNull(fishingOperationId); + + PersistenceService persistenceService = getService(PersistenceService.class); + + ProgramDataModel dataToExport = persistenceService.loadCruise(programId, cruiseId, fishingOperationId); + + GenericFormatExportConfiguration configuration = new GenericFormatExportConfiguration(); + configuration.setExportFile(exportFile); + configuration.setExportAttachments(true); + configuration.setExportSpecies(true); + configuration.setExportBenthos(true); + configuration.setExportMarineLitter(true); + configuration.setExportAccidentalCatch(true); + configuration.setExportIndividualObservation(true); + configuration.setDataToExport(dataToExport); + return configuration; + + } + + protected File newOutputFile() { return context.getConfig().newTempFile("tutti-report", ".pdf"); } @@ -207,7 +232,7 @@ public class ReportGenerationService extends AbstractTuttiService { int result = 4; GenericFormatExportService service = getService(GenericFormatExportService.class); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForFishingOperation(request.getProgramId(), request.getCruiseId(), request.getFishingOperationId(), null); + GenericFormatExportConfiguration exportConfiguration = createExportConfigurationForFishingOperation(request.getProgramId(), request.getCruiseId(), request.getFishingOperationId(), null); result += service.getExportNbSteps(exportConfiguration); return result; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java index 322bc47..93e3a8e 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java @@ -26,6 +26,7 @@ package fr.ifremer.tutti.service.genericformat; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; @@ -101,7 +102,18 @@ public class GenericFormatExportServiceAno5804Test { String programId = dataContext.program.getId(); String cruiseId = dataContext.cruise.getId(); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForCruise(programId, cruiseId, exportFile); + + ProgramDataModel dataToExport = persistenceService.loadCruises(programId, true, cruiseId); + + GenericFormatExportConfiguration exportConfiguration = new GenericFormatExportConfiguration(); + exportConfiguration.setExportFile(exportFile); + exportConfiguration.setExportAttachments(true); + exportConfiguration.setExportSpecies(true); + exportConfiguration.setExportBenthos(true); + exportConfiguration.setExportMarineLitter(true); + exportConfiguration.setExportAccidentalCatch(true); + exportConfiguration.setExportIndividualObservation(true); + exportConfiguration.setDataToExport(dataToExport); int nbSteps = service.getExportNbSteps(exportConfiguration); progressionModel.setTotal(nbSteps); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java index ca91118..250e4f9 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java @@ -24,6 +24,7 @@ package fr.ifremer.tutti.service.genericformat; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; @@ -233,7 +234,18 @@ public class GenericFormatExportServiceTest { Assert.assertFalse(exportFile.exists()); String programId = dataContext.program.getId(); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForProgram(programId, exportFile); + + ProgramDataModel dataToExport = persistenceService.loadProgram(programId, true); + + GenericFormatExportConfiguration exportConfiguration = new GenericFormatExportConfiguration(); + exportConfiguration.setExportFile(exportFile); + exportConfiguration.setExportAttachments(true); + exportConfiguration.setExportSpecies(true); + exportConfiguration.setExportBenthos(true); + exportConfiguration.setExportMarineLitter(true); + exportConfiguration.setExportAccidentalCatch(true); + exportConfiguration.setExportIndividualObservation(true); + exportConfiguration.setDataToExport(dataToExport); int nbSteps = service.getExportNbSteps(exportConfiguration); progressionModel.setTotal(nbSteps); @@ -251,7 +263,18 @@ public class GenericFormatExportServiceTest { String programId = dataContext.program.getId(); String cruiseId = dataContext.cruise.getId(); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForCruise(programId, cruiseId, exportFile); + + ProgramDataModel dataToExport = persistenceService.loadCruises(programId, true, cruiseId); + + GenericFormatExportConfiguration exportConfiguration = new GenericFormatExportConfiguration(); + exportConfiguration.setExportFile(exportFile); + exportConfiguration.setExportAttachments(true); + exportConfiguration.setExportSpecies(true); + exportConfiguration.setExportBenthos(true); + exportConfiguration.setExportMarineLitter(true); + exportConfiguration.setExportAccidentalCatch(true); + exportConfiguration.setExportIndividualObservation(true); + exportConfiguration.setDataToExport(dataToExport); int nbSteps = service.getExportNbSteps(exportConfiguration); progressionModel.setTotal(nbSteps); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.