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

Commits:

13 changed files:

Changes:

  • core/api/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDataGroupByDtoToDefinitionMappingTest.java
    ... ... @@ -47,33 +47,27 @@ public class ObserveDataGroupByDtoToDefinitionMappingTest {
    47 47 
         public void getGroupByDefinitions() {
    48 48 
             ObserveBusinessProject businessProject = ObserveBusinessProject.get();
    49 49 
             ObserveDataGroupByDtoToDefinitionMapping mapping = ObserveDataGroupByDtoToDefinitionMapping.get();
    50 
    -        int psCount;
    51 
    -        int llCount;
    52 50 
             {
    53 51 
                 List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ll.common.TripDto, ?>> definitions = mapping.getDefinitions(fr.ird.observe.dto.data.ll.common.TripDto.class);
    54 52 
                 Assert.assertNotNull(definitions);
    55 53 
                 Assert.assertFalse(definitions.isEmpty());
    56 
    -            psCount = definitions.size();
    57 54
    58 55 
                 List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getLlBusinessModule());
    59 56 
                 Assert.assertNotNull(definitions2);
    60 57 
                 Assert.assertFalse(definitions2.isEmpty());
    61 
    -            Assert.assertEquals(psCount, definitions2.size());
    58 
    +            int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ll");
    59 
    +            ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ll", expectedCount, definitions2.size());
    62 60 
             }
    63 61 
             {
    64 62 
                 List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ps.common.TripDto, ?>> definitions = mapping.getDefinitions(fr.ird.observe.dto.data.ps.common.TripDto.class);
    65 63 
                 Assert.assertNotNull(definitions);
    66 64 
                 Assert.assertFalse(definitions.isEmpty());
    67 
    -            llCount = definitions.size();
    68 
    -            List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getLlBusinessModule());
    65 
    +            List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getPsBusinessModule());
    69 66 
                 Assert.assertNotNull(definitions2);
    70 67 
                 Assert.assertFalse(definitions2.isEmpty());
    71 
    -            Assert.assertEquals(llCount, definitions2.size());
    68 
    +            int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ps");
    69 
    +            ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ps", expectedCount, definitions2.size());
    72 70 
             }
    73 
    -        Assert.assertEquals(psCount, llCount);
    74 
    -
    75 
    -        int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count");
    76 
    -        ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count", expectedCount, psCount + llCount);
    77 71 
         }
    78 72
    79 73 
         @Test

  • core/api/dto/src/test/java/fr/ird/observe/spi/module/ObserveBusinessProjectTest.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.spi.module;
    25 25 
     import fr.ird.observe.ObserveApiFixtures;
    26 26 
     import fr.ird.observe.dto.DtoToReference;
    27 27 
     import fr.ird.observe.dto.data.DataDto;
    28 
    -import fr.ird.observe.dto.data.DataGroupByDto;
    29 28 
     import fr.ird.observe.dto.data.DataGroupByDtoDefinition;
    30 29 
     import fr.ird.observe.dto.data.RootOpenableDto;
    31 30 
     import fr.ird.observe.dto.data.ps.observation.SchoolEstimateDto;
    ... ... @@ -77,33 +76,27 @@ public class ObserveBusinessProjectTest extends TestSupportWithConfig {
    77 76
    78 77 
         @Test
    79 78 
         public void getGroupByDefinitions() {
    80 
    -        int psCount;
    81 
    -        int llCount;
    82 79 
             {
    83 80 
                 List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ll.common.TripDto, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(fr.ird.observe.dto.data.ll.common.TripDto.class);
    84 81 
                 Assert.assertNotNull(definitions);
    85 82 
                 Assert.assertFalse(definitions.isEmpty());
    86 
    -            psCount = definitions.size();
    87 83
    88 
    -            List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getPsBusinessModule().getDataGroupByDtoDefinitions();
    84 
    +            List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getLlBusinessModule().getDataGroupByDtoDefinitions();
    89 85 
                 Assert.assertNotNull(definitions2);
    90 86 
                 Assert.assertFalse(definitions2.isEmpty());
    91 
    -            Assert.assertEquals(psCount, definitions2.size());
    87 
    +            int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ll");
    88 
    +            ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ll", expectedCount, definitions2.size());
    92 89 
             }
    93 90 
             {
    94 91 
                 List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ps.common.TripDto, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(fr.ird.observe.dto.data.ps.common.TripDto.class);
    95 92 
                 Assert.assertNotNull(definitions);
    96 93 
                 Assert.assertFalse(definitions.isEmpty());
    97 
    -            llCount = definitions.size();
    98 
    -            List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getLlBusinessModule().getDataGroupByDtoDefinitions();
    94 
    +            List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getPsBusinessModule().getDataGroupByDtoDefinitions();
    99 95 
                 Assert.assertNotNull(definitions2);
    100 96 
                 Assert.assertFalse(definitions2.isEmpty());
    101 
    -            Assert.assertEquals(llCount, definitions2.size());
    97 
    +            int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ps");
    98 
    +            ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ps", expectedCount, definitions2.size());
    102 99 
             }
    103 
    -        Assert.assertEquals(psCount, llCount);
    104 
    -
    105 
    -        int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count");
    106 
    -        ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count", expectedCount, psCount + llCount);
    107 100 
         }
    108 101
    109 102 
         @Test
    ... ... @@ -146,7 +139,7 @@ public class ObserveBusinessProjectTest extends TestSupportWithConfig {
    146 139 
             }
    147 140 
         }
    148 141
    149 
    -    private <D extends RootOpenableDto, G extends DataGroupByDto<D>> void groupByDecoration(Class<D> dtoType) {
    142 
    +    private <D extends RootOpenableDto> void groupByDecoration(Class<D> dtoType) {
    150 143 
             List<DataGroupByDtoDefinition<D, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(dtoType);
    151 144 
             Assert.assertNotNull("could not find groupBy definitions for:" + dtoType.getName(), definitions);
    152 145 
             for (DataGroupByDtoDefinition<D, ?> definition : definitions) {

  • core/api/dto/src/test/resources/fixtures/api.properties
    ... ... @@ -21,8 +21,10 @@
    21 21 
     ###
    22 22 
     DATA_FORM_COUNT=58
    23 23 
     REFERENTIAL_FORM_COUNT=91
    24 
    -DECORATOR_DEFINITIONS_COUNT=574
    25 
    -DataGroupByDtoToDefinitionMapping.count=24
    24 
    +DECORATOR_DEFINITIONS_COUNT=576
    25 
    +DataGroupByDtoToDefinitionMapping.count.ps=12
    26 
    +DataGroupByDtoToDefinitionMapping.count.ll=13
    27 
    +DataGroupByDtoToDefinitionMapping.count=25
    26 28 
     ReferenceDtoToDtoClassMapping.count=157
    27 29 
     DtoToReferenceDtoMapping.count=157
    28 30 
     DtoToFormDtoMapping.count=168

  • core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json
    ... ... @@ -12,7 +12,8 @@
    12 12 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/gearUseFeatures",
    13 13 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/gearUseFeatures",
    14 14 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/gearUseFeatures",
    15 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/gearUseFeatures"
    15 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/gearUseFeatures",
    16 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/gearUseFeatures"
    16 17 
       ],
    17 18 
       "fr.ird.observe.dto.data.ll.common.TripDto": [
    18 19 
         "/dataLlCommonTrip:${Trip}",
    ... ... @@ -27,7 +28,8 @@
    27 28 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}",
    28 29 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}",
    29 30 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}",
    30 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}"
    31 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}",
    32 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}"
    31 33 
       ],
    32 34 
       "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [
    33 35 
         "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}"
    ... ... @@ -62,6 +64,9 @@
    62 64 
       "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [
    63 65 
         "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}"
    64 66 
       ],
    67 
    +  "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [
    68 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}"
    69 
    +  ],
    65 70 
       "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [
    66 71 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}"
    67 72 
       ],
    ... ... @@ -78,7 +83,8 @@
    78 83 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/landing/${Landing}",
    79 84 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/landing/${Landing}",
    80 85 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/landing/${Landing}",
    81 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/landing/${Landing}"
    86 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/landing/${Landing}",
    87 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/landing/${Landing}"
    82 88 
       ],
    83 89 
       "fr.ird.observe.dto.data.ll.logbook.ActivityDto": [
    84 90 
         "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}",
    ... ... @@ -93,7 +99,8 @@
    93 99 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}",
    94 100 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}",
    95 101 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}",
    96 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}"
    102 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}",
    103 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}"
    97 104 
       ],
    98 105 
       "fr.ird.observe.dto.data.ll.logbook.ActivitySampleDto": [
    99 106 
         "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}",
    ... ... @@ -108,7 +115,8 @@
    108 115 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}",
    109 116 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}",
    110 117 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}",
    111 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}"
    118 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}",
    119 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}"
    112 120 
       ],
    113 121 
       "fr.ird.observe.dto.data.ll.logbook.CatchDto": [
    114 122 
         "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}/catches",
    ... ... @@ -123,7 +131,8 @@
    123 131 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches",
    124 132 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches",
    125 133 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches",
    126 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches"
    134 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches",
    135 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches"
    127 136 
       ],
    128 137 
       "fr.ird.observe.dto.data.ll.logbook.SampleDto": [
    129 138 
         "/dataLlCommonTrip:${Trip}/sample/${Sample}",
    ... ... @@ -138,7 +147,8 @@
    138 147 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/sample/${Sample}",
    139 148 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/sample/${Sample}",
    140 149 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/sample/${Sample}",
    141 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/sample/${Sample}"
    150 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/sample/${Sample}",
    151 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/sample/${Sample}"
    142 152 
       ],
    143 153 
       "fr.ird.observe.dto.data.ll.logbook.SetDto": [
    144 154 
         "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}",
    ... ... @@ -153,7 +163,8 @@
    153 163 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}",
    154 164 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}",
    155 165 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}",
    156 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}"
    166 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}",
    167 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}"
    157 168 
       ],
    158 169 
       "fr.ird.observe.dto.data.ll.logbook.SetGlobalCompositionDto": [
    159 170 
         "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition",
    ... ... @@ -168,7 +179,8 @@
    168 179 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition",
    169 180 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition",
    170 181 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition",
    171 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition"
    182 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition",
    183 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition"
    172 184 
       ],
    173 185 
       "fr.ird.observe.dto.data.ll.observation.ActivityDto": [
    174 186 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}",
    ... ... @@ -183,7 +195,8 @@
    183 195 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}",
    184 196 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}",
    185 197 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}",
    186 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}"
    198 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}",
    199 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}"
    187 200 
       ],
    188 201 
       "fr.ird.observe.dto.data.ll.observation.CatchDto": [
    189 202 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/catches",
    ... ... @@ -198,7 +211,8 @@
    198 211 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/catches",
    199 212 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/catches",
    200 213 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches",
    201 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches"
    214 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches",
    215 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/catches"
    202 216 
       ],
    203 217 
       "fr.ird.observe.dto.data.ll.observation.EncounterDto": [
    204 218 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/encounter",
    ... ... @@ -213,7 +227,8 @@
    213 227 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/encounter",
    214 228 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/encounter",
    215 229 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/encounter",
    216 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/encounter"
    230 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/encounter",
    231 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/encounter"
    217 232 
       ],
    218 233 
       "fr.ird.observe.dto.data.ll.observation.SensorUsedDto": [
    219 234 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/sensorUsed",
    ... ... @@ -228,7 +243,8 @@
    228 243 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/sensorUsed",
    229 244 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/sensorUsed",
    230 245 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/sensorUsed",
    231 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/sensorUsed"
    246 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/sensorUsed",
    247 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/sensorUsed"
    232 248 
       ],
    233 249 
       "fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto": [
    234 250 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition",
    ... ... @@ -243,7 +259,8 @@
    243 259 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition",
    244 260 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition",
    245 261 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition",
    246 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition"
    262 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition",
    263 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition"
    247 264 
       ],
    248 265 
       "fr.ird.observe.dto.data.ll.observation.SetDto": [
    249 266 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}",
    ... ... @@ -258,7 +275,8 @@
    258 275 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}",
    259 276 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}",
    260 277 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}",
    261 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}"
    278 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}",
    279 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}"
    262 280 
       ],
    263 281 
       "fr.ird.observe.dto.data.ll.observation.SetGlobalCompositionDto": [
    264 282 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition",
    ... ... @@ -273,7 +291,8 @@
    273 291 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition",
    274 292 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition",
    275 293 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition",
    276 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition"
    294 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition",
    295 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition"
    277 296 
       ],
    278 297 
       "fr.ird.observe.dto.data.ll.observation.TdrDto": [
    279 298 
         "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/tdr",
    ... ... @@ -288,7 +307,8 @@
    288 307 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/tdr",
    289 308 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/tdr",
    290 309 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr",
    291 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr"
    310 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr",
    311 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/tdr"
    292 312 
       ],
    293 313 
       "fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto": [
    294 314 
         "/dataPsCommonTrip:${Trip}/gearUseFeatures",

  • core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json
    ... ... @@ -12,7 +12,8 @@
    12 12 
         "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}",
    13 13 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}",
    14 14 
         "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}",
    15 
    -    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}"
    15 
    +    "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}",
    16 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}"
    16 17 
       ],
    17 18 
       "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [
    18 19 
         "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}"
    ... ... @@ -47,6 +48,9 @@
    47 48 
       "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [
    48 49 
         "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}"
    49 50 
       ],
    51 
    +  "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [
    52 
    +    "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}"
    53 
    +  ],
    50 54 
       "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [
    51 55 
         "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}"
    52 56 
       ],

  • core/api/tree/src/test/resources/fixtures/api-tree.properties
    ... ... @@ -19,5 +19,5 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -SelectionMapping.count=141
    23 
    -NavigationMapping.count=648
    22 
    +SelectionMapping.count=143
    23 
    +NavigationMapping.count=666

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml
    ... ... @@ -449,6 +449,24 @@
    449 449 
     ]]></sql-query>
    450 450 
         <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::landingHarbour::count::null" read-only="true"><![CDATA[
    451 451 
         SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.landingHarbour IS NULL;
    452 
    +]]></sql-query>
    453 
    +    <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all" read-only="true"><![CDATA[
    454 
    +    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;
    455 
    +]]></sql-query>
    456 
    +    <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noDisabled" read-only="true"><![CDATA[
    457 
    +    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;
    458 
    +]]></sql-query>
    459 
    +    <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noEmpty" read-only="true"><![CDATA[
    460 
    +    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;
    461 
    +]]></sql-query>
    462 
    +    <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noEmpty-noDisabled" read-only="true"><![CDATA[
    463 
    +    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;
    464 
    +]]></sql-query>
    465 
    +    <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::one" read-only="true"><![CDATA[
    466 
    +    SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.tripType = ?;
    467 
    +]]></sql-query>
    468 
    +    <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::null" read-only="true"><![CDATA[
    469 
    +    SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.tripType IS NULL;
    452 470 
     ]]></sql-query>
    453 471 
         <database-object>
    454 472 
             <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 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -DECORATOR_DEFINITIONS_COUNT=792
    23 
    -DataGroupByEntityToDefinitionMapping.count=24
    22 
    +DECORATOR_DEFINITIONS_COUNT=796
    23 
    +DataGroupByEntityToDefinitionMapping.count=25
    24 24 
     EntityToDtoClassMapping.count=308
    25 25 
     DtoToEntityContextMapping.count=185

  • model/src/main/models/Observe/persistence/class/groupBy.properties
    ... ... @@ -19,5 +19,5 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -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
    22 
    +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
    23 23 
     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 @@
    85 85 
           "logbookDataEntryOperator → referential.common.Person",
    86 86 
           "vessel → referential.common.Vessel",
    87 87 
           "departureHarbour → referential.common.Harbour",
    88 
    -      "landingHarbour → referential.common.Harbour"
    88 
    +      "landingHarbour → referential.common.Harbour",
    89 
    +      "tripType → referential.ll.common.TripType"
    89 90 
         ],
    90 91 
         "children": [
    91 92 
           "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 @@
    29 29 
             "dataLlCommonTripGroupByVessel → MANY → data.ll.common.TripGroupByVessel",
    30 30 
             "dataLlCommonTripGroupByDepartureHarbour → MANY → data.ll.common.TripGroupByDepartureHarbour",
    31 31 
             "dataLlCommonTripGroupByLandingHarbour → MANY → data.ll.common.TripGroupByLandingHarbour",
    32 
    +        "dataLlCommonTripGroupByTripType → MANY → data.ll.common.TripGroupByTripType",
    32 33 
             "dataLlCommonTrip → MANY → data.ll.common.Trip",
    33 34 
             "referentialCommon → ONE → referential.common.ReferentialPackage",
    34 35 
             "referentialLlCommon → ONE → referential.ll.common.ReferentialPackage",
    ... ... @@ -627,6 +628,17 @@
    627 628 
             "children → MANY → data.ll.common.Trip"
    628 629 
           ]
    629 630 
         },
    631 
    +    {
    632 
    +      "parentClassNames": [
    633 
    +        "Root"
    634 
    +      ],
    635 
    +      "className": "data.ll.common.TripGroupByTripType",
    636 
    +      "type": "data.ll.common.TripGroupByTripType",
    637 
    +      "nodeType": "RootOpenFilter",
    638 
    +      "children": [
    639 
    +        "children → MANY → data.ll.common.Trip"
    640 
    +      ]
    641 
    +    },
    630 642 
         {
    631 643 
           "parentClassNames": [
    632 644 
             "Root",
    ... ... @@ -641,7 +653,8 @@
    641 653 
             "data.ll.common.TripGroupByLogbookDataEntryOperator",
    642 654 
             "data.ll.common.TripGroupByVessel",
    643 655 
             "data.ll.common.TripGroupByDepartureHarbour",
    644 
    -        "data.ll.common.TripGroupByLandingHarbour"
    656 
    +        "data.ll.common.TripGroupByLandingHarbour",
    657 
    +        "data.ll.common.TripGroupByTripType"
    645 658 
           ],
    646 659 
           "className": "data.ll.common.Trip",
    647 660 
           "type": "data.ll.common.Trip",

  • model/src/main/resources/META-INF/navigation/Observe-tree-selection-model.json
    ... ... @@ -29,6 +29,7 @@
    29 29 
             "dataLlCommonTripGroupByVessel → MANY → data.ll.common.TripGroupByVessel",
    30 30 
             "dataLlCommonTripGroupByDepartureHarbour → MANY → data.ll.common.TripGroupByDepartureHarbour",
    31 31 
             "dataLlCommonTripGroupByLandingHarbour → MANY → data.ll.common.TripGroupByLandingHarbour",
    32 
    +        "dataLlCommonTripGroupByTripType → MANY → data.ll.common.TripGroupByTripType",
    32 33 
             "dataLlCommonTrip → MANY → data.ll.common.Trip",
    33 34 
             "referentialCommon → ONE → referential.common.ReferentialPackage",
    34 35 
             "referentialLlCommon → ONE → referential.ll.common.ReferentialPackage",
    ... ... @@ -325,6 +326,17 @@
    325 326 
             "children → MANY → data.ll.common.Trip"
    326 327 
           ]
    327 328 
         },
    329 
    +    {
    330 
    +      "parentClassNames": [
    331 
    +        "Root"
    332 
    +      ],
    333 
    +      "className": "data.ll.common.TripGroupByTripType",
    334 
    +      "type": "data.ll.common.TripGroupByTripType",
    335 
    +      "nodeType": "RootOpenFilter",
    336 
    +      "children": [
    337 
    +        "children → MANY → data.ll.common.Trip"
    338 
    +      ]
    339 
    +    },
    328 340 
         {
    329 341 
           "parentClassNames": [
    330 342 
             "Root",
    ... ... @@ -339,7 +351,8 @@
    339 351 
             "data.ll.common.TripGroupByLogbookDataEntryOperator",
    340 352 
             "data.ll.common.TripGroupByVessel",
    341 353 
             "data.ll.common.TripGroupByDepartureHarbour",
    342 
    -        "data.ll.common.TripGroupByLandingHarbour"
    354 
    +        "data.ll.common.TripGroupByLandingHarbour",
    355 
    +        "data.ll.common.TripGroupByTripType"
    343 356 
           ],
    344 357 
           "className": "data.ll.common.Trip",
    345 358 
           "type": "data.ll.common.Trip",

  • model/src/test/resources/fixtures/model.properties
    ... ... @@ -22,6 +22,6 @@
    22 22 
     Metamodel.count.root=11
    23 23 
     Metamodel.count.nodes=141
    24 24 
     Metamodel.id.count.nodes=20
    25 
    -Metamodel.tree.selection.count.nodes=127
    26 
    -Metamodel.tree.navigation.count.nodes=177
    25 
    +Metamodel.tree.selection.count.nodes=128
    26 
    +Metamodel.tree.navigation.count.nodes=178
    27 27 
     Metamodel.parent.count=62

    • —
    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.