branch develop updated (07a06d9 -> 61eda8b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 07a06d9 review referential import services new 61eda8b refs #6096: on ne peut plus supprimer une espece si present dans protocol, voir pour le reste demain... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 61eda8b57d4301abfdaae06a479b0bd18c9a4843 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 21:54:00 2014 +0100 refs #6096: on ne peut plus supprimer une espece si present dans protocol, voir pour le reste demain... Summary of changes: .../service/referential/ReferentialTemporaryGearService.java | 6 +++++- .../referential/ReferentialTemporaryPersonService.java | 4 ++++ .../referential/ReferentialTemporarySpeciesService.java | 12 ++++++++++-- .../referential/ReferentialTemporaryVesselService.java | 4 ++++ .../src/main/resources/i18n/tutti-service_en_GB.properties | 4 ++++ .../src/main/resources/i18n/tutti-service_fr_FR.properties | 6 +++++- 6 files changed, 32 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 61eda8b57d4301abfdaae06a479b0bd18c9a4843 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 21:54:00 2014 +0100 refs #6096: on ne peut plus supprimer une espece si present dans protocol, voir pour le reste demain... --- .../service/referential/ReferentialTemporaryGearService.java | 6 +++++- .../referential/ReferentialTemporaryPersonService.java | 4 ++++ .../referential/ReferentialTemporarySpeciesService.java | 12 ++++++++++-- .../referential/ReferentialTemporaryVesselService.java | 4 ++++ .../src/main/resources/i18n/tutti-service_en_GB.properties | 4 ++++ .../src/main/resources/i18n/tutti-service_fr_FR.properties | 6 +++++- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java index c2a0646..871b668 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java @@ -77,7 +77,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { Collection<Gear> entitiesToAdd = requestResult.getEntitiesToAdd(); Collection<Gear> entitiesAdded = persistenceService.importTemporaryGear(entitiesToAdd); result.addAllRefsAdded(entitiesAdded); - + } if (requestResult.withToupdate()) { @@ -201,6 +201,10 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { if (id == null) { throw new IllegalArgumentException(t("tutti.service.referential.import.gear.cannotDeleteWithoutId.error")); } + if (gear==null) { + // can't delete if gear does not exists + throw new IllegalArgumentException(t("tutti.service.referential.import.gear.cannotDeleteNotExisting.error")); + } if (persistenceService.isTemporaryGearUsed(id)) { throw new IllegalArgumentException(t("tutti.service.referential.import.gear.used.error", id)); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java index 1fa0e0a..1dd9b83 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java @@ -189,6 +189,10 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { if (id == null) { throw new IllegalArgumentException(t("tutti.service.referential.import.person.cannotDeleteWithoutId.error")); } + if (person==null) { + // can't delete if person does not exists + throw new IllegalArgumentException(t("tutti.service.referential.import.person.cannotDeleteNotExisting.error")); + } if (persistenceService.isTemporaryPersonUsed(id)) { throw new IllegalArgumentException(t("tutti.service.referential.import.person.used.error", id)); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java index 0b76233..b6b8f74 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java @@ -212,10 +212,18 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { if (id == null) { throw new IllegalArgumentException(t("tutti.service.referential.import.species.cannotDeleteWithoutId.error")); } - if (persistenceService.isTemporarySpeciesUsed(id)) { + if (species == null) { + // can't delete if species does not exists + throw new IllegalArgumentException(t("tutti.service.referential.import.species.cannotDeleteNotExisting.error")); + } + + Integer referenceTaxonId = species.getReferenceTaxonId(); + + if (persistenceService.isTemporarySpeciesUsed(referenceTaxonId)) { throw new IllegalArgumentException(t("tutti.service.referential.import.species.used.error", id)); } - requestResult.addIdToDelete(species.getReferenceTaxonId()); + + requestResult.addIdToDelete(referenceTaxonId); requestResult.removeExistingNaturalId(name); } else { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java index f5cef17..40f8bae 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java @@ -206,6 +206,10 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { if (id == null) { throw new IllegalArgumentException(t("tutti.service.referential.import.vessel.cannotDeleteWithoutId.error")); } + if (vessel == null) { + // can't delete if vessel does not exists + throw new IllegalArgumentException(t("tutti.service.referential.import.vessel.cannotDeleteNotExisting.error")); + } if (persistenceService.isTemporaryVesselUsed(id)) { throw new IllegalArgumentException(t("tutti.service.referential.import.vessel.used.error", id)); } diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index 7cb64b6..6132c96 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -217,6 +217,7 @@ tutti.service.referential.export.gear.error= tutti.service.referential.export.person.error= tutti.service.referential.export.species.error= tutti.service.referential.export.vessel.error= +tutti.service.referential.import.gear.cannotDeleteNotExisting.error= tutti.service.referential.import.gear.cannotDeleteWithoutId.error= tutti.service.referential.import.gear.existingName.error= tutti.service.referential.import.gear.idNotNegative.error= @@ -224,6 +225,7 @@ tutti.service.referential.import.gear.noName.error= tutti.service.referential.import.gear.notExistingId.error= tutti.service.referential.import.gear.used.error= tutti.service.referential.import.gears.error= +tutti.service.referential.import.person.cannotDeleteNotExisting.error= tutti.service.referential.import.person.cannotDeleteWithoutId.error= tutti.service.referential.import.person.existingName.error= tutti.service.referential.import.person.idNotNegative.error= @@ -231,6 +233,7 @@ tutti.service.referential.import.person.noName.error= tutti.service.referential.import.person.notExistingId.error= tutti.service.referential.import.person.used.error= tutti.service.referential.import.persons.error= +tutti.service.referential.import.species.cannotDeleteNotExisting.error= tutti.service.referential.import.species.cannotDeleteWithoutId.error= tutti.service.referential.import.species.error= tutti.service.referential.import.species.existingName.error= @@ -238,6 +241,7 @@ tutti.service.referential.import.species.idNotNegative.error= tutti.service.referential.import.species.noName.error= tutti.service.referential.import.species.notExistingId.error= tutti.service.referential.import.species.used.error= +tutti.service.referential.import.vessel.cannotDeleteNotExisting.error= tutti.service.referential.import.vessel.cannotDeleteWithoutId.error= tutti.service.referential.import.vessel.codePrefixMissing.error= tutti.service.referential.import.vessel.existingInternationalRegistrationCode.error= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 58ce574..ae27c48 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -197,6 +197,7 @@ tutti.service.referential.export.gear.error=Erreur lors de l'export des engins d tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s tutti.service.referential.export.species.error=Erreur lors de l'export des espèces dans le fichier %s tutti.service.referential.export.vessel.error=Erreur lors de l'export des navires dans le fichier %s +tutti.service.referential.import.gear.cannotDeleteNotExisting.error=L'engin temporaire d'identifiant %s n'extsite pas, impossible de la supprimer tutti.service.referential.import.gear.cannotDeleteWithoutId.error=L'identifiant est obligatoire pour la suppression tutti.service.referential.import.gear.existingName.error=L'engin '%s' n'a pas été ajouté au référentiel car il est déjà présent tutti.service.referential.import.gear.idNotNegative.error=L'identifiant d'un engin temporaire doit être négatif \: %s @@ -204,13 +205,15 @@ tutti.service.referential.import.gear.noName.error=Le nom de l'engin est obligat tutti.service.referential.import.gear.notExistingId.error=L'identifiant '%s' n'a pas été trouvé parmi les engins temporaires tutti.service.referential.import.gear.used.error=L'engin temporaire %s est utilisé dans l'application. Vous devez le remplacer pour pouvoir le supprimer. tutti.service.referential.import.gears.error=Erreur lors de l'import des engins du fichier %s +tutti.service.referential.import.person.cannotDeleteNotExisting.error=La personne temporaire d'identifiant %s n'extsite pas, impossible de la supprimer tutti.service.referential.import.person.cannotDeleteWithoutId.error=L'identifiant est obligatoire pour la suppression tutti.service.referential.import.person.existingName.error=Une personne avec ce nom %s (nom + prénom) existe déjà tutti.service.referential.import.person.idNotNegative.error=L'identifiant d'une personne temporaire doit être négatif \: %s tutti.service.referential.import.person.noName.error=Le nom de la personne (prénom ou nom) est obligatoire tutti.service.referential.import.person.notExistingId.error=L'identifiant '%s' n'a pas été trouvé parmi les personnes temporaires -tutti.service.referential.import.person.used.error=La personne temporaire %s est utilisée dans l'application. Vous devez la remplacer pour pouvoir la supprimer. +tutti.service.referential.import.person.used.error=La personne temporaire %s est utilisée dans l'application. Vous devez la remplacer pour pouvoir la supprimer. tutti.service.referential.import.persons.error=Erreur lors de l'import des personnes du fichier %s +tutti.service.referential.import.species.cannotDeleteNotExisting.error=L'espèce temporaire d'identifiant %s n'extsite pas, impossible de la supprimer tutti.service.referential.import.species.cannotDeleteWithoutId.error=L'identifiant est obligatoire pour la suppression tutti.service.referential.import.species.error=Erreur lors de l'import des espèces du fichier %s tutti.service.referential.import.species.existingName.error=L'espèce '%s' n'a pas été ajoutée au référentiel car elle est déjà présente @@ -218,6 +221,7 @@ tutti.service.referential.import.species.idNotNegative.error=L'identifiant d'une tutti.service.referential.import.species.noName.error=Le nom pour l'espèce %s est obligatoire. tutti.service.referential.import.species.notExistingId.error=L'identifiant '%s' n'a pas été trouvé parmi les espèces temporaires tutti.service.referential.import.species.used.error=L'espèce temporaire %s est utilisée dans l'application. Vous devez la remplacer pour pouvoir la supprimer. +tutti.service.referential.import.vessel.cannotDeleteNotExisting.error=Le navire temporaire d'identifiant %s n'extsite pas, impossible de la supprimer tutti.service.referential.import.vessel.cannotDeleteWithoutId.error=L'identifiant est obligatoire pour la suppression tutti.service.referential.import.vessel.codePrefixMissing.error=L'identifiant d'un navire temporaire doit commencer par %1$s \: %2$s tutti.service.referential.import.vessel.existingInternationalRegistrationCode.error= -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm