[Git][ultreiaio/ird-observe][develop] 6 commits: Add speciesList by migration

11 Sep 2024


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


Commits:
33c0b05a by Tony Chemit at 2024-09-11T17:52:04+02:00
Add speciesList by migration

- - - - -
1354fcc4 by Tony Chemit at 2024-09-11T17:52:04+02:00
Update test fixtures

- - - - -
2828d7e0 by Tony Chemit at 2024-09-11T17:52:04+02:00
Review TripConsolidateRequest to use only speciesList id

- - - - -
dd7e205c by Tony Chemit at 2024-09-11T17:52:04+02:00
Replace client configuration option by a simple id of the dedicated speciesList and adapt consolidation action

- - - - -
3f8850f1 by Tony Chemit at 2024-09-11T17:52:04+02:00
Add config for consolidate action on speciesList

- - - - -
0c3b23dc by Tony Chemit at 2024-09-11T17:57:56+02:00
Merge branch 'feature/feature/issue-2931' into develop
Ajouter une liste d'espèce dédiée à la consolidation et l'utiliser dans l'assistant de consolidation - Closes #2931

- - - - -


18 changed files:

- client/configuration/src/main/config/Client.ini
- client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java
- client/datasource/actions/src/main/i18n/getters/jaxx.getter
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jaxx
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jcss
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java
- core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java
- core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java
- core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java
- + core/persistence/migration/src/main/resources/db/migration/v9/9.4/01_issue-2931-common.sql
- core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties
- core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataServiceFixtures.java
- core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-default.json
- core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-xwork2.json
- core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/ConsolidateDataService.properties
- model/src/main/resources/fixtures/global.properties


Changes:

=====================================
client/configuration/src/main/config/Client.ini
=====================================
@@ -453,8 +453,8 @@ defaultValue = false
 [option consolidationSpeciesListForLogbookSampleActivityWeightedWeight]
 description = observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight
 key = instance.consolidation.speciesListForLogbookSampleActivityWeightedWeight
-type = String[]
-defaultValue = fr.ird.referential.common.Species#1239832685474#0.8943253454598569,fr.ird.referential.common.Species#1239832685474#0.975344121171992,fr.ird.referential.common.Species#1239832685475#0.13349466123905152,fr.ird.referential.common.Species#1239832685476#0.5618871286604711,fr.ird.referential.common.Species#1239832685477#0.8024257002747615,fr.ird.referential.common.Species#1239832685477#0.3846921632590058,fr.ird.referential.common.Species#1441287921299#0.016754076421811148,fr.ird.referential.common.Species#1433499265113#0.891799515346065,fr.ird.referential.common.Species#1239832685477#0.2673009297087321,fr.ird.referential.common.Species#1239832685478#0.7676744877900202,fr.ird.referential.common.Species#1239832685477#0.5989181185528589,fr.ird.referential.common.Species#1239832685476#0.36339915670317835
+type = String
+defaultValue = fr.ird.referential.common.SpeciesList#1464000000000#100
 
 [option sizeMeasureTypeSeineObservationTargetSampleId]
 description = observe.config.sizeMeasureType.seine.observation.targetSample


=====================================
client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java
=====================================
@@ -273,11 +273,10 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext
         helper.addOption(ClientConfigOption.VALIDATION_USE_DISABLED_REFERENTIAL);
         helper.addOption(ClientConfigOption.CONSOLIDATION_FAIL_IF_LENGTH_WEIGHT_PARAMETER_NOT_FOUND);
         helper.addOption(ClientConfigOption.CONSOLIDATION_FAIL_IF_LENGTH_LENGTH_PARAMETER_NOT_FOUND);
-        //FIXME Re-add this when this option will be a reference to a SpeciesList
         // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2931
-//        if (dataSource != null && dataSource.isOpen()) {
-//            helper.addOption(ClientConfigOption.CONSOLIDATION_SPECIES_LIST_FOR_LOGBOOK_SAMPLE_ACTIVITY_WEIGHTED_WEIGHT);
-//        }
+        if (dataSource != null && dataSource.isOpen()) {
+            helper.addSpeciesListOption(ClientConfigOption.CONSOLIDATION_SPECIES_LIST_FOR_LOGBOOK_SAMPLE_ACTIVITY_WEIGHTED_WEIGHT);
+        }
 
     }
 


=====================================
client/datasource/actions/src/main/i18n/getters/jaxx.getter
=====================================
@@ -4,6 +4,7 @@ observe.Common.global.progression.description
 observe.Common.step.description
 observe.config.consolidation.failIfLengthLengthParameterNotFound
 observe.config.consolidation.failIfLengthWeightParameterNotFound
+observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight
 observe.config.ui.seineBycatchObservedSystem.description
 observe.config.validation.lengthWeightEnable
 observe.config.validation.speedEnable


=====================================
client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jaxx
=====================================
@@ -22,7 +22,9 @@
   <import>
     fr.ird.observe.client.datasource.actions.AdminUIModel
     fr.ird.observe.client.datasource.actions.consolidate.actions.SelectConsolidationConfigFlag
+    fr.ird.observe.dto.referential.common.SpeciesListReference
 
+    io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox
     java.io.File
 
     static io.ultreia.java4all.i18n.I18n.t
@@ -42,7 +44,7 @@ public void destroy() {
   </script>
 
   <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'>
-    <Table id="consolidateDataConfig" constraints='BorderLayout.NORTH'>
+    <Table id="consolidateDataConfig" constraints='BorderLayout.NORTH' beanScope="consolidateModel">
 
       <row>
         <cell anchor="west">
@@ -62,10 +64,10 @@ public void destroy() {
       </row>
       <row>
         <cell anchor="west">
-          <JLabel id='consolidationSpeciesListForLogbookSampleActivityWeightedWeightLabel' styleClass="skipI18n"/>
+          <JLabel id='consolidationSpeciesListForLogbookSampleActivityWeightedWeightLabel'/>
         </cell>
         <cell weightx='1' fill="horizontal">
-          <JLabel id='consolidationSpeciesListForLogbookSampleActivityWeightedWeight' styleClass="skipI18n"/>
+          <FilterableComboBox id='speciesListForLogbookSampleActivityWeightedWeight' genericType='SpeciesListReference'/>
         </cell>
       </row>
     </Table>


=====================================
client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jcss
=====================================
@@ -40,6 +40,13 @@
   selected:{consolidateModel.isConsolidationFailIfLengthLengthParameterNotFound()};
 }
 
+#consolidationSpeciesListForLogbookSampleActivityWeightedWeightLabel {
+   text:"observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight";
+}
+
+#speciesListForLogbookSampleActivityWeightedWeight {
+   selectedItem:{consolidateModel.getSpeciesListForLogbookSampleActivityWeightedWeight()};
+}
 
 #consolidationReportConfig {
   border:{new TitledBorder(t("observe.ui.datasource.editor.actions.consolidate.config.report") + "     ")};


=====================================
client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java
=====================================
@@ -26,11 +26,11 @@ import fr.ird.observe.client.datasource.actions.AdminStep;
 import fr.ird.observe.client.datasource.actions.AdminUIModel;
 import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
 import fr.ird.observe.client.datasource.editor.api.wizard.connexion.DataSourceSelectorModel;
+import fr.ird.observe.dto.referential.common.SpeciesListReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
-import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -53,8 +53,10 @@ public class ConsolidateModel extends AdminActionModel {
     private ObserveSwingDataSource source;
     private boolean consolidationFailIfLengthWeightParameterNotFound;
     private boolean consolidationFailIfLengthLengthParameterNotFound;
-    private List<String> consolidationSpeciesListForLogbookSampleActivityWeightedWeight;
+    private String consolidationSpeciesListForLogbookSampleActivityWeightedWeight;
+    private SpeciesListReference speciesListForLogbookSampleActivityWeightedWeight;
     private boolean skipForReport;
+
     public ConsolidateModel() {
         super(AdminStep.CONSOLIDATE);
         this.alreadyDoneTripIds = new TreeSet<>();
@@ -88,7 +90,7 @@ public class ConsolidateModel extends AdminActionModel {
 
         setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound());
         setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound());
-        setConsolidationSpeciesListForLogbookSampleActivityWeightedWeight(getClientConfig().getConsolidationSpeciesListForLogbookSampleActivityWeightedWeightList());
+        setConsolidationSpeciesListForLogbookSampleActivityWeightedWeight(getClientConfig().getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight());
     }
 
     @Override
@@ -96,6 +98,11 @@ public class ConsolidateModel extends AdminActionModel {
         return uiModel.validate(AdminStep.SELECT_DATA) && uiModel.getStepState(step) == WizardState.SUCCESSED;
     }
 
+    @Override
+    public boolean validateConfig(AdminUIModel uiModel) {
+        return super.validateConfig(uiModel) && getSpeciesListForLogbookSampleActivityWeightedWeight() != null;
+    }
+
     public boolean checkIfTripAlreadyProcessed(String tripId) {
         return alreadyDoneTripIds.contains(tripId);
     }
@@ -124,16 +131,27 @@ public class ConsolidateModel extends AdminActionModel {
         firePropertyChange("consolidationFailIfLengthLengthParameterNotFound", oldValue, consolidationFailIfLengthLengthParameterNotFound);
     }
 
-    public List<String> getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight() {
+    public String getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight() {
         return consolidationSpeciesListForLogbookSampleActivityWeightedWeight;
     }
 
-    public void setConsolidationSpeciesListForLogbookSampleActivityWeightedWeight(List<String> consolidationSpeciesListForLogbookSampleActivityWeightedWeight) {
-        List<String> oldValue = this.consolidationSpeciesListForLogbookSampleActivityWeightedWeight;
+    public void setConsolidationSpeciesListForLogbookSampleActivityWeightedWeight(String consolidationSpeciesListForLogbookSampleActivityWeightedWeight) {
+        String oldValue = this.consolidationSpeciesListForLogbookSampleActivityWeightedWeight;
         this.consolidationSpeciesListForLogbookSampleActivityWeightedWeight = consolidationSpeciesListForLogbookSampleActivityWeightedWeight;
         firePropertyChange("consolidationSpeciesListForLogbookSampleActivityWeightedWeight", oldValue, consolidationSpeciesListForLogbookSampleActivityWeightedWeight);
     }
 
+    public SpeciesListReference getSpeciesListForLogbookSampleActivityWeightedWeight() {
+        return speciesListForLogbookSampleActivityWeightedWeight;
+    }
+
+    public void setSpeciesListForLogbookSampleActivityWeightedWeight(SpeciesListReference speciesListForLogbookSampleActivityWeightedWeight) {
+        SpeciesListReference oldValue = this.speciesListForLogbookSampleActivityWeightedWeight;
+        this.speciesListForLogbookSampleActivityWeightedWeight = speciesListForLogbookSampleActivityWeightedWeight;
+        setConsolidationSpeciesListForLogbookSampleActivityWeightedWeight(speciesListForLogbookSampleActivityWeightedWeight == null ? null : speciesListForLogbookSampleActivityWeightedWeight.getId());
+        firePropertyChange("speciesListForLogbookSampleActivityWeightedWeight", oldValue, speciesListForLogbookSampleActivityWeightedWeight);
+    }
+
     public boolean isSkipForReport() {
         return skipForReport;
     }


=====================================
client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java
=====================================
@@ -24,9 +24,20 @@ package fr.ird.observe.client.datasource.actions.consolidate;
 import fr.ird.observe.client.datasource.actions.AdminTabUIHandler;
 import fr.ird.observe.client.datasource.actions.config.ConfigUI;
 import fr.ird.observe.client.datasource.actions.consolidate.actions.SelectConsolidationConfigFlag;
+import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
+import fr.ird.observe.client.datasource.editor.api.wizard.connexion.DataSourceSelectorModel;
 import fr.ird.observe.client.util.UIHelper;
+import fr.ird.observe.client.util.init.UIInitHelper;
+import fr.ird.observe.dto.referential.common.SpeciesListReference;
+import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.nuiton.jaxx.runtime.spi.UIHandler;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Objects;
+
 import static io.ultreia.java4all.i18n.I18n.t;
 
 /**
@@ -34,6 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.t;
  * @since 1.5
  */
 public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> implements UIHandler<ConsolidateUI> {
+    private static final Logger log = LogManager.getLogger(ConsolidateUIHandler.class);
 
     @Override
     public void afterInit(ConsolidateUI ui) {
@@ -49,7 +61,34 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple
         ConsolidateConfigUI extraConfig = new ConsolidateConfigUI(UIHelper.initialContext(configUI, this));
         SelectConsolidationConfigFlag.init(extraConfig, extraConfig.getConsolidationFailIfLengthWeightParameterNotFound(), new SelectConsolidationConfigFlag("consolidationFailIfLengthWeightParameterNotFound", ConsolidateModel::isConsolidationFailIfLengthWeightParameterNotFound, ConsolidateModel::setConsolidationFailIfLengthWeightParameterNotFound, 5));
         SelectConsolidationConfigFlag.init(extraConfig, extraConfig.getConsolidationFailIfLengthLengthParameterNotFound(), new SelectConsolidationConfigFlag("consolidationFailIfLengthLengthParameterNotFound", ConsolidateModel::isConsolidationFailIfLengthLengthParameterNotFound, ConsolidateModel::setConsolidationFailIfLengthLengthParameterNotFound, 6));
-        extraConfig.getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight().setText("<html><body><b>TODO</b></body></html>");
+        getModel().getConfigModel().getLeftSourceModel().addPropertyChangeListener(DataSourceSelectorModel.VALID_PROPERTY_NAME, evt -> onDataSourceValidChanged(extraConfig, (boolean) evt.getNewValue()));
+        FilterableComboBox<SpeciesListReference> editor = extraConfig.getSpeciesListForLogbookSampleActivityWeightedWeight();
+        UIInitHelper.init(editor);
+        editor.init(getDecoratorService().getDecoratorByType(SpeciesListReference.class), Collections.emptyList());
         configUI.getExtraConfig().add(extraConfig);
     }
+
+    private void onDataSourceValidChanged(ConsolidateConfigUI extraConfig, boolean dataSourceValid) {
+        log.info("Data source valid: {}", dataSourceValid);
+        FilterableComboBox<SpeciesListReference> editor = extraConfig.getSpeciesListForLogbookSampleActivityWeightedWeight();
+        if (dataSourceValid) {
+            try (ObserveSwingDataSource dataSource = getModel().getConfigModel().getLeftSourceModel().getSafeSource(true)) {
+                ArrayList<SpeciesListReference> data = dataSource.getReferentialService().getReferenceSet(SpeciesListReference.class, null).toArrayList();
+                String speciesListId = getModel().getConsolidateModel().getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight();
+                if (speciesListId == null) {
+                    speciesListId = getClientConfig().getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight();
+                    getModel().getConsolidateModel().setConsolidationSpeciesListForLogbookSampleActivityWeightedWeight(speciesListId);
+                }
+                log.info("Loading speciesList {}", speciesListId);
+                String finalSpeciesListId = speciesListId;
+                SpeciesListReference speciesListReference = data.stream().filter(sl -> Objects.equals(sl.getId(), finalSpeciesListId)).findFirst().orElse(null);
+                log.info("Found speciesList {}", speciesListReference);
+                editor.setData(data);
+                getModel().getConsolidateModel().setSpeciesListForLogbookSampleActivityWeightedWeight(speciesListReference);
+            }
+        } else {
+            editor.setData(Collections.emptyList());
+        }
+        editor.setEnabled(dataSourceValid);
+    }
 }


=====================================
client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java
=====================================
@@ -169,7 +169,7 @@ public class Start extends AdminTabUIActionSupport<ConsolidateUI> {
         request.setTripId(tripId);
         request.setFailIfLengthWeightParameterNotFound(stepModel.isConsolidationFailIfLengthWeightParameterNotFound());
         request.setFailIfLengthLengthParameterNotFound(stepModel.isConsolidationFailIfLengthLengthParameterNotFound());
-        request.setSpeciesListForLogbookSampleActivityWeightedWeight(Set.copyOf(stepModel.getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight()));
+        request.setSpeciesListForLogbookSampleActivityWeightedWeight(stepModel.getConsolidationSpeciesListForLogbookSampleActivityWeightedWeight());
 
         TripConsolidateResult result = consolidateDataService.consolidateTrip(simplifiedObjectTypeSpecializedRules, request);
         if (result != null) {


=====================================
core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java
=====================================
@@ -25,8 +25,6 @@ package fr.ird.observe.consolidation.data.ps.common;
 
 import io.ultreia.java4all.util.json.JsonAware;
 
-import java.util.Set;
-
 /**
  * Request to consolidate a trip.
  * <p>
@@ -49,7 +47,7 @@ public class TripConsolidateRequest implements JsonAware {
      */
     private boolean failIfLengthLengthParameterNotFound;
 
-    private Set<String> speciesListForLogbookSampleActivityWeightedWeight;
+    private String speciesListForLogbookSampleActivityWeightedWeight;
 
     public boolean isFailIfLengthWeightParameterNotFound() {
         return failIfLengthWeightParameterNotFound;
@@ -75,11 +73,11 @@ public class TripConsolidateRequest implements JsonAware {
         this.failIfLengthLengthParameterNotFound = failIfLengthLengthParameterNotFound;
     }
 
-    public Set<String> getSpeciesListForLogbookSampleActivityWeightedWeight() {
+    public String getSpeciesListForLogbookSampleActivityWeightedWeight() {
         return speciesListForLogbookSampleActivityWeightedWeight;
     }
 
-    public void setSpeciesListForLogbookSampleActivityWeightedWeight(Set<String> speciesListForLogbookSampleActivityWeightedWeight) {
+    public void setSpeciesListForLogbookSampleActivityWeightedWeight(String speciesListForLogbookSampleActivityWeightedWeight) {
         this.speciesListForLogbookSampleActivityWeightedWeight = speciesListForLogbookSampleActivityWeightedWeight;
     }
 }


=====================================
core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java
=====================================
@@ -36,6 +36,8 @@ import fr.ird.observe.entities.data.ps.localmarket.Batch;
 import fr.ird.observe.entities.data.ps.logbook.SampleActivity;
 import fr.ird.observe.entities.referential.common.LengthLengthParameterCache;
 import fr.ird.observe.entities.referential.common.LengthWeightParameterCache;
+import fr.ird.observe.entities.referential.common.Species;
+import fr.ird.observe.entities.referential.common.SpeciesList;
 import fr.ird.observe.spi.consolidation.ToolkitIdModificationsToSql;
 import fr.ird.observe.spi.service.ServiceContext;
 import io.ultreia.java4all.decoration.Decorator;
@@ -49,6 +51,7 @@ import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Created on 17/01/2022.
@@ -88,7 +91,10 @@ public class TripConsolidateEngine {
 
         Trip trip = Trip.loadEntity(context, tripId);
 
-        Set<ToolkitIdModifications> logbookSampleActivityResults = consolidateLogbookSampleActivities(trip, request.getSpeciesListForLogbookSampleActivityWeightedWeight());
+        String speciesListId = request.getSpeciesListForLogbookSampleActivityWeightedWeight();
+        SpeciesList speciesList = SpeciesList.loadEntity(context, speciesListId);
+        Set<String> speciesListForLogbookSampleActivityWeightedWeight = speciesList.getSpecies().stream().map(Species ::getId).collect(Collectors.toSet());
+        Set<ToolkitIdModifications> logbookSampleActivityResults = consolidateLogbookSampleActivities(trip, speciesListForLogbookSampleActivityWeightedWeight);
         Set<ToolkitIdModifications> localmarketBatchResults = consolidateLocalmarketBatches(trip, failIfLengthWeightParameterNotFound);
 
         Set<fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult> observationActivityConsolidateResults = consolidateObservationActivities(trip, failIfLengthWeightParameterNotFound, failIfLengthLengthParameterNotFound);


=====================================
core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java
=====================================
@@ -34,6 +34,9 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * Created at 11/09/2024.
@@ -55,6 +58,8 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe
         if (withIds) {
             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2914
             issue2914(executor);
+            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2931
+            executor.addScript("01", "issue-2931");
         }
     }
 


=====================================
core/persistence/migration/src/main/resources/db/migration/v9/9.4/01_issue-2931-common.sql
=====================================
@@ -0,0 +1,36 @@
+---
+-- #%L
+-- ObServe Core :: Persistence :: Migration
+-- %%
+-- Copyright (C) 2008 - 2023 IRD, Ultreia.io
+-- %%
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public
+-- License along with this program.  If not, see
+-- <http://www.gnu.org/licenses/gpl-3.0.html>.
+-- #L%
+---
+-- add a new species list PS - Catch
+INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100', 0, ${CURRENT_DATE}, '100', 1, null, 'Consolidation (PS Logbook SampleActivity.weightedWeight)', 'Consolidation (PS Logbook SampleActivity.weightedWeight)', 'Consolidation (PS Logbook SampleActivity.weightedWeight) TODO', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null);
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.5618871286604711', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.8024257002747615', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.3846921632590058', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1441287921299#0.016754076421811148', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1433499265113#0.891799515346065', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.2673009297087321', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685478#0.7676744877900202', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.5989181185528589', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.36339915670317835', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100');
+UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.common.SpeciesList';
\ No newline at end of file


=====================================
core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties
=====================================
@@ -40,7 +40,7 @@ common.sizeMeasureType=21
 common.species=315
 common.speciesGroup=12
 common.speciesGroupReleaseMode=10
-common.speciesList=10
+common.speciesList=11
 common.vessel=1250
 common.vesselSizeCategory=13
 common.vesselType=18
@@ -118,4 +118,4 @@ common.gear_allowedGearCharacteristic=108
 common.gear_defaultGearCharacteristic=45
 common.species_ocean=553
 common.speciesGroup_speciesGroupReleaseMode=19
-common.speciesList_species=965
+common.speciesList_species=977


=====================================
core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataServiceFixtures.java
=====================================
@@ -42,7 +42,6 @@ import io.ultreia.java4all.util.Dates;
 import org.junit.Assert;
 
 import java.net.URL;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -206,7 +205,7 @@ public class ConsolidateDataServiceFixtures extends GeneratedConsolidateDataServ
         TripConsolidateRequest request = new TripConsolidateRequest();
         request.setTripId(getProperty("consolidateTrip.id"));
         request.setFailIfLengthWeightParameterNotFound(false);
-        request.setSpeciesListForLogbookSampleActivityWeightedWeight(Set.copyOf(Arrays.asList(getArrayProperty("consolidateTrip.speciesListForLogbookSampleActivityWeightedWeight"))));
+        request.setSpeciesListForLogbookSampleActivityWeightedWeight(getProperty("consolidateTrip.speciesListForLogbookSampleActivityWeightedWeight"));
 
         TripConsolidateResult actual = service.consolidateTrip(simplifiedObjectTypeSpecializedRules, request);
         Assert.assertNotNull(actual);


=====================================
core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-default.json
=====================================
@@ -43661,6 +43661,32 @@
         }
       ]
     },
+    {
+      "datum": {
+        "text": "100##Consolidation (PS Logbook SampleActivity.weightedWeight)",
+        "type": "fr.ird.observe.dto.referential.common.SpeciesListDto",
+        "id": "fr.ird.referential.common.SpeciesList#1464000000000#100",
+        "topiaVersion": 0,
+        "lastUpdateDate": "2024-09-11T00:00:00.000Z"
+      },
+      "messages": [
+        {
+          "fieldName": "label1",
+          "scope": "WARNING",
+          "message": "Le libellé anglais n'est pas traduit."
+        },
+        {
+          "fieldName": "label3",
+          "scope": "WARNING",
+          "message": "Le libellé espagnol n'est pas traduit."
+        },
+        {
+          "fieldName": "uri",
+          "scope": "WARNING",
+          "message": "Le champ n'est pas renseigné."
+        }
+      ]
+    },
     {
       "datum": {
         "text": "BENIGUET##25",


=====================================
core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-xwork2.json
=====================================
@@ -43661,6 +43661,32 @@
         }
       ]
     },
+    {
+      "datum": {
+        "text": "100##Consolidation (PS Logbook SampleActivity.weightedWeight)",
+        "type": "fr.ird.observe.dto.referential.common.SpeciesListDto",
+        "id": "fr.ird.referential.common.SpeciesList#1464000000000#100",
+        "topiaVersion": 0,
+        "lastUpdateDate": "2024-09-11T00:00:00.000Z"
+      },
+      "messages": [
+        {
+          "fieldName": "label1",
+          "scope": "WARNING",
+          "message": "Le libellé anglais n'est pas traduit."
+        },
+        {
+          "fieldName": "label3",
+          "scope": "WARNING",
+          "message": "Le libellé espagnol n'est pas traduit."
+        },
+        {
+          "fieldName": "uri",
+          "scope": "WARNING",
+          "message": "Le champ n'est pas renseigné."
+        }
+      ]
+    },
     {
       "datum": {
         "text": "BENIGUET##25",


=====================================
core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/ConsolidateDataService.properties
=====================================
@@ -29,4 +29,4 @@ consolidateTrip.logbookSampleActivity.count=1
 consolidateTrip.observationsActivityResult.count=4
 consolidateTrip.observationsActivityResult.withModifications.count=4
 consolidateTrip.observationsActivityResult.withWarnings.count=4
-consolidateTrip.speciesListForLogbookSampleActivityWeightedWeight=fr.ird.referential.common.Species#1239832685474#0.8943253454598569^fr.ird.referential.common.Species#1239832685474#0.975344121171992^fr.ird.referential.common.Species#1239832685475#0.13349466123905152^fr.ird.referential.common.Species#1239832685476#0.5618871286604711^fr.ird.referential.common.Species#1239832685477#0.8024257002747615^fr.ird.referential.common.Species#1239832685477#0.3846921632590058^fr.ird.referential.common.Species#1441287921299#0.016754076421811148^fr.ird.referential.common.Species#1433499265113#0.891799515346065^fr.ird.referential.common.Species#1239832685477#0.2673009297087321^fr.ird.referential.common.Species#1239832685478#0.7676744877900202^fr.ird.referential.common.Species#1239832685477#0.5989181185528589^fr.ird.referential.common.Species#1239832685476#0.36339915670317835
+consolidateTrip.speciesListForLogbookSampleActivityWeightedWeight=fr.ird.referential.common.SpeciesList#1464000000000#100


=====================================
model/src/main/resources/fixtures/global.properties
=====================================
@@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68
 ENTITIES_LIMIT_SIZE=100
 # fr.ird.observe.services.service.referential.ReferentialService
 # fr.ird.observe.services.local.service.referential.DifferentialModelTest
-REFERENTIAL_COUNT=4369
+REFERENTIAL_COUNT=4370



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c4bcd8900e7c57597e63e3a0e...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c4bcd8900e7c57597e63e3a0e...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)