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 5df9496 Amélioration du site technique adds 75be19e up to topia and eugene snapshots adds b71258e USe new Version package adds 19d87d6 move migration files adds 5eb7c02 Improve logs adds abdc624 Review importLog model (make imported ids depends on his ImportFile + add lineNumber of each imported id) adds 8a9e58a Update migration test databases adds 2ef8fdd Add nice methods on ImportFile adds e09f24d Review import data cinematic, creating import log before do the math in order to be able to reuse imported ids from database to build the checked import file adds 0262d40 Update remove data api, but tests are not ok since test databases are to be rebuild :( No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 8 + .../echobase/entities/ImportFileImpl.hbm.xml | 22 +++ .../ifremer/echobase/entities/ImportFileImpl.java | 30 ++++ .../ifremer/echobase/entities/ImportLogImpl.java | 35 ++++ .../EchoBaseMigrationCallBackResolver.java | 7 +- .../internalDb/MigrationCallBackForVersion.java | 7 + .../internalDb/MigrationCallBackForVersion2_2.java | 23 ++- .../migration/internalDb/MigrationCallback.java | 13 +- .../workingDb/MigrationCallBackForVersion.java | 8 + .../workingDb/MigrationCallBackForVersion2_2.java | 4 +- .../MigrationCallBackForVersion2_5_1.java | 8 +- .../workingDb/MigrationCallBackForVersion2_6.java | 14 +- .../MigrationCallBackForVersion2_6_1.java | 10 +- .../MigrationCallBackForVersion2_7_2.java | 10 +- .../MigrationCallBackForVersion3_900.java | 4 +- .../MigrationCallBackForVersion3_901.java | 36 +++++ .../migration/workingDb/MigrationCallback.java | 2 +- ...migration.workingDb.MigrationCallBackForVersion | 3 +- .../3.901-2-drop-importLog_importId-table.sql | 1 + .../3.901-3-drop-importLog-voyageId-notNull.sql | 1 + .../h2/3.901-0-add-importFile_importId-table.sql | 2 + .../3.901-1-add-importFile-importText-column.sql | 1 + .../{ => pg}/2.5.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.5.1-1-postgis-view.sql | 0 .../workingDb/{ => pg}/2.6-0-postgis-view.sql | 0 .../{ => pg}/2.6.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.7.2-0-postgis-view.sql | 0 echobase-domain/src/main/xmi/echobase.properties | 11 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89758 -> 90261 bytes .../services/service/UserDbPersistenceService.java | 48 +++--- .../service/importdata/ImportDataFileResult.java | 34 ++-- .../service/importdata/ImportDataResult.java | 10 +- .../service/importdata/ImportDataService.java | 180 +++++---------------- .../actions/ImportDataActionSupport.java | 75 ++++++++- .../actions/VoyageAcousticsImportAction.java | 62 +++---- .../VoyageCatchesBiometrySampleImportAction.java | 6 +- .../VoyageCatchesImportDataActionSupport.java | 8 +- .../VoyageCatchesSubSampleImportAction.java | 8 +- .../VoyageCatchesTotalSampleImportAction.java | 12 +- .../actions/VoyageCommonsTransectImportAction.java | 14 +- .../actions/VoyageCommonsTransitImportAction.java | 14 +- .../actions/VoyageCommonsVoyageImportAction.java | 9 +- .../VoyageOperationsGearMetadataImportAction.java | 4 +- .../VoyageOperationsOperationImportAction.java | 4 +- ...ageOperationsOperationMetadataImportAction.java | 4 +- .../VoyageResultsCellImportDataActionSupport.java | 4 +- .../VoyageResultsImportDataActionSupport.java | 4 +- .../VoyageResultsMapFishCellImportAction.java | 18 +-- .../VoyageResultsMapOtherCellImportAction.java | 18 +-- .../actions/VoyageResultsRegionImportAction.java | 8 +- .../VoyageResultsRegionResultsImportAction.java | 8 - .../VoyageResultsVoyageEchotypeImportAction.java | 2 +- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 4 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 4 +- .../contexts/ImportDataContextSupport.java | 38 ++++- .../contexts/VoyageAcousticsImportDataContext.java | 5 +- .../contexts/VoyageCatchesImportDataContext.java | 5 +- .../contexts/VoyageCommonsImportDataContext.java | 5 +- .../contexts/VoyageImportDataContextSupport.java | 13 +- .../VoyageOperationsImportDataContext.java | 5 +- .../contexts/VoyageResultsImportDataContext.java | 5 +- .../importdb/strategy/FreeImportDbStrategy.java | 13 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../services/MigrateImportDataDatabasesIT.java | 2 - .../importdata/AbstractImportDataServiceIT.java | 9 +- .../removedata/AbstractRemoveDataServiceTest.java | 35 ++-- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 703063 -> 657421 bytes .../import-data/echobase-catches.h2.db.gz | Bin 663781 -> 624390 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 179054 -> 179274 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129703 -> 129991 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 660514 -> 625297 bytes .../import-data/echobase-operation.h2.db.gz | Bin 323654 -> 320307 bytes pom.xml | 4 +- 87 files changed, 577 insertions(+), 414 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileImpl.hbm.xml create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion3_901.java create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-2-drop-importLog_importId-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-3-drop-importLog-voyageId-notNull.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-0-add-importFile_importId-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-1-add-importFile-importText-column.sql rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.5.1-0-postgis-structure.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.5.1-1-postgis-view.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.6-0-postgis-view.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.6.1-0-postgis-structure.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.7.2-0-postgis-view.sql (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.