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

Commits:

6 changed files:

Changes:

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java
    ... ... @@ -48,7 +48,7 @@ public class LogbookReplicateRequestCallback implements ReplicateRequestCallback
    48 48 
         public boolean accept(ReplicateRequest request) {
    49 49 
             return request.getOldParentId().contains(".Trip#")
    50 50 
                     && request.getNewParentId().contains(".Trip#")
    51 
    -                && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get().getPackageName());
    51 
    +                && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get());
    52 52 
         }
    53 53
    54 54 
         @Override

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java
    ... ... @@ -48,7 +48,7 @@ public class ObservationReplicateRequestCallback implements ReplicateRequestCall
    48 48 
         public boolean accept(ReplicateRequest request) {
    49 49 
             return request.getOldParentId().contains(".Trip#")
    50 50 
                     && request.getNewParentId().contains(".Trip#")
    51 
    -                && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName());
    51 
    +                && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get());
    52 52 
         }
    53 53
    54 54 
         @Override

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java
    ... ... @@ -52,7 +52,7 @@ public class ObservationReplicateRequestCallback implements ReplicateRequestCall
    52 52 
         public boolean accept(ReplicateRequest request) {
    53 53 
             return request.getOldParentId().contains(".Trip#")
    54 54 
                     && request.getNewParentId().contains(".Trip#")
    55 
    -                && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName());
    55 
    +                && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ps.observation.BusinessDataPackage.get());
    56 56 
         }
    57 57
    58 58 
         @Override

  • core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java
    ... ... @@ -302,6 +302,8 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe
    302 302 
             executor.addScript("10", "adapt_table-common_vessel-rename-field");
    303 303 
             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2659
    304 304 
             executor.addScript("11", "adapt_table-common_fpazone-add-fields");
    305 
    +        // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2661
    306 
    +        executor.addScript("12", "fix_ps_localmarket_packaging");
    305 307
    306 308 
         }
    307 309

  • core/persistence/migration/src/main/resources/db/migration/v9/9.1/12_fix_ps_localmarket_packaging-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe Core :: Persistence :: Migration
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +UPDATE ps_localmarket.Packaging SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, batchWeightType = 'fr.ird.referential.ps.localmarket.BatchWeightType#1464000000000#03' WHERE batchWeightType='fr.ird.referential.ps.localmarket.BatchWeightType#1464000000000#01' AND meanWeight IS NULL;
    23 
    +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.ps.localmarket.Packaging';

  • toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java
    ... ... @@ -22,6 +22,8 @@ package fr.ird.observe.datasource.request;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.spi.module.BusinessDataPackage;
    26 
    +
    25 27 
     import java.util.Set;
    26 28 
     import java.util.StringJoiner;
    27 29
    ... ... @@ -79,6 +81,10 @@ public class ReplicateRequest extends SqlServiceRequest {
    79 81 
             return new DeleteRequest(isPostgres(), getDataType(), dataIds.toArray(new String[0]));
    80 82 
         }
    81 83
    84 
    +    public boolean isDataTypeInDtoPackage(BusinessDataPackage dataPackage) {
    85 
    +        return getDataType().replace("entities.", "dto.").startsWith(dataPackage.getPackageName());
    86 
    +    }
    87 
    +
    82 88 
         @Override
    83 89 
         public String toString() {
    84 90 
             return new StringJoiner(", ", ReplicateRequest.class.getSimpleName() + "[", "]")

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help