Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef9da7b2 by Tony Chemit at 2020-08-17T18:41:28+02:00 * Remove manyToManyTableName tag value from persistence model, since in v8 entity names are db table names - - - - - 4 changed files: - persistence/src/main/models/Observe-20-data-ps-observation.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-35-data-ll-common.model Changes: ===================================== persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -25,7 +25,7 @@ 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 -observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem +observedSystem {*:*} referential.ps.observation.ObservedSystem | unique set + {0..1} data.ps.observation.Set currentFpaZone {*:0..1} referential.common.FpaZone previousFpaZone {*:0..1} referential.common.FpaZone ===================================== persistence/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -108,7 +108,7 @@ catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus sizeMeasure + {*} data.ll.observation.SizeMeasure | orderBy=topiaCreateDate speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator +predator {*:*} referential.common.Species section {*:0..1} data.ll.observation.Section maturityStatus {*:0..1} referential.ll.observation.MaturityStatus stomachFullness {*:0..1} referential.ll.observation.StomachFullness @@ -195,7 +195,7 @@ 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 +mitigationType:set {*:*} referential.ll.common.MitigationType branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() 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 +species {*:*} referential.common.Species 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 ===================================== @@ -67,7 +67,7 @@ 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 +mitigationType:set {*:*} referential.ll.common.MitigationType branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() 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 +predator {*:*} referential.common.Species catchHealthStatus {*:1} referential.ll.common.HealthStatus onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod ===================================== persistence/src/main/models/Observe-35-data-ll-common.model ===================================== @@ -35,7 +35,7 @@ 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 +species {*:*} referential.common.Species observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ef9da7b2be85341e51106ce7e7... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ef9da7b2be85341e51106ce7e7... You're receiving this email because of your account on gitlab.com.