Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6bf11014 by tchemit at 2019-01-16T18:55:07Z Remove redundant homeId fileds on some dto - - - - - 8 changed files: - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-30-data-ll-observation.model - dto/src/main/models/Observe-31-data-ll-logbook.model - dto/src/main/models/Observe-35-data-ll.model - services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java - services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java - test/src/main/resources/fixtures/validate-service-referential.properties - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -121,7 +121,6 @@ referential.common.SizeMeasureType > referential.I18nReferential referential.common.Species > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=label,uri,faoCode,scientificLabel,homeId,sizeMeasureTypeId,speciesGroupId,homeId,wormsId,faoCode, faoCode + {*:1} String scientificLabel + {*:1} String -homeId + {*:1} String wormsId + {*:1} Long minLength + {*:1} Float maxLength + {*:1} Float ===================================== dto/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -77,7 +77,6 @@ topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference data.ll.observation.CatchLonglineObs > data.Commentable >> data.ll.observation.LonglinePositionAwareDto | references=homeId -homeId + {*:1} String count + {*:1} Integer totalWeight + {*:1} Float hookWhenDiscarded + {*:1} Boolean @@ -136,7 +135,6 @@ sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandRefer data {*:0..1} data.DataFile data.ll.observation.SetLonglineObs > data.Commentable | references=homeId -homeId + {*:1} String number + {*:1} Integer basketsPerSectionCount + {*:1} Integer branchlinesPerBasketCount + {*:1} Integer @@ -202,7 +200,6 @@ mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTy branchlinesComposition + {*} data.ll.observation.BranchlinesCompositionObs data.ll.observation.SetLonglineObsStub > data.Data | mainDto=skip -homeId + {*:1} String number + {*:1} Integer activityLongline {*:1} fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference | unique @@ -219,7 +216,6 @@ sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeRefer lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference data.ll.observation.TdrObs > data.Data >> data.ll.observation.LonglinePositionAwareDto | references=homeId -homeId + {*:1} String floatline1Length + {*:1} Float floatline2Length + {*:1} Float serialNo + {*:1} String ===================================== dto/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -46,7 +46,6 @@ vesselActivityLonglineLabel + {*:1} String hasSetLongline + {*:1} Boolean data.ll.logbook.SetLonglineLogbook > data.Commentable | references=homeId -homeId + {*:1} String number + {*:1} Integer basketsPerSectionCount + {*:1} Integer branchlinesPerBasketCount + {*:1} Integer @@ -97,7 +96,6 @@ data.ll.logbook.SetLonglineLogbookCatch > data.Data | form=data.ll.logbook.Catch catchLongline {*} data.ll.logbook.CatchLonglineLogbook | ordered data.ll.logbook.SetLonglineLogbookStub > data.Data | mainDto=skip -homeId + {*:1} String number + {*:1} Integer settingStartTimeStamp + {*:1} Date activityLongline {*:1} fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference | unique @@ -135,7 +133,6 @@ hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference data.ll.logbook.CatchLonglineLogbook > data.Commentable | references=homeId -homeId + {*:1} String count + {*:1} Integer totalWeight + {*:1} Float hookWhenDiscarded + {*:1} Boolean ===================================== dto/src/main/models/Observe-35-data-ll.model ===================================== @@ -14,7 +14,6 @@ data.ll.common.TripLongline > data.Openable >> data.TripDto | references=startDa startDate + {*:1} Date endDate + {*:1} Date totalFishingOperationsNumber + {*:1} Integer -homeId + {*:1} String ersId + {*:1} String generalComment + {*:1} String observationsComment + {*:1} String ===================================== services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java ===================================== @@ -26,10 +26,10 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference; import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookDto; import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookStubDto; -import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookStubHelper; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; +import java.util.Objects; import java.util.Optional; /** @@ -50,7 +50,7 @@ public class SetLonglineLogbookUniqueHomeIdDtoValidator extends FieldValidatorSu Optional<SetLonglineLogbookStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets() .stream() - .filter(SetLonglineLogbookStubHelper.newHomeIdPredicate(homeId)) + .filter(t-> Objects.equals(t.getHomeId(), homeId)) .findFirst(); // Iterables.tryFind(setLongline.getOtherSets(), SetLonglineLogbookStubHelper.newHomeIdPredicate(homeId)::test); ===================================== services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java ===================================== @@ -26,10 +26,10 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDto; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsStubDto; -import fr.ird.observe.dto.data.ll.observation.SetLonglineObsStubHelper; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; +import java.util.Objects; import java.util.Optional; /** @@ -47,7 +47,7 @@ public class SetLonglineObsUniqueHomeIdDtoValidator extends FieldValidatorSuppor if (homeId != null) { Optional<SetLonglineObsStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets() .stream() - .filter(SetLonglineObsStubHelper.newHomeIdPredicate(homeId)) + .filter(t-> Objects.equals(t.getHomeId(), homeId)) .findFirst(); // Iterables.tryFind(setLongline.getOtherSets(), SetLonglineObsStubHelper.newHomeIdPredicate(homeId)::test); if (sameHomeIdSetLonglineOptional.isPresent()) { ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -30,7 +30,7 @@ LengthMeasureMethodDto=1 WeightMeasureMethodDto=2 ReasonForNoFishingDto=3 ObservedSystemDto=4 -SpeciesDto=24 +SpeciesDto=20 PersonDto=4 HookPositionDto=1 HookTypeDto=1 ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -21,6 +21,7 @@ observe.validation.lengthWeightParameter.invalid.weightLengthFormula observe.validation.nonTargetCatch.missing.observedSystem observe.validation.nonTargetCatch.required.weightOrNombreEstime observe.validation.nonTargetCatch.required.weightOrTailleMoyen +observe.validation.nonTargetCatch.uniqueKey observe.validation.nonTargetSample.required.weight.or.taille observe.validation.objectMaterial.invalid.validation observe.validation.objectObservedSpecies.positive.count View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6bf1101426574c7f05825bea05b9... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6bf1101426574c7f05825bea05b9... You're receiving this email because of your account on gitlab.com.