This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 3e840ed Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) adds 23c0ed2 Revue des l'import des résultats adds 4d6b37a Renommage classes d'imports de résultats d'esdu adds cab394c Ne pas importer deux fois les esdu manquantes adds 6ad6b5b Plus le meme nombre de resultats importés sur les regions :() adds eea6b20 Improve toString on entities adds 04532ec Revue des bases acoustiques à importer adds ef3e745 Voyage acoustic import ok \o/ (See #8170) adds 7a059c1 Review tests again and again No new revisions were added by this update. Summary of changes: .../ifremer/echobase/entities/data/CellImpl.java | 2 +- .../data/{SampleDataImpl.java => DataImpl.java} | 8 +- .../fr/ifremer/echobase/entities/data/Datas.java | 8 + .../echobase/entities/references/CellTypeImpl.java | 2 +- .../entities/references/DataMetadataImpl.java | 13 +- .../services/service/UserDbPersistenceService.java | 14 +- ...=> ElementaryCellWithoutDepthEndException.java} | 7 +- ...va => EsduCellWithDepthEndFilledException.java} | 7 +- .../actions/VoyageAcousticsImportAction.java | 572 ++++++++++++++++----- .../VoyageResultsCellImportDataActionSupport.java | 143 ++++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 30 +- ...oyageResultsEsduByEchotypeCellImportAction.java | 30 +- ...yageResultsEsduCellImportDataActionSupport.java | 194 ------- ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 42 +- ...EsduSpeciesAndSizeCategoryCellImportAction.java | 42 +- .../actions/VoyageResultsRegionImportAction.java | 2 +- .../VoyageResultsRegionResultsImportAction.java | 291 ++++++----- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 ---- .../csv/EsduResultByEchotypeImportExportModel.java | 83 --- ...ltBySpeciesAndAgeCategoryImportExportModel.java | 91 ---- ...tBySpeciesAndSizeCategoryImportExportModel.java | 93 ---- ...l.java => VoyageAcousticImportExportModel.java} | 128 ++--- ...ImportRow.java => VoyageAcousticImportRow.java} | 93 +++- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 ++++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 8 +- ...yageResultsEsduByEchotypeImportExportModel.java | 83 +++ ...a => VoyageResultsEsduByEchotypeImportRow.java} | 8 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 91 ++++ ...sultsEsduBySpeciesAndAgeCategoryImportRow.java} | 8 +- ...uBySpeciesAndSizeCategoryImportExportModel.java | 93 ++++ ...ultsEsduBySpeciesAndSizeCategoryImportRow.java} | 8 +- .../VoyageResultsRegionCellResultImportRow.java | 93 ++-- .../i18n/echobase-services_fr_FR.properties | 2 + .../echobase/services/EchoBaseServiceFixtures.java | 28 - .../services/EchoBaseTestServiceSupport.java | 228 +------- .../services/FakeEchoBaseServiceContext.java | 14 + .../ImportDataFakeEchoBaseServiceContext.java} | 28 +- .../echobase/services/ImportDataFixtures.java | 132 +++++ .../services/MigrateImportDataDatabasesIT.java | 12 +- .../EmbeddedApplicationServiceIT.java | 4 +- .../exportCoser/ExportCoserServiceTest.java | 3 +- .../service/exportdb/ExportDbServiceTest.java | 4 +- .../importdata/AbstractImportDataServiceIT.java | 196 ++++--- .../importdata/VoyageAcousticImportServiceIT.java | 38 +- .../VoyageCatchesAllImportServiceIT.java | 25 +- ...geCatchesOnlyBiometrySampleImportServiceIT.java | 14 +- .../VoyageCatchesOnlySubSampleImportServiceIT.java | 14 +- ...oyageCatchesOnlyTotalSampleImportServiceIT.java | 13 +- .../VoyageCommonsAllImportServiceIT.java | 18 +- .../VoyageCommonsOnlyTransectImportServiceIT.java | 27 +- .../VoyageCommonsOnlyTransitImportServiceIT.java | 23 +- .../VoyageCommonsOnlyVoyageImportServiceIT.java | 31 +- .../importdata/VoyageOperationImportServiceIT.java | 14 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 16 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 20 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 16 +- ...lOnlySpeciesAndSizeCategoryImportServiceIT.java | 16 +- .../VoyageResultsMapFishCellImportServiceIT.java | 25 +- .../VoyageResultsMapOtherCellImportServiceIT.java | 16 +- .../VoyageResultsRegionCellImportServiceIT.java | 34 +- .../VoyageResultsVoyageImportServiceIT.java | 15 +- ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 15 +- ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 15 +- ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 18 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- .../resources/import-data/acoustic/movies.csv.gz | Bin 596169 -> 596169 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 0 -> 6141 bytes .../import-data/echobase-catches.h2.db.gz | Bin 659616 -> 663781 bytes 68 files changed, 1785 insertions(+), 1765 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{SampleDataImpl.java => DataImpl.java} (58%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => ElementaryCellWithoutDepthEndException.java} (73%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => EsduCellWithDepthEndFilledException.java} (76%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduCellImportDataActionSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{AcousticImportExportModel.java => VoyageAcousticImportExportModel.java} (64%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{AcousticImportRow.java => VoyageAcousticImportRow.java} (70%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultByEchotypeAndSpeciesCategoryImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (88%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultByEchotypeImportRow.java => VoyageResultsEsduByEchotypeImportRow.java} (87%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndAgeCategoryImportRow.java => VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java} (89%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndSizeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndSizeCategoryImportRow.java => VoyageResultsEsduBySpeciesAndSizeCategoryImportRow.java} (89%) copy echobase-services/src/{main/java/fr/ifremer/echobase/services/ProgressModel.java => test/java/fr/ifremer/echobase/services/ImportDataFakeEchoBaseServiceContext.java} (51%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java create mode 100644 echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.