May 2016 - Echobase-commits - mailman.cloud.codelutin.com

16/27: Tester avant de supprimer lors de la suppression d'un import
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:56:15 2016 +0200 Tester avant de supprimer lors de la suppression d'un import --- .../removedata/strategy/AbstractRemoveDataStrategy.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java index cee5107..45b9896 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java @@ -108,13 +108,16 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport String importId = importFileId.getEntityId(); - try { - removeImportData(voyage, importId); - } catch (TopiaException e) { - throw new EchoBaseTechnicalException(e); + boolean exists = persistenceService.isIdExists(importId); + if (exists) { + try { + removeImportData(voyage, importId); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } } - incrementOp("ImportLog " + importId + "Removed"); + incrementOp("Import file id:" + importId + " removed."); } @@ -222,7 +225,7 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport for (String cellId : cellIds) { Optional<Cell> optionalCell = persistenceService.getOptionalCell(cellId); - if (optionalCell.isPresent() ) { + if (optionalCell.isPresent()) { Cell cell = optionalCell.get(); Collection<Result> cellResult = cell.getResult(); // for (Result result : cellResult) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

15/27: Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId...
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 7a78dc116fad15df2eb723e922cfb9cec2b216e2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:55:34 2016 +0200 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... --- .../main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java index 12e998e..07bc6c2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java @@ -60,7 +60,7 @@ public class ImportFileIdTopiaDao extends AbstractImportFileIdTopiaDao<ImportFil String hql = " Select " + constructor + " From " + entityType.getName() + " As e, " + ImportFileId.class.getName() + " As i" - + " Where e.id = i." + ImportFileId.PROPERTY_ENTITY_ID + + " Where e.topiaId = i." + ImportFileId.PROPERTY_ENTITY_ID + " And i." + ImportFileId.PROPERTY_IMPORT_FILE + " = :" + ImportFileId.PROPERTY_IMPORT_FILE + " And i." + ImportFileId.PROPERTY_ENTITY_ID + " Like :" + ImportFileId.PROPERTY_ENTITY_ID + " Order By i." + ImportFileId.PROPERTY_IMPORT_ORDER; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

14/27: Ajout toString
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 91a2107e04ad9955ce6cde17e8efa332d36fa8c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:54:44 2016 +0200 Ajout toString --- .../main/java/fr/ifremer/echobase/io/InputFile.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java index 4ec8668..c762d5c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java @@ -20,6 +20,8 @@ */ package fr.ifremer.echobase.io; +import com.google.common.base.MoreObjects; + import java.io.File; import java.io.Serializable; @@ -88,4 +90,22 @@ public class InputFile implements Serializable { public boolean hasFile() { return file != null; } + + @Override + public String toString() { + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + if (fileName != null) { + toStringHelper.add("fileName", fileName); + } + if (file != null) { + toStringHelper.add("file", file); + } + if (contentType != null) { + toStringHelper.add("contentType", contentType); + } + if (label != null) { + toStringHelper.add("label", label); + } + return toStringHelper.toString(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

13/27: Meilleure gestion de la suppression d'un ImportLog
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 8690ac9d3c8e864dbb6e13d085f1dcd9f246612f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:20:48 2016 +0200 Meilleure gestion de la suppression d'un ImportLog --- .../fr/ifremer/echobase/entities/ImportFileTopiaDao.java | 15 ++++++++++++--- .../fr/ifremer/echobase/entities/ImportLogTopiaDao.java | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java index 3652e79..281dd4b 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java @@ -9,9 +9,18 @@ public class ImportFileTopiaDao extends AbstractImportFileTopiaDao<ImportFile> { // delete all ImportFileId before - ImmutableMap<String, Object> parameters = ImmutableMap.<String, Object>builder().put(ImportFileId.PROPERTY_IMPORT_FILE, entity).build(); - topiaJpaSupport.execute("Delete From " + ImportFileId.class.getName() + " Where " + ImportFileId.PROPERTY_IMPORT_FILE + " = :" + ImportFileId.PROPERTY_IMPORT_FILE, parameters); + { + ImmutableMap<String, Object> parameters = ImmutableMap.<String, Object>builder().put(ImportFileId.PROPERTY_IMPORT_FILE, entity).build(); + topiaJpaSupport.execute("Delete From " + ImportFileId.class.getName() + " Where " + ImportFileId.PROPERTY_IMPORT_FILE + " = :" + ImportFileId.PROPERTY_IMPORT_FILE, parameters); + topiaHibernateSupport.getHibernateSession().flush(); - super.delete(entity); + } + + { + ImmutableMap<String, Object> parameters = ImmutableMap.<String, Object>builder().put(ImportFile.PROPERTY_TOPIA_ID, entity.getTopiaId()).build(); + topiaJpaSupport.execute("Delete From " + ImportFile.class.getName() + " Where " + ImportFile.PROPERTY_TOPIA_ID + " = :" + ImportFile.PROPERTY_TOPIA_ID, parameters); + topiaHibernateSupport.getHibernateSession().flush(); + } +// super.delete(entity); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java index f98a68c..950b025 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java @@ -1,15 +1,17 @@ package fr.ifremer.echobase.entities; +import java.util.LinkedList; + public class ImportLogTopiaDao extends AbstractImportLogTopiaDao<ImportLog> { @Override public void delete(ImportLog entity) { ImportFileTopiaDao importFileDao = topiaDaoSupplier.getDao(ImportFile.class, ImportFileTopiaDao.class); - for (ImportFile importFile : entity.getImportFile()) { + for (ImportFile importFile : new LinkedList<>(entity.getImportFile())) { + entity.removeImportFile(importFile); importFileDao.delete(importFile); } - super.delete(entity); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

12/27: Gérer la nullité d'erreur sur un import
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 045c9fc487758a476e73a9a9a4fae09f070d1640 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:20:14 2016 +0200 Gérer la nullité d'erreur sur un import --- .../src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp index ae085ec..466239a 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp @@ -21,7 +21,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:if test="error.checkImportError"> +<s:if test="error != null && error.checkImportError"> <fieldset> <legend> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

11/27: Bine utiliser la bonne page de résultat
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit fa0d99e448c1bd5ecfb5b26b105f755c90db949c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:19:51 2016 +0200 Bine utiliser la bonne page de résultat --- .../src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp index 1b0f511..2d49378 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp @@ -26,4 +26,4 @@ <s:text name="echobase.common.importType.acoustic"/> </title> -<%@ include file="/WEB-INF/includes/actionResult.jsp" %> +<%@ include file="importDataActionResult.jsp" %> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp index dc56e2e..0c9154b 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp @@ -26,4 +26,4 @@ <s:text name="echobase.common.importType.catches"/> </title> -<%@ include file="/WEB-INF/includes/actionResult.jsp" %> +<%@ include file="importDataActionResult.jsp" %> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp index 5614de5..0b20af9 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp @@ -26,4 +26,4 @@ <s:text name="echobase.common.importType.operation"/> </title> -<%@ include file="/WEB-INF/includes/actionResult.jsp" %> +<%@ include file="importDataActionResult.jsp" %> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp index 73fec8c..1e7446b 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp @@ -30,4 +30,4 @@ ( <s:property value="%{getText(model.importType.i18nKey)}"/> ) </h4> -<%@ include file="/WEB-INF/includes/actionResult.jsp" %> +<%@ include file="importDataActionResult.jsp" %> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

10/27: Ajout toString
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit e847db717f176fcec2da21cf4c64be64cf77c712 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:38:36 2016 +0200 Ajout toString --- .../echobase/entities/data/GearMetadataValueImpl.java | 18 ++++++++++++++++++ .../entities/data/OperationMetadataValueImpl.java | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/GearMetadataValueImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/GearMetadataValueImpl.java new file mode 100644 index 0000000..21bacf4 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/GearMetadataValueImpl.java @@ -0,0 +1,18 @@ +package fr.ifremer.echobase.entities.data; + +import com.google.common.base.MoreObjects; + +public class GearMetadataValueImpl extends GearMetadataValueAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(OperationMetadataValue.class) + .add(PROPERTY_GEAR_METADATA, gearMetadata) + .add(PROPERTY_DATA_VALUE, dataValue) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } + +} diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationMetadataValueImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationMetadataValueImpl.java new file mode 100644 index 0000000..72d2d57 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationMetadataValueImpl.java @@ -0,0 +1,19 @@ +package fr.ifremer.echobase.entities.data; + +import com.google.common.base.MoreObjects; + +public class OperationMetadataValueImpl extends OperationMetadataValueAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(OperationMetadataValue.class) + .add(PROPERTY_OPERATION_METADATA, operationMetadata) + .add(PROPERTY_DATA_VALUE, dataValue) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } + +} + -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

09/27: Renommage i18n
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit dec218226fafb44f80dcc85e11ba2324f4c79119 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:37:56 2016 +0200 Renommage i18n --- .../services/service/importdata/DuplicatedTransectException.java | 2 +- .../services/service/importdata/DuplicatedTransitException.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransectException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransectException.java index 531c595..831af80 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransectException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransectException.java @@ -38,6 +38,6 @@ public class DuplicatedTransectException extends ImportRuntimeException { private static final long serialVersionUID = 1L; public DuplicatedTransectException(Locale locale, String voyageName, String title) { - super(l(locale, "echobase.importError.duplicate.transect", voyageName, title)); + super(l(locale, "echobase.importError.duplicate.transect", title, voyageName)); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransitException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransitException.java index 74fbb18..3c7a4a7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransitException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedTransitException.java @@ -39,6 +39,6 @@ public class DuplicatedTransitException extends ImportRuntimeException { private static final long serialVersionUID = 1L; public DuplicatedTransitException(Locale locale, String voyageName, Date startTime, Date endTime) { - super(l(locale, "echobase.importError.duplicate.transit", voyageName, startTime, endTime)); + super(l(locale, "echobase.importError.duplicate.transit", startTime, endTime, voyageName)); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

08/27: Ne pas autoriser de réimporter des opérations déjà existantes (See #2246)
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 32098723e5d9346217d1be59713a9630832fe5c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:37:39 2016 +0200 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) --- .../services/service/UserDbPersistenceService.java | 22 +++++++++++ .../importdata/DuplicatedOperationException.java | 43 ++++++++++++++++++++++ .../VoyageOperationsOperationImportAction.java | 6 +++ .../strategy/OperationRemoveDataStrategy.java | 25 ++++++++++++- .../i18n/echobase-services_en_GB.properties | 7 ++-- .../i18n/echobase-services_fr_FR.properties | 5 ++- 6 files changed, 101 insertions(+), 7 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 a1f09a4..2bd2ca8 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 @@ -66,6 +66,7 @@ import fr.ifremer.echobase.entities.references.CellTypeImpl; import fr.ifremer.echobase.entities.references.CellTypes; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.SampleType; @@ -531,6 +532,10 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { return persistenceContext.getGearMetadataValueDao().create(gearMetadataValue); } + public GearMetadataValue getGearMetadataValue(String gearMetadataValueId) { + return persistenceContext.getGearMetadataValueDao().forTopiaIdEquals(gearMetadataValueId).findUnique(); + } + //------------------------------------------------------------------------// //--- ImportLog ----------------------------------------------------------// //------------------------------------------------------------------------// @@ -688,6 +693,15 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //--- Operation ----------------------------------------------------------// //------------------------------------------------------------------------// + public boolean containsOperation(Voyage voyage, Vessel vessel, DepthStratum depthStratum, String operationId) { + return persistenceContext.getOperationDao() + .forIdEquals(operationId) + .addEquals(Operation.PROPERTY_DEPTH_STRATUM, depthStratum) + .addEquals(Operation.PROPERTY_TRANSECT + "." + Transect.PROPERTY_VESSEL, vessel) + .addEquals(Operation.PROPERTY_TRANSECT + "." + Transect.PROPERTY_TRANSIT + "." + Transit.PROPERTY_VOYAGE, voyage) + .exists(); + } + public Operation getOperation(String id) { return persistenceContext.getOperationDao().forTopiaIdEquals(id).findUnique(); } @@ -708,6 +722,14 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //--- OperationMetadataValue ---------------------------------------------// //------------------------------------------------------------------------// + public OperationMetadataValue containsOperationOperationMetadataValue(OperationMetadataValue operationMetadataValue) { + return persistenceContext.getOperationMetadataValueDao().create(operationMetadataValue); + } + + public OperationMetadataValue getOperationMetadataValue(String id) { + return persistenceContext.getOperationMetadataValueDao().forTopiaIdEquals(id).findUnique(); + } + public OperationMetadataValue createOperationMetadataValue(OperationMetadataValue operationMetadataValue) { return persistenceContext.getOperationMetadataValueDao().create(operationMetadataValue); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedOperationException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedOperationException.java new file mode 100644 index 0000000..abf984b --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedOperationException.java @@ -0,0 +1,43 @@ +package fr.ifremer.echobase.services.service.importdata; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.nuiton.csv.ImportRuntimeException; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l; + +/** + * Created on 5/09/16. + * + * @author Tony Chemit - chemit(a)codelutin.com + * @since 4.0 + */ +public class DuplicatedOperationException extends ImportRuntimeException { + + private static final long serialVersionUID = 1L; + + public DuplicatedOperationException(Locale locale, String voyageName, String vesselName, String depthStratumName, String operationId) { + super(l(locale, "echobase.importError.duplicate.operation", operationId, depthStratumName, vesselName, voyageName)); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java index 0bb72a5..275697d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java @@ -7,6 +7,7 @@ import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.io.InputFile; +import fr.ifremer.echobase.services.service.importdata.DuplicatedOperationException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageOperationsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageOperationsOperationImportExportModel; @@ -63,6 +64,11 @@ public class VoyageOperationsOperationImportAction extends VoyageOperationsImpor Operation operation = row.getOperation(); + boolean exists = persistenceService.containsOperation(voyage, vessel, operation.getDepthStratum(), operation.getId()); + if (exists) { + throw new DuplicatedOperationException(getLocale(), voyage.getName(), vessel.getName(), operation.getDepthStratum().getId(), operation.getId()); + } + Date startTime = operation.getGearShootingStartTime(); Date endTime = operation.getGearShootingEndTime(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java index 0041644..6e8f0db 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java @@ -24,7 +24,9 @@ package fr.ifremer.echobase.services.service.removedata.strategy; import com.google.common.collect.Sets; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; +import fr.ifremer.echobase.entities.data.GearMetadataValue; import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.OperationMetadataValue; import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.logging.Log; @@ -56,7 +58,26 @@ public class OperationRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override protected void removeImportData(Voyage voyage, String id) throws TopiaException { - if (id.startsWith(Operation.class.getName())) { + if (id.startsWith(OperationMetadataValue.class.getName())) { + + OperationMetadataValue operationMetadataValue = persistenceService.getOperationMetadataValue(id); + operationMetadataValue.getOperation().removeOperationMetadataValue(operationMetadataValue); + + if (log.isDebugEnabled()) { + log.debug(operationMetadataValue + " was removed"); + } + + + } else if (id.startsWith(GearMetadataValue.class.getName())) { + + GearMetadataValue gearMetadataValue = persistenceService.getGearMetadataValue(id); + gearMetadataValue.getOperation().removeGearMetadataValue(gearMetadataValue); + + if (log.isDebugEnabled()) { + log.debug(gearMetadataValue + " was removed"); + } + + } else if (id.startsWith(Operation.class.getName())) { // get operation Operation operation = persistenceService.getOperation(id); @@ -68,7 +89,7 @@ public class OperationRemoveDataStrategy extends AbstractRemoveDataStrategy { // remove it persistenceService.deleteOperation(operation); if (log.isDebugEnabled()) { - log.debug(operation.getTopiaId() + " was removed"); + log.debug(operation + " was removed"); } } else { canNotDealWithId(id); diff --git a/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties b/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties index 6275397..63c6612 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties @@ -32,10 +32,11 @@ echobase.common.voyageFile=Voyage data file echobase.exportError.toFile=An error occured while exporting file %s \:%s echobase.importError.can.only.import.one.voyage.atime=Impossible to import more that one voyage at a time echobase.importError.dataMetadata.notFound=Metadata column %s missing (existing values \:%s) +echobase.importError.duplicate.operation=An operation with id «%s», on startum «%s» - vessel «%s» on voyage «%s» already exists in database. echobase.importError.duplicate.sample=Operation %s cannot comprise several samples of same type, species and size category -echobase.importError.duplicate.transect=A transect titled «%s» on voyage «%s» already exists un database. -echobase.importError.duplicate.transit=A transit start «%s» - end «%s» on voyage «%s» already exists un database. -echobase.importError.duplicate.voyage=A voyage named «%s» already exists un database. +echobase.importError.duplicate.transect=A transect titled «%s» on voyage «%s» already exists in database. +echobase.importError.duplicate.transit=A transit start «%s» - end «%s» on voyage «%s» already exists in database. +echobase.importError.duplicate.voyage=A voyage named «%s» already exists in database. echobase.importError.elementaryCell.withMissingDepthEnd=Elementary Cell (id\: %s - name %s) does not contains data in column MOVIES_EILayer\\cellset\\depthend, this is not allowed echobase.importError.esduCell.notfound=A new « dataAquisition» entry must be created for survey %s, vessel %s, instrument %s, whereas some elementary cells are not associated to an ESDU cell (line %s) echobase.importError.esduCell.withDepthEndFilled=ESDU Cell (id\: %s - name %s) contains data in column MOVIES_EILayer\\cellset\\depthend, this is not allowed. diff --git a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties index 4b2fbdf..d898fff 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties @@ -32,9 +32,10 @@ echobase.common.voyageFile=Fichier des données de voyages echobase.exportError.toFile=Erreur lors de l'extraction du fichier %s \: %s echobase.importError.can.only.import.one.voyage.atime=Vous ne pouvez pas importer plus d'un voyage à la fois echobase.importError.dataMetadata.notFound=Colonne de métadonnées nommée %s non trouvée (valeurs existantes \: %s) +echobase.importError.duplicate.operation=L'opération d'identifiant «%s» sur la strate «%s» - navire «%s» et sur la marée nommée «%s» existe déjà dans la base. echobase.importError.duplicate.sample=L'opération %s ne peut pas contenir deux échantillons de même type %s, espèce %s et classe de taille %s -echobase.importError.duplicate.transect=Le transect de marée nommée «%s» - nom «%s» existe déjà dans la base. -echobase.importError.duplicate.transit=Le transit de marée nommée «%s», début «%s» - fin «%s» existe déjà dans la base. +echobase.importError.duplicate.transect=Le transect nommé «%s» sur la marée nommée «%s» existe déjà dans la base. +echobase.importError.duplicate.transit=Le transit début «%s» - fin «%s» sur la marée nommée «%s» existe déjà dans la base. echobase.importError.duplicate.voyage=La marée nommée «%s» existe déjà dans la base. echobase.importError.elementaryCell.withMissingDepthEnd=La cellule de type élémentaire (id\: %s - nom %s) ne contient pas la colonne MOVIES_EILayer\\cellset\\depthend renseignée, ce qui n'est pas autorisé. echobase.importError.esduCell.notfound=Un nouvelle entrée « dataAquisition »doit être créée pour la campagne %s, navire %s, instrument %s, mais il reste des cellules élémentaires non rattachées à une cellule ESDU (ligne %s) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

07/27: Ne pas pouvoir éditer les entitées transverses
by codelutin.com scm 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b3b3fac2a9ecde1f843db04c7e9a2ecca76c7d0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:36:32 2016 +0200 Ne pas pouvoir éditer les entitées transverses --- .../main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java index 3cc1300..36f5c58 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java @@ -158,6 +158,11 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { addAssociations(result, DATA_TYPES); dataAssociations = ImmutableList.copyOf(result); } + + nonEditableTypes.add(EchoBaseUserEntityEnum.ImportLog); + nonEditableTypes.add(EchoBaseUserEntityEnum.ImportFile); + nonEditableTypes.add(EchoBaseUserEntityEnum.ImportFileId); + } public int getEntriesSize() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0