November 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803
by Tony CHEMIT (＠tchemit) 13 Nov '23

13 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc95c50b by Tony Chemit at 2023-11-13T12:19:19+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 2 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -539,7 +539,7 @@ public class ImportReferentialContext { } public VesselActivity getVesselActivity(String code) { - String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(code); + String observeVesselActivityCode = VesselActivityInterceptor.getObserveCode(code); VesselActivity result = vesselActivity.get(observeVesselActivityCode); return Objects.requireNonNull(result, String.format("Can't find vessel activity wth code: %s", code)); } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java ===================================== @@ -122,14 +122,32 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi } } + /** + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2803">2803</a> + * + * @param code the avdth code + * @return the observe code + */ + public static String getObserveCode(String code) { + String realCode = CODE_MAPPING.get(code); + if (realCode == null) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2803 + int codeAsInteger = Integer.parseInt(code); + if (codeAsInteger >= 52) { + realCode = code; + } + } + return Objects.requireNonNull(realCode, String.format("Can't find vessel activity wth code: %s", code)); + } + public VesselActivityInterceptor(AvdthReferentialImportContext context) { super(context, VesselActivity.SPI); } @Override protected VesselActivity read(Map<String, VesselActivity> existingIndex, String code) { - String realCode = CODE_MAPPING.get(code); - VesselActivity entity = super.read(existingIndex, Objects.requireNonNull(realCode)); + String realCode = getObserveCode(code); + VesselActivity entity = super.read(existingIndex, realCode); entity.setCode(code); return entity; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc95c50b12f9c4532d3d44062… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc95c50b12f9c4532d3d44062… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur de migration sur bases AZTI locales - Closes #2800
by Tony CHEMIT (＠tchemit) 13 Nov '23

13 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf41e7c3 by Tony Chemit at 2023-11-13T11:09:58+01:00 Erreur de migration sur bases AZTI locales - Closes #2800 - - - - - 4 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_22-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_72-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_finalize-common.sql Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java ===================================== @@ -302,6 +302,10 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe executor.addScript("09", "adapt_table-common_vessel-add-fields"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2646 executor.addScript("10", "adapt_table-common_vessel-rename-field"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2800 + addCountries(executor); + } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2659 executor.addScript("11", "adapt_table-common_fpazone-add-fields"); if (withIds) { @@ -367,6 +371,22 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe } } + private void addCountries(MigrationVersionResourceExecutor executor) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT topiaId FROM common.Country", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + if (!existingCodes.contains("fr.ird.referential.common.Country#1239832675593#0.24921769452411147")) { + executor.addScript("10_2", "add_referential_common_Country_22"); + newCodes.add("22"); + } + if (!existingCodes.contains("fr.ird.referential.common.Country#1464000000000#0.00072")) { + executor.addScript("10_2", "add_referential_common_Country_72"); + newCodes.add("72"); + } + if (!newCodes.isEmpty()) { + executor.addScript("10_2", "add_referential_common_Country_finalize"); + } + } + private Map<String, List<WellPlanStructure>> splitByTrip(List<WellPlanStructure> existingWellPlan) { String tripId = null; List<WellPlanStructure> forTrip = null; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_22-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +INSERT INTO common.country (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1239832675593#0.24921769452411147', 22, '2009-04-15 00:00:00.014000', '2020-03-06 16:01:25.630000', '22', null, null, false, 1, 'Mauritius', 'Maurice', 'Mauricio', null, null, null, null, null, 'MU', 'MUS'); \ No newline at end of file ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_72-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +INSERT INTO common.country (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1464000000000#0.00072', 3, '2018-06-13 18:31:03.000000', '2020-03-06 16:21:07.403000', '72', null, null, false, 1, 'Namibia', 'Namibie', 'Namibia', null, null, null, null, null, 'NA', 'NAM'); \ No newline at end of file ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.Country'; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf41e7c3772e26fcdd2184dae… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf41e7c3772e26fcdd2184dae… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 13 Nov '23

13 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 489f0113 by Tony Chemit at 2023-11-13T10:09:00+01:00 update pom - - - - - 1aca8fce by Tony Chemit at 2023-11-13T10:27:06+01:00 Erreur migration 9.1 vers 9.2 de la base centrale AZTI - Closes #2801 - - - - - 2 changed files: - core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - pom.xml Changes: ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -23,30 +23,50 @@ INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'); -- add characteristic (4, 5, 15 and 27) to gear 2 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 3 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 4 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 5 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); --- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 6 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.45</version> + <version>2023.47</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -547,7 +547,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.10.0</version> + <version>${lib.version.commons-text}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad7… You're receiving this email because of your account on gitlab.com.

1 0