Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • dto/src/main/models/Observe-01-referential-common.model
    ... ... @@ -121,7 +121,6 @@ referential.common.SizeMeasureType > referential.I18nReferential
    121 121 
     referential.common.Species > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=label,uri,faoCode,scientificLabel,homeId,sizeMeasureTypeId,speciesGroupId,homeId,wormsId,faoCode,
    122 122 
     faoCode + {*:1} String
    123 123 
     scientificLabel + {*:1} String
    124 
    -homeId + {*:1} String
    125 124 
     wormsId + {*:1} Long
    126 125 
     minLength + {*:1} Float
    127 126 
     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
    77 77 
     tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference
    78 78
    79 79 
     data.ll.observation.CatchLonglineObs > data.Commentable >> data.ll.observation.LonglinePositionAwareDto | references=homeId
    80 
    -homeId + {*:1} String
    81 80 
     count + {*:1} Integer
    82 81 
     totalWeight + {*:1} Float
    83 82 
     hookWhenDiscarded + {*:1} Boolean
    ... ... @@ -136,7 +135,6 @@ sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandRefer
    136 135 
     data {*:0..1} data.DataFile
    137 136
    138 137 
     data.ll.observation.SetLonglineObs > data.Commentable | references=homeId
    139 
    -homeId + {*:1} String
    140 138 
     number + {*:1} Integer
    141 139 
     basketsPerSectionCount + {*:1} Integer
    142 140 
     branchlinesPerBasketCount + {*:1} Integer
    ... ... @@ -202,7 +200,6 @@ mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTy
    202 200 
     branchlinesComposition + {*} data.ll.observation.BranchlinesCompositionObs
    203 201
    204 202 
     data.ll.observation.SetLonglineObsStub > data.Data | mainDto=skip
    205 
    -homeId + {*:1} String
    206 203 
     number + {*:1} Integer
    207 204 
     activityLongline {*:1} fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference | unique
    208 205
    ... ... @@ -219,7 +216,6 @@ sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeRefer
    219 216 
     lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    220 217
    221 218 
     data.ll.observation.TdrObs > data.Data >> data.ll.observation.LonglinePositionAwareDto | references=homeId
    222 
    -homeId + {*:1} String
    223 219 
     floatline1Length + {*:1} Float
    224 220 
     floatline2Length + {*:1} Float
    225 221 
     serialNo + {*:1} String

  • dto/src/main/models/Observe-31-data-ll-logbook.model
    ... ... @@ -46,7 +46,6 @@ vesselActivityLonglineLabel + {*:1} String
    46 46 
     hasSetLongline + {*:1} Boolean
    47 47
    48 48 
     data.ll.logbook.SetLonglineLogbook > data.Commentable | references=homeId
    49 
    -homeId + {*:1} String
    50 49 
     number + {*:1} Integer
    51 50 
     basketsPerSectionCount + {*:1} Integer
    52 51 
     branchlinesPerBasketCount + {*:1} Integer
    ... ... @@ -97,7 +96,6 @@ data.ll.logbook.SetLonglineLogbookCatch > data.Data | form=data.ll.logbook.Catch
    97 96 
     catchLongline {*} data.ll.logbook.CatchLonglineLogbook | ordered
    98 97
    99 98 
     data.ll.logbook.SetLonglineLogbookStub > data.Data | mainDto=skip
    100 
    -homeId + {*:1} String
    101 99 
     number + {*:1} Integer
    102 100 
     settingStartTimeStamp + {*:1} Date
    103 101 
     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
    135 133 
     hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
    136 134
    137 135 
     data.ll.logbook.CatchLonglineLogbook > data.Commentable | references=homeId
    138 
    -homeId + {*:1} String
    139 136 
     count + {*:1} Integer
    140 137 
     totalWeight + {*:1} Float
    141 138 
     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
    14 14 
     startDate + {*:1} Date
    15 15 
     endDate + {*:1} Date
    16 16 
     totalFishingOperationsNumber + {*:1} Integer
    17 
    -homeId + {*:1} String
    18 17 
     ersId + {*:1} String
    19 18 
     generalComment + {*:1} String
    20 19 
     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;
    26 26 
     import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference;
    27 27 
     import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookDto;
    28 28 
     import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookStubDto;
    29 
    -import fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookStubHelper;
    30 29 
     import fr.ird.observe.dto.decoration.DecoratorService;
    31 30 
     import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator;
    32 31
    32 
    +import java.util.Objects;
    33 33 
     import java.util.Optional;
    34 34
    35 35 
     /**
    ... ... @@ -50,7 +50,7 @@ public class SetLonglineLogbookUniqueHomeIdDtoValidator extends FieldValidatorSu
    50 50
    51 51 
                 Optional<SetLonglineLogbookStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets()
    52 52 
                         .stream()
    53 
    -                    .filter(SetLonglineLogbookStubHelper.newHomeIdPredicate(homeId))
    53 
    +                    .filter(t-> Objects.equals(t.getHomeId(), homeId))
    54 54 
                         .findFirst();
    55 55
    56 56 
     //            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;
    26 26 
     import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference;
    27 27 
     import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDto;
    28 28 
     import fr.ird.observe.dto.data.ll.observation.SetLonglineObsStubDto;
    29 
    -import fr.ird.observe.dto.data.ll.observation.SetLonglineObsStubHelper;
    30 29 
     import fr.ird.observe.dto.decoration.DecoratorService;
    31 30 
     import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator;
    32 31
    32 
    +import java.util.Objects;
    33 33 
     import java.util.Optional;
    34 34
    35 35 
     /**
    ... ... @@ -47,7 +47,7 @@ public class SetLonglineObsUniqueHomeIdDtoValidator extends FieldValidatorSuppor
    47 47 
             if (homeId != null) {
    48 48 
                 Optional<SetLonglineObsStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets()
    49 49 
                         .stream()
    50 
    -                    .filter(SetLonglineObsStubHelper.newHomeIdPredicate(homeId))
    50 
    +                    .filter(t-> Objects.equals(t.getHomeId(), homeId))
    51 51 
                         .findFirst();
    52 52 
     //            Iterables.tryFind(setLongline.getOtherSets(), SetLonglineObsStubHelper.newHomeIdPredicate(homeId)::test);
    53 53 
                 if (sameHomeIdSetLonglineOptional.isPresent()) {

  • test/src/main/resources/fixtures/validate-service-referential.properties
    ... ... @@ -30,7 +30,7 @@ LengthMeasureMethodDto=1
    30 30 
     WeightMeasureMethodDto=2
    31 31 
     ReasonForNoFishingDto=3
    32 32 
     ObservedSystemDto=4
    33 
    -SpeciesDto=24
    33 
    +SpeciesDto=20
    34 34 
     PersonDto=4
    35 35 
     HookPositionDto=1
    36 36 
     HookTypeDto=1

  • validation/src/main/i18n/getters/validation-messages.getter
    ... ... @@ -21,6 +21,7 @@ observe.validation.lengthWeightParameter.invalid.weightLengthFormula
    21 21 
     observe.validation.nonTargetCatch.missing.observedSystem
    22 22 
     observe.validation.nonTargetCatch.required.weightOrNombreEstime
    23 23 
     observe.validation.nonTargetCatch.required.weightOrTailleMoyen
    24 
    +observe.validation.nonTargetCatch.uniqueKey
    24 25 
     observe.validation.nonTargetSample.required.weight.or.taille
    25 26 
     observe.validation.objectMaterial.invalid.validation
    26 27 
     observe.validation.objectObservedSpecies.positive.count

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.