This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a21043517c7ec535fa263b8a9d16b048c350a847 Author: jcouteau <couteau@codelutin.com> Date: Fri Nov 15 09:27:38 2019 +0100 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base --- .../ifremer/echobase/services/service/UserDbPersistenceService.java | 3 ++- .../importdata/actions/VoyageResultsMapFishCellImportAction.java | 4 ++-- .../importdata/actions/VoyageResultsMapOtherCellImportAction.java | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index bd52775b..63f3dc0a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -259,10 +259,11 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { return persistenceContext.getCellDao().forTopiaIdEquals(id).findUnique(); } - public Cell getCellByNameAndType(String cellName, CellType cellType) { + public Cell getCellByVoyageNameAndType(String cellName, CellType cellType, Voyage voyage) { return persistenceContext.getCellDao() .forNameEquals(cellName) .addEquals(Cell.PROPERTY_CELL_TYPE, cellType) + .addEquals(Cell.PROPERTY_VOYAGE, voyage) .findUniqueOrNull(); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java index c2e7d752..e7e8e73e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java @@ -119,12 +119,12 @@ public class VoyageResultsMapFishCellImportAction extends VoyageResultsImportDat String cellName = rowCell.getName(); CellType cellType = rowCell.getCellType(); - Cell cell = persistenceService.getCellByNameAndType(cellName, cellType); + Cell cell = persistenceService.getCellByVoyageNameAndType(cellName, cellType, voyage); if (cell == null) { cell = persistenceService.createCell(rowCell); voyage.addPostCell(cell); } - + // collect ids addId(result, EchoBaseUserEntityEnum.Cell, cell, rowNumber); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java index f207dcba..9e2235ef 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java @@ -31,7 +31,6 @@ import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; -import fr.ifremer.echobase.services.service.importdata.DuplicatedMapCellException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; @@ -112,7 +111,7 @@ public class VoyageResultsMapOtherCellImportAction extends VoyageResultsImportDa String cellName = rowCell.getName(); CellType cellType = rowCell.getCellType(); - Cell cell = persistenceService.getCellByNameAndType(cellName, cellType); + Cell cell = persistenceService.getCellByVoyageNameAndType(cellName, cellType, voyage); if (cell == null) { cell = persistenceService.createCell(rowCell); voyage.addPostCell(cell); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.