This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 44f5de587d0c5378f514a85fcdb419bd81b6bfce Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:53:30 2015 +0100 check engin + rank oder are in cruise --- .../genericformat/consumer/CsvConsumerForOperation.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java index 91512d7..0cbef2f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java @@ -3,6 +3,7 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.CsvComsumer; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -49,6 +50,15 @@ public class CsvConsumerForOperation extends CsvComsumer<OperationRow, Operation fishingOperation.setCruise(cruise); + Gear gear = bean.getGear(); + int rankOrder = bean.getGearRankOrder(); + + Gear cruiseGear = importContext.getGear(cruise, gear, rankOrder); + if (cruiseGear == null) { + addCheckError(row, new GearNotFoundInCruiseException(cruise, gear, rankOrder)); + } + bean.setGear(cruiseGear); + NuitonValidatorResult validatorResult = validationHelper.validateFishingOperation(fishingOperation); if (validatorResult.hasFatalMessages()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.