Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 29b6cc5b by Tony Chemit at 2022-05-09T18:15:34+02:00 Nouveau critère de classement pour l'arbre : type de bateau - Closes #2332 - - - - - 13 changed files: - core/api/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDataGroupByDtoToDefinitionMappingTest.java - core/api/dto/src/test/java/fr/ird/observe/spi/module/ObserveBusinessProjectTest.java - core/api/dto/src/test/resources/fixtures/api.properties - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/fixtures/api-tree.properties - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/test/resources/fixtures/persistence.properties - model/src/main/models/Observe/persistence/class/groupBy.properties - model/src/main/resources/META-INF/navigation/Observe-metamodel.json - model/src/main/resources/META-INF/navigation/Observe-tree-navigation-model.json - model/src/main/resources/META-INF/navigation/Observe-tree-selection-model.json - model/src/test/resources/fixtures/model.properties Changes: ===================================== core/api/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDataGroupByDtoToDefinitionMappingTest.java ===================================== @@ -47,33 +47,27 @@ public class ObserveDataGroupByDtoToDefinitionMappingTest { public void getGroupByDefinitions() { ObserveBusinessProject businessProject = ObserveBusinessProject.get(); ObserveDataGroupByDtoToDefinitionMapping mapping = ObserveDataGroupByDtoToDefinitionMapping.get(); - int psCount; - int llCount; { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ll.common.TripDto, ?>> definitions = mapping.getDefinitions(fr.ird.observe.dto.data.ll.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - psCount = definitions.size(); List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getLlBusinessModule()); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(psCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ll"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ll", expectedCount, definitions2.size()); } { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ps.common.TripDto, ?>> definitions = mapping.getDefinitions(fr.ird.observe.dto.data.ps.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - llCount = definitions.size(); - List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getLlBusinessModule()); + List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getPsBusinessModule()); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(llCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ps"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ps", expectedCount, definitions2.size()); } - Assert.assertEquals(psCount, llCount); - - int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count"); - ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count", expectedCount, psCount + llCount); } @Test ===================================== core/api/dto/src/test/java/fr/ird/observe/spi/module/ObserveBusinessProjectTest.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.spi.module; import fr.ird.observe.ObserveApiFixtures; import fr.ird.observe.dto.DtoToReference; import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.data.DataGroupByDtoDefinition; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.data.ps.observation.SchoolEstimateDto; @@ -77,33 +76,27 @@ public class ObserveBusinessProjectTest extends TestSupportWithConfig { @Test public void getGroupByDefinitions() { - int psCount; - int llCount; { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ll.common.TripDto, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(fr.ird.observe.dto.data.ll.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - psCount = definitions.size(); - List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getPsBusinessModule().getDataGroupByDtoDefinitions(); + List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getLlBusinessModule().getDataGroupByDtoDefinitions(); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(psCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ll"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ll", expectedCount, definitions2.size()); } { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ps.common.TripDto, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(fr.ird.observe.dto.data.ps.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - llCount = definitions.size(); - List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getLlBusinessModule().getDataGroupByDtoDefinitions(); + List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getPsBusinessModule().getDataGroupByDtoDefinitions(); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(llCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ps"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ps", expectedCount, definitions2.size()); } - Assert.assertEquals(psCount, llCount); - - int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count"); - ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count", expectedCount, psCount + llCount); } @Test @@ -146,7 +139,7 @@ public class ObserveBusinessProjectTest extends TestSupportWithConfig { } } - private <D extends RootOpenableDto, G extends DataGroupByDto<D>> void groupByDecoration(Class<D> dtoType) { + private <D extends RootOpenableDto> void groupByDecoration(Class<D> dtoType) { List<DataGroupByDtoDefinition<D, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(dtoType); Assert.assertNotNull("could not find groupBy definitions for:" + dtoType.getName(), definitions); for (DataGroupByDtoDefinition<D, ?> definition : definitions) { ===================================== core/api/dto/src/test/resources/fixtures/api.properties ===================================== @@ -21,8 +21,10 @@ ### DATA_FORM_COUNT=58 REFERENTIAL_FORM_COUNT=91 -DECORATOR_DEFINITIONS_COUNT=574 -DataGroupByDtoToDefinitionMapping.count=24 +DECORATOR_DEFINITIONS_COUNT=576 +DataGroupByDtoToDefinitionMapping.count.ps=12 +DataGroupByDtoToDefinitionMapping.count.ll=13 +DataGroupByDtoToDefinitionMapping.count=25 ReferenceDtoToDtoClassMapping.count=157 DtoToReferenceDtoMapping.count=157 DtoToFormDtoMapping.count=168 ===================================== core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json ===================================== @@ -12,7 +12,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/gearUseFeatures", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/gearUseFeatures", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/gearUseFeatures", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/gearUseFeatures" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/gearUseFeatures", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/gearUseFeatures" ], "fr.ird.observe.dto.data.ll.common.TripDto": [ "/dataLlCommonTrip:${Trip}", @@ -27,7 +28,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}" ], "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [ "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}" @@ -62,6 +64,9 @@ "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [ "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}" ], + "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [ + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}" + ], "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [ "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}" ], @@ -78,7 +83,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/landing/${Landing}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/landing/${Landing}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/landing/${Landing}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/landing/${Landing}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/landing/${Landing}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/landing/${Landing}" ], "fr.ird.observe.dto.data.ll.logbook.ActivityDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}", @@ -93,7 +99,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}" ], "fr.ird.observe.dto.data.ll.logbook.ActivitySampleDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", @@ -108,7 +115,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}" ], "fr.ird.observe.dto.data.ll.logbook.CatchDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}/catches", @@ -123,7 +131,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches" ], "fr.ird.observe.dto.data.ll.logbook.SampleDto": [ "/dataLlCommonTrip:${Trip}/sample/${Sample}", @@ -138,7 +147,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/sample/${Sample}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/sample/${Sample}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/sample/${Sample}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/sample/${Sample}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/sample/${Sample}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/sample/${Sample}" ], "fr.ird.observe.dto.data.ll.logbook.SetDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}", @@ -153,7 +163,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}" ], "fr.ird.observe.dto.data.ll.logbook.SetGlobalCompositionDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", @@ -168,7 +179,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition" ], "fr.ird.observe.dto.data.ll.observation.ActivityDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}", @@ -183,7 +195,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}" ], "fr.ird.observe.dto.data.ll.observation.CatchDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/catches", @@ -198,7 +211,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/catches" ], "fr.ird.observe.dto.data.ll.observation.EncounterDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/encounter", @@ -213,7 +227,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/encounter", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/encounter", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/encounter", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/encounter" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/encounter", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/encounter" ], "fr.ird.observe.dto.data.ll.observation.SensorUsedDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/sensorUsed", @@ -228,7 +243,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/sensorUsed", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/sensorUsed", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/sensorUsed", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/sensorUsed" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/sensorUsed", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/sensorUsed" ], "fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", @@ -243,7 +259,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition" ], "fr.ird.observe.dto.data.ll.observation.SetDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}", @@ -258,7 +275,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}" ], "fr.ird.observe.dto.data.ll.observation.SetGlobalCompositionDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", @@ -273,7 +291,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition" ], "fr.ird.observe.dto.data.ll.observation.TdrDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/tdr", @@ -288,7 +307,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/tdr" ], "fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto": [ "/dataPsCommonTrip:${Trip}/gearUseFeatures", ===================================== core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json ===================================== @@ -12,7 +12,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}" ], "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [ "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}" @@ -47,6 +48,9 @@ "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [ "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}" ], + "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [ + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}" + ], "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [ "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}" ], ===================================== core/api/tree/src/test/resources/fixtures/api-tree.properties ===================================== @@ -19,5 +19,5 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -SelectionMapping.count=141 -NavigationMapping.count=648 +SelectionMapping.count=143 +NavigationMapping.count=666 ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml ===================================== @@ -449,6 +449,24 @@ ]]></sql-query> <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::landingHarbour::count::null" read-only="true"><![CDATA[ SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.landingHarbour IS NULL; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e RIGHT JOIN ll_common.tripType p ON e.tripType = p.topiaId GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noDisabled" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e RIGHT JOIN ll_common.tripType p ON e.tripType = p.topiaId WHERE p.status = 1 GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noEmpty" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e LEFT JOIN ll_common.tripType p ON e.tripType = p.topiaId GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noEmpty-noDisabled" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e LEFT JOIN ll_common.tripType p ON e.tripType = p.topiaId WHERE p.status = 1 GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::one" read-only="true"><![CDATA[ + SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.tripType = ?; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::null" read-only="true"><![CDATA[ + SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.tripType IS NULL; ]]></sql-query> <database-object> <create>CREATE INDEX idx_ll_common_gearusefeatures_trip ON ll_common.gearUseFeatures(trip)</create> ===================================== core/persistence/java/src/test/resources/fixtures/persistence.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -DECORATOR_DEFINITIONS_COUNT=792 -DataGroupByEntityToDefinitionMapping.count=24 +DECORATOR_DEFINITIONS_COUNT=796 +DataGroupByEntityToDefinitionMapping.count=25 EntityToDtoClassMapping.count=308 DtoToEntityContextMapping.count=185 ===================================== model/src/main/models/Observe/persistence/class/groupBy.properties ===================================== @@ -19,5 +19,5 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -data.ll.common.Trip=startDate,endDate,observationsProgram:p.observation = TRUE,logbookProgram:p.logbook = TRUE,ocean,observer:p.observer = TRUE,captain:p.captain = TRUE,observationsDataEntryOperator:p.dataEntryOperator = TRUE,logbookDataEntryOperator:p.dataEntryOperator = TRUE,vessel,departureHarbour,landingHarbour +data.ll.common.Trip=startDate,endDate,observationsProgram:p.observation = TRUE,logbookProgram:p.logbook = TRUE,ocean,observer:p.observer = TRUE,captain:p.captain = TRUE,observationsDataEntryOperator:p.dataEntryOperator = TRUE,logbookDataEntryOperator:p.dataEntryOperator = TRUE,vessel,departureHarbour,landingHarbour,tripType data.ps.common.Trip=startDate,endDate,observationsProgram:p.observation = TRUE,logbookProgram:p.logbook = TRUE,ocean,observer:p.observer = TRUE,captain:p.captain = TRUE,observationsDataEntryOperator:p.dataEntryOperator = TRUE,logbookDataEntryOperator:p.dataEntryOperator = TRUE,vessel,departureHarbour,landingHarbour ===================================== model/src/main/resources/META-INF/navigation/Observe-metamodel.json ===================================== @@ -85,7 +85,8 @@ "logbookDataEntryOperator → referential.common.Person", "vessel → referential.common.Vessel", "departureHarbour → referential.common.Harbour", - "landingHarbour → referential.common.Harbour" + "landingHarbour → referential.common.Harbour", + "tripType → referential.ll.common.TripType" ], "children": [ "gearUseFeatures → ONE → 02.01 → Table → data.ll.common.GearUseFeatures", ===================================== model/src/main/resources/META-INF/navigation/Observe-tree-navigation-model.json ===================================== @@ -29,6 +29,7 @@ "dataLlCommonTripGroupByVessel → MANY → data.ll.common.TripGroupByVessel", "dataLlCommonTripGroupByDepartureHarbour → MANY → data.ll.common.TripGroupByDepartureHarbour", "dataLlCommonTripGroupByLandingHarbour → MANY → data.ll.common.TripGroupByLandingHarbour", + "dataLlCommonTripGroupByTripType → MANY → data.ll.common.TripGroupByTripType", "dataLlCommonTrip → MANY → data.ll.common.Trip", "referentialCommon → ONE → referential.common.ReferentialPackage", "referentialLlCommon → ONE → referential.ll.common.ReferentialPackage", @@ -627,6 +628,17 @@ "children → MANY → data.ll.common.Trip" ] }, + { + "parentClassNames": [ + "Root" + ], + "className": "data.ll.common.TripGroupByTripType", + "type": "data.ll.common.TripGroupByTripType", + "nodeType": "RootOpenFilter", + "children": [ + "children → MANY → data.ll.common.Trip" + ] + }, { "parentClassNames": [ "Root", @@ -641,7 +653,8 @@ "data.ll.common.TripGroupByLogbookDataEntryOperator", "data.ll.common.TripGroupByVessel", "data.ll.common.TripGroupByDepartureHarbour", - "data.ll.common.TripGroupByLandingHarbour" + "data.ll.common.TripGroupByLandingHarbour", + "data.ll.common.TripGroupByTripType" ], "className": "data.ll.common.Trip", "type": "data.ll.common.Trip", ===================================== model/src/main/resources/META-INF/navigation/Observe-tree-selection-model.json ===================================== @@ -29,6 +29,7 @@ "dataLlCommonTripGroupByVessel → MANY → data.ll.common.TripGroupByVessel", "dataLlCommonTripGroupByDepartureHarbour → MANY → data.ll.common.TripGroupByDepartureHarbour", "dataLlCommonTripGroupByLandingHarbour → MANY → data.ll.common.TripGroupByLandingHarbour", + "dataLlCommonTripGroupByTripType → MANY → data.ll.common.TripGroupByTripType", "dataLlCommonTrip → MANY → data.ll.common.Trip", "referentialCommon → ONE → referential.common.ReferentialPackage", "referentialLlCommon → ONE → referential.ll.common.ReferentialPackage", @@ -325,6 +326,17 @@ "children → MANY → data.ll.common.Trip" ] }, + { + "parentClassNames": [ + "Root" + ], + "className": "data.ll.common.TripGroupByTripType", + "type": "data.ll.common.TripGroupByTripType", + "nodeType": "RootOpenFilter", + "children": [ + "children → MANY → data.ll.common.Trip" + ] + }, { "parentClassNames": [ "Root", @@ -339,7 +351,8 @@ "data.ll.common.TripGroupByLogbookDataEntryOperator", "data.ll.common.TripGroupByVessel", "data.ll.common.TripGroupByDepartureHarbour", - "data.ll.common.TripGroupByLandingHarbour" + "data.ll.common.TripGroupByLandingHarbour", + "data.ll.common.TripGroupByTripType" ], "className": "data.ll.common.Trip", "type": "data.ll.common.Trip", ===================================== model/src/test/resources/fixtures/model.properties ===================================== @@ -22,6 +22,6 @@ Metamodel.count.root=11 Metamodel.count.nodes=141 Metamodel.id.count.nodes=20 -Metamodel.tree.selection.count.nodes=127 -Metamodel.tree.navigation.count.nodes=177 +Metamodel.tree.selection.count.nodes=128 +Metamodel.tree.navigation.count.nodes=178 Metamodel.parent.count=62 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/29b6cc5b677840d6381259b4a5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/29b6cc5b677840d6381259b4a5... You're receiving this email because of your account on gitlab.com.