Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cb1085bd by Tony Chemit at 2020-08-17T17:58:12+02:00 * Remove dbName tag value from persistence model, since in v8 entity names are db table names - - - - - 38e6fa93 by Tony Chemit at 2020-08-17T18:13:51+02:00 * Remove reverseDbName tag value from persistence model, since in v8 entity names are db table names - - - - - 8 changed files: - persistence/src/main/models/Observe-02-referential-ps-common.model - persistence/src/main/models/Observe-03-referential-ps-observation.model - persistence/src/main/models/Observe-20-data-ps-observation.model - persistence/src/main/models/Observe-25-data-ps-common.model - persistence/src/main/models/Observe-30-data-ll-observation.model - persistence/src/main/models/Observe-31-data-ll-logbook.model - persistence/src/main/models/Observe-32-data-ll-landing.model - persistence/src/main/models/Observe-35-data-ll-common.model Changes: ===================================== persistence/src/main/models/Observe-02-referential-ps-common.model ===================================== @@ -18,5 +18,5 @@ referential.ps.common.TransmittingBuoyOwnership > referential.I18nReferentialEnt referential.ps.common.TransmittingBuoyType > referential.I18nReferentialEntity | entity technology + {*:1} String | hibernateAttributeType=text -referential.ps.common.VesselActivity > referential.I18nReferentialEntity | entity dbName=VesselActivity +referential.ps.common.VesselActivity > referential.I18nReferentialEntity | entity allowFad + {*:1} boolean ===================================== persistence/src/main/models/Observe-03-referential-ps-observation.model ===================================== @@ -36,5 +36,5 @@ referential.ps.observation.SpeciesStatus > referential.I18nReferentialEntity | e referential.ps.observation.SurroundingActivity > referential.I18nReferentialEntity | entity -referential.ps.observation.WeightCategory > referential.I18nReferentialEntity | entity dbName=WeightCategory +referential.ps.observation.WeightCategory > referential.I18nReferentialEntity | entity species {*:1} referential.common.Species | lazy=false ===================================== persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -10,7 +10,7 @@ enum !fr.ird.observe.dto.data.ps.TypeTransmittingBuoyOperation enum !fr.ird.observe.dto.data.ps.DcpComputedValue -data.ps.observation.Activity > data.DataEntity >> data.ActivityAware | entity dbName=Activity +data.ps.observation.Activity > data.DataEntity >> data.ActivityAware | entity comment + {*:1} String | hibernateAttributeType=text time + {*:1} Date | hibernateAttributeType.java.util.Date=time latitude + {*:1} Float | sqlType=numeric @@ -19,14 +19,14 @@ vesselSpeed + {*:1} Float | sqlType=numeric seaSurfaceTemperature + {*:1} Float | sqlType=numeric observedSystemDistance + {*:1} Float | sqlType=numeric ersId + {*:1} String -vesselActivity {*:1} referential.ps.common.VesselActivity | dbName=vesselActivity +vesselActivity {*:1} referential.ps.common.VesselActivity surroundingActivity {*:0..1} referential.ps.observation.SurroundingActivity wind {*:0..1} referential.common.Wind detectionMode {*:0..1} referential.ps.observation.DetectionMode reasonForNoFishing {*:0..1} referential.ps.observation.ReasonForNoFishing -floatingObject + {*} data.ps.observation.FloatingObject | unique reverseDbName=activity -observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem reverseDbName=activity -set + {0..1} data.ps.observation.Set | dbName=set +floatingObject + {*} data.ps.observation.FloatingObject | unique +observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem +set + {0..1} data.ps.observation.Set currentFpaZone {*:0..1} referential.common.FpaZone previousFpaZone {*:0..1} referential.common.FpaZone nextFpaZone {*:0..1} referential.common.FpaZone @@ -137,11 +137,11 @@ activity + {*} data.ps.observation.Activity | unique orderBy=time data.ps.observation.SchoolEstimate > data.DataEntity | naturalIdMutable entity totalWeight + {*:1} Integer meanWeight + {*:1} Integer -set {*:1} data.ps.observation.Set | naturalId dbName=set +set {*:1} data.ps.observation.Set | naturalId species {*:1} referential.common.Species | naturalId weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod -data.ps.observation.Set > data.DataEntity >> data.SetAware | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime +data.ps.observation.Set > data.DataEntity >> data.SetAware | entity constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime comment + {*:1} String | hibernateAttributeType=text startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time endPursingTimeStamp + {*:1} Date @@ -157,13 +157,13 @@ currentMeasureDepth + {*:1} Integer schoolType {*:1} referential.ps.common.SchoolType targetCatchCompositionEstimatedByObserver + {*:1} boolean targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean -nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered reverseDbName=set +nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered reasonForNullSet {*:0..1} referential.ps.observation.ReasonForNullSet -nonTargetSample + {*} data.ps.observation.NonTargetSample | unique reverseDbName=set -targetSample + {*} data.ps.observation.TargetSample | unique reverseDbName=set -targetCatch + {*} data.ps.observation.TargetCatch | ordered reverseDbName=set -schoolEstimate + {*} data.ps.observation.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate -nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered reverseDbName=set +nonTargetSample + {*} data.ps.observation.NonTargetSample | unique +targetSample + {*} data.ps.observation.TargetSample | unique +targetCatch + {*} data.ps.observation.TargetCatch | ordered +schoolEstimate + {*} data.ps.observation.SchoolEstimate | orderBy=topiaCreateDate +nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered hasTargetCatch() boolean hasRejetThon() boolean canUseTargetSample(discarded boolean) boolean @@ -187,7 +187,7 @@ catchWeight + {*:1} Float | sqlType=numeric well + {*:1} String | naturalId notNull=false broughtOnDeck + {*:1} Boolean discarded + {*:1} boolean | naturalId -set {*:1} data.ps.observation.Set | naturalId dbName=set +set {*:1} data.ps.observation.Set | naturalId weightCategory {*:1} referential.ps.observation.WeightCategory | naturalId reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard | naturalId notNull=false weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod ===================================== persistence/src/main/models/Observe-25-data-ps-common.model ===================================== @@ -1,18 +1,18 @@ package fr.ird.observe.entities.data.ps.common| entity dbSchema=ps_common -data.ps.common.GearUseFeaturesMeasurement > data.DataEntity | entity dbName=GearUseFeaturesMeasurement +data.ps.common.GearUseFeaturesMeasurement > data.DataEntity | entity measurementValue + {*:1} String gearCaracteristic {*:1} referential.common.GearCaracteristic | notNull -data.ps.common.GearUseFeatures > data.DataEntity | entity dbName=GearUseFeatures +data.ps.common.GearUseFeatures > data.DataEntity | entity comment + {*:1} String | hibernateAttributeType=text number + {*:1} Integer usedInTrip + {*:1} Boolean gear {*:1} referential.common.Gear -gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | orderBy=topiaCreateDate reverseDbName=gearUseFeatures +gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | orderBy=topiaCreateDate getMeasurementsAsString() String -data.ps.common.Trip > data.DataEntity >> data.TripAware | entity dbName=Trip entryPoint +data.ps.common.Trip > data.DataEntity >> data.TripAware | entity entryPoint comment + {*:1} String | hibernateAttributeType=text startDate + {*:1} Date | hibernateAttributeType.java.util.Date=date endDate + {*:1} Date | hibernateAttributeType.java.util.Date=date @@ -22,7 +22,7 @@ reportsUrl + {*:1} String historicalData + {*:1} boolean ersId + {*:1} String ocean {*:0..1} referential.common.Ocean -route + {*} data.ps.observation.Route | unique orderBy=date reverseDbName=trip +route + {*} data.ps.observation.Route | unique orderBy=date vessel {*:1} referential.common.Vessel program {*:1} referential.common.Program observer {*:0..1} referential.common.Person @@ -31,6 +31,6 @@ dataEntryOperator {*:0..1} referential.common.Person departureHarbour {*:0..1} referential.common.Harbour landingHarbour {*:0..1} referential.common.Harbour dataQuality {*:0..1} referential.common.DataQuality -gearUseFeatures + {*} data.ps.common.GearUseFeatures | unique orderBy=topiaCreateDate reverseDbName=trip +gearUseFeatures + {*} data.ps.common.GearUseFeatures | unique orderBy=topiaCreateDate getObserverLabel() String getRouteCount() int ===================================== persistence/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -20,11 +20,11 @@ timeStamp + {*:1} Date latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float -set + {0..1} data.ll.observation.Set | dbName=set -encounter + {*} data.ll.observation.Encounter | reverseDbName=activity orderBy=topiaCreateDate +set + {0..1} data.ll.observation.Set +encounter + {*} data.ll.observation.Encounter | orderBy=topiaCreateDate vesselActivity {*:1} referential.ll.common.VesselActivity | lazy=false dataQuality {*:0..1} referential.common.DataQuality -sensorUsed + {*} data.ll.observation.SensorUsed | reverseDbName=activity orderBy=topiaCreateDate +sensorUsed + {*} data.ll.observation.SensorUsed | orderBy=topiaCreateDate fpaZone {*:1} referential.common.FpaZone getDate() Date getTime() Date @@ -43,10 +43,10 @@ settingIdentifier + {*:1} Integer | notNull haulingIdentifier + {*:1} Integer floatline1Length + {*:1} Float floatline2Length + {*:1} Float -branchline + {*} data.ll.observation.Branchline | unique orderBy=settingIdentifier reverseDbName=basket -catches {*} data.ll.observation.Catch | reverseDbName=basket -tdr {*} data.ll.observation.Tdr | reverseDbName=basket -set {*:1} data.ll.observation.Set | dbName=set +branchline + {*} data.ll.observation.Branchline | unique orderBy=settingIdentifier +catches {*} data.ll.observation.Catch +tdr {*} data.ll.observation.Tdr +set {*:1} data.ll.observation.Set getSection() data.ll.observation.Section setSection(section data.ll.observation.Section) @@ -68,8 +68,8 @@ tracelineLength + {*:1} Float | sqlType=numeric hookLost + {*:1} Boolean traceCutOff + {*:1} Boolean hookType {*:0..1} referential.ll.common.HookType -tdr {*} data.ll.observation.Tdr | reverseDbName=branchline -catches {*} data.ll.observation.Catch | reverseDbName=branchline +tdr {*} data.ll.observation.Tdr +catches {*} data.ll.observation.Catch baitType {*:0..1} referential.ll.common.BaitType topType {*:0..1} referential.ll.common.LineType tracelineType {*:0..1} referential.ll.common.LineType @@ -106,14 +106,14 @@ basket {*:0..1} data.ll.observation.Basket branchline {*:0..1} data.ll.observation.Branchline catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus -sizeMeasure + {*} data.ll.observation.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate +sizeMeasure + {*} data.ll.observation.SizeMeasure | orderBy=topiaCreateDate speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator reverseDbName=catch +predator {*:*} referential.common.Species | manyToManyTableName=catch_predator section {*:0..1} data.ll.observation.Section maturityStatus {*:0..1} referential.ll.observation.MaturityStatus stomachFullness {*:0..1} referential.ll.observation.StomachFullness hookPosition {*:0..1} referential.ll.observation.HookPosition -weightMeasure + {*} data.ll.observation.WeightMeasure | reverseDbName=catch orderBy=topiaCreateDate +weightMeasure + {*} data.ll.observation.WeightMeasure | orderBy=topiaCreateDate catchHealthStatus {*:1} referential.ll.common.HealthStatus sex {*:0..1} referential.common.Sex weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod @@ -138,10 +138,10 @@ hookSize {*:1} referential.ll.common.HookSize data.ll.observation.Section > data.DataEntity >> data.ll.observation.LonglineCompositionAware | entity settingIdentifier + {*:1} Integer | notNull haulingIdentifier + {*:1} Integer -set {*:1} data.ll.observation.Set | dbName=set -basket + {*} data.ll.observation.Basket | unique orderBy=settingIdentifier | reverseDbName=section -tdr {*} data.ll.observation.Tdr | reverseDbName=section -catches {*} data.ll.observation.Catch | reverseDbName=section +set {*:1} data.ll.observation.Set +basket + {*} data.ll.observation.Basket | unique orderBy=settingIdentifier +tdr {*} data.ll.observation.Tdr +catches {*} data.ll.observation.Catch data.ll.observation.SensorUsed > data.DataEntity | entity data + {*:1} !java.sql.Blob @@ -185,18 +185,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric haulingEndLongitude + {*:1} Float | sqlType=numeric haulingBreaks + {*:1} Integer monitored + {*:1} Boolean -baitsComposition + {*} data.ll.observation.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate -floatlinesComposition + {*} data.ll.observation.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate -hooksComposition + {*} data.ll.observation.HooksComposition | reverseDbName=set orderBy=topiaCreateDate -section + {*} data.ll.observation.Section | unique orderBy=settingIdentifier reverseDbName=set +baitsComposition + {*} data.ll.observation.BaitsComposition | orderBy=topiaCreateDate +floatlinesComposition + {*} data.ll.observation.FloatlinesComposition | orderBy=topiaCreateDate +hooksComposition + {*} data.ll.observation.HooksComposition | orderBy=topiaCreateDate +section + {*} data.ll.observation.Section | unique orderBy=settingIdentifier settingShape {*:1} referential.ll.common.SettingShape -tdr + {*} data.ll.observation.Tdr | reverseDbName=set orderBy=topiaCreateDate -catches + {*} data.ll.observation.Catch | ordered reverseDbName=set +tdr + {*} data.ll.observation.Tdr | orderBy=topiaCreateDate +catches + {*} data.ll.observation.Catch | ordered lineType {*:0..1} referential.ll.common.LineType lightsticksType {*:0..1} referential.ll.common.LightsticksType lightsticksColor {*:0..1} referential.ll.common.LightsticksColor -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set -branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate +mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set +branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -256,7 +256,7 @@ meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} data.ll.observation.Branchline sensorBrand {*:0..1} referential.ll.observation.SensorBrand -species {*:*} referential.common.Species | manyToManyTableName=species_tdr reverseDbName=tdr +species {*:*} referential.common.Species | manyToManyTableName=species_tdr section {*:0..1} data.ll.observation.Section basket {*:0..1} data.ll.observation.Basket itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPosition ===================================== persistence/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -14,7 +14,7 @@ currentDirection + {*:1} Integer vesselActivity {*:1} referential.ll.common.VesselActivity | lazy=false dataQuality {*:0..1} referential.common.DataQuality fpaZone {*:1} referential.common.FpaZone -relatedObservedActivity + {0..1} data.ll.observation.Activity | reverseDbName=activity +relatedObservedActivity + {0..1} data.ll.observation.Activity set + {0..1} data.ll.logbook.Set sample + {0..1} data.ll.logbook.Sample getStartDate() Date @@ -58,17 +58,17 @@ monitored + {*:1} Boolean totalLineLength + {*:1} Integer basketLineLength + {*:1} Integer lengthBetweenBranchlines + {*:1} Integer -baitsComposition + {*} data.ll.logbook.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate -floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate -hooksComposition + {*} data.ll.logbook.HooksComposition | reverseDbName=set orderBy=topiaCreateDate +baitsComposition + {*} data.ll.logbook.BaitsComposition | orderBy=topiaCreateDate +floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition | orderBy=topiaCreateDate +hooksComposition + {*} data.ll.logbook.HooksComposition | orderBy=topiaCreateDate settingShape {*:1} referential.ll.common.SettingShape -catches + {*} data.ll.logbook.Catch | ordered reverseDbName=set +catches + {*} data.ll.logbook.Catch | ordered lineType {*:0..1} referential.ll.common.LineType lightsticksUsed + {*:1} Boolean lightsticksType {*:0..1} referential.ll.common.LightsticksType lightsticksColor {*:0..1} referential.ll.common.LightsticksColor -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set -branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate +mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set +branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -118,7 +118,7 @@ tagNumber + {*:1} String catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator reverseDbName=catch +predator {*:*} referential.common.Species | manyToManyTableName=catch_predator catchHealthStatus {*:1} referential.ll.common.HealthStatus onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod @@ -166,6 +166,6 @@ comment + {*:1} String | hibernateAttributeType=text timeStamp + {*:1} Date latitude + {*:1} Float | sqlType=numeric longitude + {*:1} Float | sqlType=numeric -samplePart + {*} data.ll.logbook.SamplePart | ordered dbName=samplePart reverseDbName=sample +samplePart + {*} data.ll.logbook.SamplePart | ordered getQuadrant() Integer setQuadrant(quadrant Integer) ===================================== persistence/src/main/models/Observe-32-data-ll-landing.model ===================================== @@ -9,7 +9,7 @@ compagnies {*:1} referential.ll.landing.Compagnies person {*:1} referential.common.Person harbour {*:0..1} referential.common.Harbour vessel {*:0..1} referential.common.Vessel -landingPart + {*} data.ll.landing.LandingPart | reverseDbName=landing orderBy=topiaCreateDate +landingPart + {*} data.ll.landing.LandingPart | orderBy=topiaCreateDate data.ll.landing.LandingPart > data.DataEntity | entity species {*:1} referential.common.Species ===================================== persistence/src/main/models/Observe-35-data-ll-common.model ===================================== @@ -4,7 +4,7 @@ data.ll.common.GearUseFeatures > data.DataEntity | entity comment + {*:1} String | hibernateAttributeType=text number + {*:1} Integer usedInTrip + {*:1} Boolean -gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | unique orderBy=topiaCreateDate reverseDbName=gearUseFeatures +gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | unique orderBy=topiaCreateDate gear {*:1} referential.common.Gear getMeasurementsAsString() String @@ -17,8 +17,8 @@ startDate + {*:1} Date endDate + {*:1} Date noOfCrewMembers + {*:1} Integer ersId + {*:1} String -activityObs + {*} data.ll.observation.Activity | unique reverseDbName=trip -activityLogbook + {*} data.ll.logbook.Activity | unique reverseDbName=trip +activityObs + {*} data.ll.observation.Activity | unique +activityLogbook + {*} data.ll.logbook.Activity | unique tripType {*:1} referential.ll.common.TripType observationMethod {*:1} referential.ll.common.ObservationMethod observer {*:1} referential.common.Person @@ -35,12 +35,12 @@ logbookDataQuality {*:0..1} referential.common.DataQuality generalComment + {*:1} String | hibernateAttributeType=text observationsComment + {*:1} String | hibernateAttributeType=text logbookComment + {*:1} String | hibernateAttributeType=text -species {*:*} referential.common.Species | manyToManyTableName=species_trip reverseDbName=trip +species {*:*} referential.common.Species | manyToManyTableName=species_trip observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean -gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate reverseDbName=trip -landing + {*} data.ll.landing.Landing | unique orderBy=startDate reverseDbName=trip -sample + {*} data.ll.logbook.Sample | unique orderBy=timeStamp reverseDbName=trip +gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate +landing + {*} data.ll.landing.Landing | unique orderBy=startDate +sample + {*} data.ll.logbook.Sample | unique orderBy=timeStamp getActivityObsCount() int getActivityLogbookCount() int getSampleCount() int View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/75b2792a9e728ed67f960b201... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/75b2792a9e728ed67f960b201... You're receiving this email because of your account on gitlab.com.