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

[Git][ultreiaio/ird-observe][master-9.0.x] 15 commits: [jgitflow-maven-plugin]updating poms for 9.0.19-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch master-9.0.x at ultreiaio / ird-observe Commits: 0918f13d by Tony Chemit at 2022-11-23T12:34:04+01:00 [jgitflow-maven-plugin]updating poms for 9.0.19-SNAPSHOT development[skip ci] - - - - - 4fd1abb4 by Tony Chemit at 2022-11-23T13:11:27+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 0234acab by Tony Chemit at 2022-11-23T13:11:29+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - b2bfa34a by Tony Chemit at 2022-11-23T13:11:32+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - b8954c92 by Tony Chemit at 2022-11-23T15:36:53+01:00 update hibernate - - - - - 416d0b98 by Tony Chemit at 2022-11-23T18:00:08+01:00 update pom - - - - - cb589a5e by Tony Chemit at 2022-11-23T18:00:08+01:00 re-add observe.exe in observe-client assembly to be tested by windows users - - - - - f9d19d1b by Tony Chemit at 2022-11-23T18:20:47+01:00 Remove SampleDto.speciesFate field, never used - - - - - 603e56de by Tony Chemit at 2022-11-23T18:20:47+01:00 Add SampleDto.speciesFateBySpeciesMap field to be loaded only by Form - - - - - eb05f296 by Tony Chemit at 2022-11-23T18:20:47+01:00 Service - Remove TripService.getPsObservationCatchesSpeciesFateBySpeciesId (will use now SampleDto.speciesFateBySpeciesMap) - - - - - aafa5dbe by Tony Chemit at 2022-11-23T18:20:47+01:00 GUI - Use SampleDto.speciesFateBySpeciesMap field instead of calling a specific service (and avoid gson madness) - - - - - 260baa5a by Tony Chemit at 2022-11-23T18:21:10+01:00 Merge branch 'feature/issue_2541' into develop-9.0.x Closes #2541 - - - - - 10841400 by Tony Chemit at 2022-11-23T20:58:15+01:00 Update changelog for v.9.0.19 [skip CI] - - - - - 1331d2d6 by Tony Chemit at 2022-11-23T21:25:04+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.19' with non-snapshot versions[skip ci] - - - - - e87c543e by Tony Chemit at 2022-11-23T22:00:43+01:00 [jgitflow-maven-plugin]merging 'release/9.0.19' into 'master-9.0.x' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - client/runner/src/main/assembly/bin.xml - core/api/dto/pom.xml - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SampleDto.java - core/api/pom.xml - core/api/services/pom.xml - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - core/api/tree/pom.xml - core/api/validation/pom.xml - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-warning-validation.xml - core/persistence/java/pom.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/80397334d47d2e2dad53ec41… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/80397334d47d2e2dad53ec41… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.19' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 1331d2d6 by Tony Chemit at 2022-11-23T21:25:04+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.19' with non-snapshot versions[skip ci] - - - - - e87c543e by Tony Chemit at 2022-11-23T22:00:43+01:00 [jgitflow-maven-plugin]merging 'release/9.0.19' into 'master-9.0.x' - - - - - 262a2bc0 by Tony Chemit at 2022-11-23T22:00:53+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - c3217ea3 by Tony Chemit at 2022-11-23T22:00:55+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - 5c9df4dc by Tony Chemit at 2022-11-23T22:00:58+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/56b566409f1256b162c34102… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/56b566409f1256b162c34102… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] [jgitflow-maven-plugin]updating poms for 9.0.20-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 56b56640 by Tony Chemit at 2022-11-23T21:24:24+01:00 [jgitflow-maven-plugin]updating poms for 9.0.20-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/56b566409f1256b162c341026… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/56b566409f1256b162c341026… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.19
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed new branch release/9.0.19 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.19 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.19 [skip CI]
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f31f1703 by Tony Chemit at 2022-11-23T21:23:33+01:00 Update changelog for v.9.0.19 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,19 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-11-23 12:27. + * Last generated at 2022-11-23 20:56. + +## Version [9.0.19](https://gitlab.com/ultreiaio/ird-observe/-/milestones/249) + +**Closed at 2022-11-23.** + +### Download +* [Client (observe-9.0.19-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.19.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.19-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2541]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2541) **Erreur d'affichage du form PS/Observations/Echantillons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.18](https://gitlab.com/ultreiaio/ird-observe/-/milestones/248) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f31f1703ab920ea1c95df0e89… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f31f1703ab920ea1c95df0e89… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.19 [skip CI]
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 10841400 by Tony Chemit at 2022-11-23T20:58:15+01:00 Update changelog for v.9.0.19 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,19 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-11-23 12:27. + * Last generated at 2022-11-23 20:56. + +## Version [9.0.19](https://gitlab.com/ultreiaio/ird-observe/-/milestones/249) + +**Closed at 2022-11-23.** + +### Download +* [Client (observe-9.0.19-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.19.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.19-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2541]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2541) **Erreur d'affichage du form PS/Observations/Echantillons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.18](https://gitlab.com/ultreiaio/ird-observe/-/milestones/248) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/10841400e42e90ead0e0a0063… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/10841400e42e90ead0e0a0063… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: update hibernate
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f6152db1 by Tony Chemit at 2022-11-23T20:58:34+01:00 update hibernate - - - - - 01831bc7 by Tony Chemit at 2022-11-23T20:58:34+01:00 update pom - - - - - bdce98dd by Tony Chemit at 2022-11-23T20:58:35+01:00 re-add observe.exe in observe-client assembly to be tested by windows users - - - - - 5afc455f by Tony Chemit at 2022-11-23T20:59:13+01:00 Remove SampleDto.speciesFate field, never used - - - - - d8831c8d by Tony Chemit at 2022-11-23T20:59:19+01:00 Add SampleDto.speciesFateBySpeciesMap field to be loaded only by Form - - - - - 8551bc59 by Tony Chemit at 2022-11-23T21:06:59+01:00 Service - Remove TripService.getPsObservationCatchesSpeciesFateBySpeciesId (will use now SampleDto.speciesFateBySpeciesMap) - - - - - 007ee346 by Tony Chemit at 2022-11-23T21:06:59+01:00 GUI - Use SampleDto.speciesFateBySpeciesMap field instead of calling a specific service (and avoid gson madness) - - - - - 6e054a3d by Tony Chemit at 2022-11-23T21:22:37+01:00 Merge branch 'feature/issue_2541_v9.1' into develop Closes #2541 - - - - - 18 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - client/runner/src/main/assembly/bin.xml - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SampleDto.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-warning-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-update.json - core/services/local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java - core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/common/TripService.properties - model/src/main/models/Observe/dto/20-data-ps-observation.model - pom.xml - server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; +import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.dto.referential.ps.common.SpeciesFateReference; import fr.ird.observe.navigation.id.Project; @@ -78,10 +79,15 @@ public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleD @Override public void onAfterInitAddReferentialFilters(ClientConfig clientConfig, Project observeSelectModel, ObserveServicesProvider servicesProvider, ReferencesCache referenceCache) { - speciesFateBySpeciesMap = servicesProvider.getPsCommonTripService().getPsObservationCatchesSpeciesFateBySpeciesId(observeSelectModel.getPs().getObservationSet().getId()); - referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES, ReferencesFilterHelper.<SampleDto, SpeciesReference>newSubList(e -> speciesFateBySpeciesMap.keySet())); + referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES, ReferencesFilterHelper.<SampleDto, SpeciesReference>newSubList(e -> e.getSpeciesFateBySpeciesMap().keySet())); referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES_FATE, ReferencesFilterHelper.<SampleDto, SpeciesFateReference>newSubList( - e -> speciesFateBySpeciesMap.values().stream().flatMap(Set::stream).collect(Collectors.toSet()))); + e -> e.getSpeciesFateBySpeciesMap().values().stream().flatMap(Set::stream).collect(Collectors.toSet()))); + } + + @Override + protected void copyFormToBean(Form<SampleDto> form) { + this.speciesFateBySpeciesMap = form.getObject().getSpeciesFateBySpeciesMap(); + super.copyFormToBean(form); } @Override ===================================== client/runner/src/main/assembly/bin.xml ===================================== @@ -33,7 +33,7 @@ <includes> <include>${applicationJarName}.jar</include>  - + <include>${applicationJarName}.exe</include> </includes> </fileSet> ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SampleDto.java ===================================== @@ -0,0 +1,53 @@ +package fr.ird.observe.dto.data.ps.observation; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2022 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% + */ + +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; + +import java.util.Map; +import java.util.Set; + +/** + * Created on 23/11/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.19 + */ +@GenerateJavaBeanDefinition +public class SampleDto extends GeneratedSampleDto { + + /** + * To get all species fate used per species in Set catches. + * <p> + * Only used when loading form. + */ + private Map<String, Set<String>> speciesFateBySpeciesMap; + + public Map<String, Set<String>> getSpeciesFateBySpeciesMap() { + return speciesFateBySpeciesMap; + } + + public void setSpeciesFateBySpeciesMap(Map<String, Set<String>> speciesFateBySpeciesMap) { + this.speciesFateBySpeciesMap = speciesFateBySpeciesMap; + } +} ===================================== core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java ===================================== @@ -35,8 +35,6 @@ import io.ultreia.java4all.http.spi.Nullable; import io.ultreia.java4all.http.spi.Service; import java.util.List; -import java.util.Map; -import java.util.Set; /** * Created on 26/07/2021. @@ -63,10 +61,6 @@ public interface TripService extends TripAwareService { @MethodCredential(Permission.READ_DATA) boolean isActivityEndOfSearchFound(String routeId); - @Get - @MethodCredential(Permission.READ_DATA) - Map<String, Set<String>> getPsObservationCatchesSpeciesFateBySpeciesId(String setId); - @Get @MethodCredential(Permission.WRITE_DATA) Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, @Nullable FloatingObjectPreset floatingObjectPreset); ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -13331,28 +13331,8 @@ "name": "comment", "comments": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SampleDto", - "scope": "WARNING", - "context": "create", - "fields": [ - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } ] }, @@ -13365,28 +13345,8 @@ "name": "comment", "comments": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SampleDto", - "scope": "WARNING", - "context": "update", - "fields": [ - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } ] }, ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-error-validation.xml ===================================== @@ -35,19 +35,6 @@ <param name="maxLength">8192</param> <message/> </field-validator> - -  - <field-validator type="commentNeeded"> - <param name="propertyNames">speciesFate</param> - <message/> - </field-validator> - </field> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnErrorScope"> - <message/> - </field-validator> </field> </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-warning-validation.xml deleted ===================================== @@ -1,34 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnWarningScope"> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-error-validation.xml ===================================== @@ -35,19 +35,6 @@ <param name="maxLength">8192</param> <message/> </field-validator> - -  - <field-validator type="commentNeeded"> - <param name="propertyNames">speciesFate</param> - <message/> - </field-validator> - </field> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnErrorScope"> - <message/> - </field-validator> </field> </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-warning-validation.xml deleted ===================================== @@ -1,34 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnWarningScope"> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java ===================================== @@ -45,6 +45,7 @@ public class SampleSpi extends GeneratedSampleSpi { SampleDto dto = form.getObject(); // always use the set id, //FIXME See why ? dto.setId(id); + dto.setSpeciesFateBySpeciesMap(getCatchesSpeciesFateBySpeciesId(parent)); return form; } @@ -72,8 +73,16 @@ public class SampleSpi extends GeneratedSampleSpi { .build(entity); } - public Map<String, java.util.Set<String>> getCatchesSpeciesFateBySpeciesId(ServiceContext context, String id) { - Set parent = Set.loadEntity(context, id); + + + protected Sample loadSampleFormEntity(ServiceContext context, Set parent) { + if (parent.isSampleEmpty()) { + return Sample.newEntity(context.now()); + } + return parent.getSample().iterator().next(); + } + + protected Map<String, java.util.Set<String>> getCatchesSpeciesFateBySpeciesId(Set parent) { Map<String, java.util.Set<String>> result = new TreeMap<>(); parent.getCatches().stream().filter(c -> c.getSpeciesFate() != null).forEach(aCatch -> { String speciesId = aCatch.getSpecies().getId(); @@ -82,11 +91,4 @@ public class SampleSpi extends GeneratedSampleSpi { }); return result; } - - protected Sample loadSampleFormEntity(ServiceContext context, Set parent) { - if (parent.isSampleEmpty()) { - return Sample.newEntity(context.now()); - } - return parent.getSample().iterator().next(); - } } ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-create.json ===================================== @@ -2,16 +2,7 @@ "comment": { "errors": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - "speciesFate": { - "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ], - "warnings": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } } \ No newline at end of file ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-update.json ===================================== @@ -2,16 +2,7 @@ "comment": { "errors": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - "speciesFate": { - "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ], - "warnings": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } } \ No newline at end of file ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java ===================================== @@ -38,8 +38,6 @@ import fr.ird.observe.services.service.data.ps.common.TripService; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; -import java.util.Set; /** * Created on 26/07/2021. @@ -89,11 +87,6 @@ public abstract class TripServiceLocalSupport extends ObserveServiceLocal implem return Trip.SPI.isActivityEndOfSearchFound(this, routeId); } - @Override - public Map<String, Set<String>> getPsObservationCatchesSpeciesFateBySpeciesId(String setId) { - return fr.ird.observe.entities.data.ps.observation.Sample.SPI.getCatchesSpeciesFateBySpeciesId(this, setId); - } - @Override public Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, FloatingObjectPreset floatingObjectPreset) { return fr.ird.observe.entities.data.ps.observation.FloatingObject.SPI.preCreate(this, floatingObjectPreset); ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java ===================================== @@ -39,9 +39,7 @@ import fr.ird.observe.services.service.data.EditableServiceFixtures; import fr.ird.observe.services.service.data.RootOpenableServiceFixtures; import org.junit.Assert; -import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; public class TripServiceFixtures extends GeneratedTripServiceFixtures { @@ -68,16 +66,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { // Assert.assertNull(dto.getLastUpdateDate()); // } - - @Override - public void getPsObservationCatchesSpeciesFateBySpeciesId(ObserveServicesProvider servicesProvider, TripService service) { - String setId = getProperty("getPsObservationCatchesSpeciesFateBySpeciesId.setId"); - Map<String, Set<String>> actual = service.getPsObservationCatchesSpeciesFateBySpeciesId(setId); - Assert.assertNotNull(actual); - Assert.assertEquals(getIntegerProperty("getPsObservationCatchesSpeciesFateBySpeciesId.speciesCount"), actual.size()); - Assert.assertEquals(getIntegerProperty("getPsObservationCatchesSpeciesFateBySpeciesId.speciesFateCount"), actual.values().stream().flatMap(Set::stream).collect(Collectors.toSet()).size()); - } - @Override public void getAllTripIds(ObserveServicesProvider servicesProvider, TripService service) { Set<String> actual = service.getAllTripIds(); ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/common/TripService.properties ===================================== @@ -25,7 +25,6 @@ defaultNewParentId=${REFERENTIAL_PS_COMMON_PROGRAM_MOVE} defaultParentId=${REFERENTIAL_PS_COMMON_PROGRAM} defaultProgramId=${REFERENTIAL_PS_COMMON_PROGRAM} defaultRouteId=FIXME -defaultSetId=${PS_OBSERVATION_SET} defaultSpeciesListId=fr.ird.referential.common.SpeciesList#1239832675370#0.1 defaultTripId=${PS_COMMON_TRIP} defaultVesselId=fr.ird.referential.common.Vessel#1239832679425#0.9136908731720471 @@ -44,9 +43,6 @@ getMatchingTripsVesselWithinDateRange.vesselId=${defaultVesselId} getParentBrothers.count=16 getParentBrothers.parentId=${defaultParentId} getParentBrothers.programId=${defaultProgramId} -getPsObservationCatchesSpeciesFateBySpeciesId.setId=${defaultSetId} -getPsObservationCatchesSpeciesFateBySpeciesId.speciesCount=6 -getPsObservationCatchesSpeciesFateBySpeciesId.speciesFateCount=4 getSpeciesByListAndTrip.count=14 getSpeciesByListAndTrip.speciesListId=${defaultSpeciesListId} getSpeciesByListAndTrip.tripId=${defaultTripId} ===================================== model/src/main/models/Observe/dto/20-data-ps-observation.model ===================================== @@ -157,7 +157,6 @@ informationSource {*:0..1} referential.ps.observation.InformationSourceReference data.ps.observation.Sample > data.Container sampleMeasure + {*} data.ps.observation.SampleMeasure -speciesFate {*:*} referential.ps.common.SpeciesFateReference data.ps.observation.SetCatch > data.Container catches {*} data.ps.observation.Catch ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.95</version> + <version>2022.97</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -119,7 +119,7 @@ <lib.version.h2>1.4.196</lib.version.h2>   - <lib.version.hibernate>5.6.12.Final</lib.version.hibernate> + <lib.version.hibernate>5.6.14.Final</lib.version.hibernate>  <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api> <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime> ===================================== server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm ===================================== @@ -16,152 +16,151 @@ # Do not remove the next line, it is used to generate the following actions. # →→→ Generated dynamic mapping -GET /AnonymousService/applySecurity AnonymousServiceRestApi.applySecurity -GET /AnonymousService/checkCanConnect AnonymousServiceRestApi.checkCanConnect -GET /AnonymousService/checkCanConnectOrBeEmpty AnonymousServiceRestApi.checkCanConnectOrBeEmpty -POST /AnonymousService/createEmpty AnonymousServiceRestApi.createEmpty -POST /AnonymousService/createFromDump AnonymousServiceRestApi.createFromDump -POST /AnonymousService/createFromImport AnonymousServiceRestApi.createFromImport -GET /AnonymousService/generateHomeId AnonymousServiceRestApi.generateHomeId -GET /AnonymousService/getAvailableDatabaseNames AnonymousServiceRestApi.getAvailableDatabaseNames -GET /AnonymousService/getModelVersion AnonymousServiceRestApi.getModelVersion -GET /AnonymousService/getServerVersion AnonymousServiceRestApi.getServerVersion -GET /AnonymousService/getUsers AnonymousServiceRestApi.getUsers -GET /AnonymousService/migrateData AnonymousServiceRestApi.migrateData -GET /AnonymousService/open AnonymousServiceRestApi.open -GET /DataSourceService/backup DataSourceServiceRestApi.backup -GET /DataSourceService/close DataSourceServiceRestApi.close -POST /DataSourceService/executeSqlScript DataSourceServiceRestApi.executeSqlScript -GET /DataSourceService/getLastUpdateDate DataSourceServiceRestApi.getLastUpdateDate -GET /DataSourceService/isIdValid DataSourceServiceRestApi.isIdValid -POST /DataSourceService/produceAddSqlScript DataSourceServiceRestApi.produceAddSqlScript -POST /DataSourceService/produceCreateSqlScript DataSourceServiceRestApi.produceCreateSqlScript -POST /DataSourceService/produceDeleteSqlScript DataSourceServiceRestApi.produceDeleteSqlScript -POST /DataSourceService/produceMoveSqlScript DataSourceServiceRestApi.produceMoveSqlScript -POST /DataSourceService/retainExistingIds DataSourceServiceRestApi.retainExistingIds -GET /NavigationService/getGroupByDtoSet NavigationServiceRestApi.getGroupByDtoSet -GET /NavigationService/getNavigation NavigationServiceRestApi.getNavigation -GET /NavigationService/loadNavigationPath NavigationServiceRestApi.loadNavigationPath -GET /NavigationService/loadNavigationRoot NavigationServiceRestApi.loadNavigationRoot -GET /NavigationService/loadSelectionRoot NavigationServiceRestApi.loadSelectionRoot -GET /ReferenceService/createData ReferenceServiceRestApi.createData -GET /ReferenceService/createReferential ReferenceServiceRestApi.createReferential -GET /ReferenceService/loadData ReferenceServiceRestApi.loadData -GET /ReferenceService/loadReferential ReferenceServiceRestApi.loadReferential -POST /ReportService/executeReport ReportServiceRestApi.executeReport -POST /ReportService/populateVariables ReportServiceRestApi.populateVariables -GET /UsageService/countMandatoryData UsageServiceRestApi.countMandatoryData -GET /UsageService/countOptionalData UsageServiceRestApi.countOptionalData -GET /UsageService/countReferential UsageServiceRestApi.countReferential -POST /UsageService/findMandatoryData UsageServiceRestApi.findMandatoryData -POST /UsageService/findOptionalData UsageServiceRestApi.findOptionalData -POST /UsageService/findReferential UsageServiceRestApi.findReferential -POST /ValidateService/validateData ValidateServiceRestApi.validateData -POST /ValidateService/validateReferential ValidateServiceRestApi.validateReferential -POST /api/DataEntityService/create api.DataEntityServiceRestApi.create -DELETE /api/DataEntityService/delete api.DataEntityServiceRestApi.delete -GET /api/DataEntityService/generateId api.DataEntityServiceRestApi.generateId -GET /api/DataEntityService/getOne api.DataEntityServiceRestApi.getOne -GET /api/DataEntityService/getSome api.DataEntityServiceRestApi.getSome -POST /api/DataEntityService/update api.DataEntityServiceRestApi.update -POST /api/ReferentialEntityService/create api.ReferentialEntityServiceRestApi.create -DELETE /api/ReferentialEntityService/delete api.ReferentialEntityServiceRestApi.delete -GET /api/ReferentialEntityService/generateId api.ReferentialEntityServiceRestApi.generateId -GET /api/ReferentialEntityService/getAll api.ReferentialEntityServiceRestApi.getAll -GET /api/ReferentialEntityService/getByModule api.ReferentialEntityServiceRestApi.getByModule -GET /api/ReferentialEntityService/getByPackage api.ReferentialEntityServiceRestApi.getByPackage -GET /api/ReferentialEntityService/getOne api.ReferentialEntityServiceRestApi.getOne -GET /api/ReferentialEntityService/getSome api.ReferentialEntityServiceRestApi.getSome -PUT /api/ReferentialEntityService/update api.ReferentialEntityServiceRestApi.update -GET /api/SqlService/select api.SqlServiceRestApi.select -GET /data/ContainerService/loadForm data.ContainerServiceRestApi.loadForm -POST /data/ContainerService/save data.ContainerServiceRestApi.save -GET /data/DataFileService/getDataFile data.DataFileServiceRestApi.getDataFile -POST /data/DataManagementService/deleteData data.DataManagementServiceRestApi.deleteData -POST /data/DataManagementService/exportData data.DataManagementServiceRestApi.exportData -POST /data/DataManagementService/importData data.DataManagementServiceRestApi.importData -DELETE /data/EditableService/delete data.EditableServiceRestApi.delete -GET /data/EditableService/exists data.EditableServiceRestApi.exists -GET /data/EditableService/loadDto data.EditableServiceRestApi.loadDto -GET /data/EditableService/loadForm data.EditableServiceRestApi.loadForm -GET /data/EditableService/preCreate data.EditableServiceRestApi.preCreate -POST /data/EditableService/save data.EditableServiceRestApi.save -DELETE /data/OpenableService/delete data.OpenableServiceRestApi.delete -GET /data/OpenableService/exists data.OpenableServiceRestApi.exists -GET /data/OpenableService/getBrothers data.OpenableServiceRestApi.getBrothers -GET /data/OpenableService/getBrothersFromParent data.OpenableServiceRestApi.getBrothersFromParent -GET /data/OpenableService/getChildren data.OpenableServiceRestApi.getChildren -GET /data/OpenableService/getChildrenUpdate data.OpenableServiceRestApi.getChildrenUpdate -POST /data/OpenableService/getMandatoryDependencies data.OpenableServiceRestApi.getMandatoryDependencies -POST /data/OpenableService/getMandatoryDependenciesCount data.OpenableServiceRestApi.getMandatoryDependenciesCount -POST /data/OpenableService/getOptionalDependencies data.OpenableServiceRestApi.getOptionalDependencies -POST /data/OpenableService/getOptionalDependenciesCount data.OpenableServiceRestApi.getOptionalDependenciesCount -GET /data/OpenableService/loadDto data.OpenableServiceRestApi.loadDto -GET /data/OpenableService/loadForm data.OpenableServiceRestApi.loadForm -POST /data/OpenableService/move data.OpenableServiceRestApi.move -GET /data/OpenableService/preCreate data.OpenableServiceRestApi.preCreate -POST /data/OpenableService/save data.OpenableServiceRestApi.save -POST /data/RootOpenableService/computeMissingReferential data.RootOpenableServiceRestApi.computeMissingReferential -DELETE /data/RootOpenableService/delete data.RootOpenableServiceRestApi.delete -DELETE /data/RootOpenableService/deleteLayout data.RootOpenableServiceRestApi.deleteLayout -GET /data/RootOpenableService/exists data.RootOpenableServiceRestApi.exists -GET /data/RootOpenableService/getBrothers data.RootOpenableServiceRestApi.getBrothers -GET /data/RootOpenableService/getChildren data.RootOpenableServiceRestApi.getChildren -GET /data/RootOpenableService/getChildrenUpdate data.RootOpenableServiceRestApi.getChildrenUpdate -GET /data/RootOpenableService/getGroupByDtoValue data.RootOpenableServiceRestApi.getGroupByDtoValue -GET /data/RootOpenableService/getGroupByValue data.RootOpenableServiceRestApi.getGroupByValue -GET /data/RootOpenableService/loadDto data.RootOpenableServiceRestApi.loadDto -GET /data/RootOpenableService/loadForm data.RootOpenableServiceRestApi.loadForm -POST /data/RootOpenableService/moveLayout data.RootOpenableServiceRestApi.moveLayout -GET /data/RootOpenableService/preCreate data.RootOpenableServiceRestApi.preCreate -POST /data/RootOpenableService/save data.RootOpenableServiceRestApi.save -GET /data/SimpleService/loadForm data.SimpleServiceRestApi.loadForm -POST /data/SimpleService/save data.SimpleServiceRestApi.save -POST /data/ll/ActivityPairingService/applyPairing data.ll.ActivityPairingServiceRestApi.applyPairing -POST /data/ll/ActivityPairingService/computePairing data.ll.ActivityPairingServiceRestApi.computePairing -GET /data/ll/common/TripService/getAllTripIds data.ll.common.TripServiceRestApi.getAllTripIds -GET /data/ll/common/TripService/getLogbookCatchSpeciesIds data.ll.common.TripServiceRestApi.getLogbookCatchSpeciesIds -GET /data/ll/common/TripService/getMatchingTripsVesselWithinDateRange data.ll.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange -GET /data/ll/common/TripService/getSampleActivityParentCandidate data.ll.common.TripServiceRestApi.getSampleActivityParentCandidate -GET /data/ll/common/TripService/getSpeciesByListAndTrip data.ll.common.TripServiceRestApi.getSpeciesByListAndTrip -GET /data/ll/common/TripService/getTripMap data.ll.common.TripServiceRestApi.getTripMap -GET /data/ll/common/TripService/loadBranchlineForm data.ll.common.TripServiceRestApi.loadBranchlineForm -POST /data/ll/common/TripService/moveActivitySample data.ll.common.TripServiceRestApi.moveActivitySample -POST /data/ll/common/TripService/saveAndCopyProperties data.ll.common.TripServiceRestApi.saveAndCopyProperties -POST /data/ll/common/TripService/saveBranchline data.ll.common.TripServiceRestApi.saveBranchline -POST /data/ps/ActivityPairingService/applyPairing data.ps.ActivityPairingServiceRestApi.applyPairing -POST /data/ps/ActivityPairingService/computePairing data.ps.ActivityPairingServiceRestApi.computePairing -GET /data/ps/AvdthService/importData data.ps.AvdthServiceRestApi.importData -POST /data/ps/ConsolidateDataService/consolidateLocalmarketBatch data.ps.ConsolidateDataServiceRestApi.consolidateLocalmarketBatch -POST /data/ps/ConsolidateDataService/consolidateTrip data.ps.ConsolidateDataServiceRestApi.consolidateTrip -GET /data/ps/ConsolidateDataService/newSimplifiedObjectTypeManager data.ps.ConsolidateDataServiceRestApi.newSimplifiedObjectTypeManager -GET /data/ps/common/TripService/getAllTripIds data.ps.common.TripServiceRestApi.getAllTripIds -GET /data/ps/common/TripService/getLogbookWellPlanActivities data.ps.common.TripServiceRestApi.getLogbookWellPlanActivities -GET /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange -GET /data/ps/common/TripService/getPsObservationCatchesSpeciesFateBySpeciesId data.ps.common.TripServiceRestApi.getPsObservationCatchesSpeciesFateBySpeciesId -GET /data/ps/common/TripService/getSpeciesByListAndTrip data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip -GET /data/ps/common/TripService/getTripMap data.ps.common.TripServiceRestApi.getTripMap -GET /data/ps/common/TripService/isActivityEndOfSearchFound data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound -GET /data/ps/common/TripService/loadLocalmarketForm data.ps.common.TripServiceRestApi.loadLocalmarketForm -GET /data/ps/common/TripService/loadLogbookForm data.ps.common.TripServiceRestApi.loadLogbookForm -GET /data/ps/common/TripService/preCreateLogbookFloatingObject data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject -GET /data/ps/common/TripService/preCreateObservationFloatingObject data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject -POST /referential/ReferentialService/changeId referential.ReferentialServiceRestApi.changeId -DELETE /referential/ReferentialService/delete referential.ReferentialServiceRestApi.delete -GET /referential/ReferentialService/exists referential.ReferentialServiceRestApi.exists -GET /referential/ReferentialService/getEnabledReferentialLabelSet referential.ReferentialServiceRestApi.getEnabledReferentialLabelSet -GET /referential/ReferentialService/getReferenceSet referential.ReferentialServiceRestApi.getReferenceSet -POST /referential/ReferentialService/getReferentialIds referential.ReferentialServiceRestApi.getReferentialIds -GET /referential/ReferentialService/getReferentialReferenceSets referential.ReferentialServiceRestApi.getReferentialReferenceSets -POST /referential/ReferentialService/insertMissingReferential referential.ReferentialServiceRestApi.insertMissingReferential -GET /referential/ReferentialService/loadDto referential.ReferentialServiceRestApi.loadDto -POST /referential/ReferentialService/loadDtoList referential.ReferentialServiceRestApi.loadDtoList -GET /referential/ReferentialService/loadForm referential.ReferentialServiceRestApi.loadForm -GET /referential/ReferentialService/loadIds referential.ReferentialServiceRestApi.loadIds -GET /referential/ReferentialService/preCreate referential.ReferentialServiceRestApi.preCreate -POST /referential/ReferentialService/replaceReference referential.ReferentialServiceRestApi.replaceReference -POST /referential/ReferentialService/save referential.ReferentialServiceRestApi.save -POST /referential/SynchronizeService/applySql referential.SynchronizeServiceRestApi.applySql -POST /referential/SynchronizeService/filterIdsUsed referential.SynchronizeServiceRestApi.filterIdsUsed -POST /referential/SynchronizeService/getReferentialToDelete referential.SynchronizeServiceRestApi.getReferentialToDelete -POST /referential/SynchronizeService/produceSqlResult referential.SynchronizeServiceRestApi.produceSqlResult +GET /AnonymousService/applySecurity AnonymousServiceRestApi.applySecurity +GET /AnonymousService/checkCanConnect AnonymousServiceRestApi.checkCanConnect +GET /AnonymousService/checkCanConnectOrBeEmpty AnonymousServiceRestApi.checkCanConnectOrBeEmpty +POST /AnonymousService/createEmpty AnonymousServiceRestApi.createEmpty +POST /AnonymousService/createFromDump AnonymousServiceRestApi.createFromDump +POST /AnonymousService/createFromImport AnonymousServiceRestApi.createFromImport +GET /AnonymousService/generateHomeId AnonymousServiceRestApi.generateHomeId +GET /AnonymousService/getAvailableDatabaseNames AnonymousServiceRestApi.getAvailableDatabaseNames +GET /AnonymousService/getModelVersion AnonymousServiceRestApi.getModelVersion +GET /AnonymousService/getServerVersion AnonymousServiceRestApi.getServerVersion +GET /AnonymousService/getUsers AnonymousServiceRestApi.getUsers +GET /AnonymousService/migrateData AnonymousServiceRestApi.migrateData +GET /AnonymousService/open AnonymousServiceRestApi.open +GET /DataSourceService/backup DataSourceServiceRestApi.backup +GET /DataSourceService/close DataSourceServiceRestApi.close +POST /DataSourceService/executeSqlScript DataSourceServiceRestApi.executeSqlScript +GET /DataSourceService/getLastUpdateDate DataSourceServiceRestApi.getLastUpdateDate +GET /DataSourceService/isIdValid DataSourceServiceRestApi.isIdValid +POST /DataSourceService/produceAddSqlScript DataSourceServiceRestApi.produceAddSqlScript +POST /DataSourceService/produceCreateSqlScript DataSourceServiceRestApi.produceCreateSqlScript +POST /DataSourceService/produceDeleteSqlScript DataSourceServiceRestApi.produceDeleteSqlScript +POST /DataSourceService/produceMoveSqlScript DataSourceServiceRestApi.produceMoveSqlScript +POST /DataSourceService/retainExistingIds DataSourceServiceRestApi.retainExistingIds +GET /NavigationService/getGroupByDtoSet NavigationServiceRestApi.getGroupByDtoSet +GET /NavigationService/getNavigation NavigationServiceRestApi.getNavigation +GET /NavigationService/loadNavigationPath NavigationServiceRestApi.loadNavigationPath +GET /NavigationService/loadNavigationRoot NavigationServiceRestApi.loadNavigationRoot +GET /NavigationService/loadSelectionRoot NavigationServiceRestApi.loadSelectionRoot +GET /ReferenceService/createData ReferenceServiceRestApi.createData +GET /ReferenceService/createReferential ReferenceServiceRestApi.createReferential +GET /ReferenceService/loadData ReferenceServiceRestApi.loadData +GET /ReferenceService/loadReferential ReferenceServiceRestApi.loadReferential +POST /ReportService/executeReport ReportServiceRestApi.executeReport +POST /ReportService/populateVariables ReportServiceRestApi.populateVariables +GET /UsageService/countMandatoryData UsageServiceRestApi.countMandatoryData +GET /UsageService/countOptionalData UsageServiceRestApi.countOptionalData +GET /UsageService/countReferential UsageServiceRestApi.countReferential +POST /UsageService/findMandatoryData UsageServiceRestApi.findMandatoryData +POST /UsageService/findOptionalData UsageServiceRestApi.findOptionalData +POST /UsageService/findReferential UsageServiceRestApi.findReferential +POST /ValidateService/validateData ValidateServiceRestApi.validateData +POST /ValidateService/validateReferential ValidateServiceRestApi.validateReferential +POST /api/DataEntityService/create api.DataEntityServiceRestApi.create +DELETE /api/DataEntityService/delete api.DataEntityServiceRestApi.delete +GET /api/DataEntityService/generateId api.DataEntityServiceRestApi.generateId +GET /api/DataEntityService/getOne api.DataEntityServiceRestApi.getOne +GET /api/DataEntityService/getSome api.DataEntityServiceRestApi.getSome +POST /api/DataEntityService/update api.DataEntityServiceRestApi.update +POST /api/ReferentialEntityService/create api.ReferentialEntityServiceRestApi.create +DELETE /api/ReferentialEntityService/delete api.ReferentialEntityServiceRestApi.delete +GET /api/ReferentialEntityService/generateId api.ReferentialEntityServiceRestApi.generateId +GET /api/ReferentialEntityService/getAll api.ReferentialEntityServiceRestApi.getAll +GET /api/ReferentialEntityService/getByModule api.ReferentialEntityServiceRestApi.getByModule +GET /api/ReferentialEntityService/getByPackage api.ReferentialEntityServiceRestApi.getByPackage +GET /api/ReferentialEntityService/getOne api.ReferentialEntityServiceRestApi.getOne +GET /api/ReferentialEntityService/getSome api.ReferentialEntityServiceRestApi.getSome +PUT /api/ReferentialEntityService/update api.ReferentialEntityServiceRestApi.update +GET /api/SqlService/select api.SqlServiceRestApi.select +GET /data/ContainerService/loadForm data.ContainerServiceRestApi.loadForm +POST /data/ContainerService/save data.ContainerServiceRestApi.save +GET /data/DataFileService/getDataFile data.DataFileServiceRestApi.getDataFile +POST /data/DataManagementService/deleteData data.DataManagementServiceRestApi.deleteData +POST /data/DataManagementService/exportData data.DataManagementServiceRestApi.exportData +POST /data/DataManagementService/importData data.DataManagementServiceRestApi.importData +DELETE /data/EditableService/delete data.EditableServiceRestApi.delete +GET /data/EditableService/exists data.EditableServiceRestApi.exists +GET /data/EditableService/loadDto data.EditableServiceRestApi.loadDto +GET /data/EditableService/loadForm data.EditableServiceRestApi.loadForm +GET /data/EditableService/preCreate data.EditableServiceRestApi.preCreate +POST /data/EditableService/save data.EditableServiceRestApi.save +DELETE /data/OpenableService/delete data.OpenableServiceRestApi.delete +GET /data/OpenableService/exists data.OpenableServiceRestApi.exists +GET /data/OpenableService/getBrothers data.OpenableServiceRestApi.getBrothers +GET /data/OpenableService/getBrothersFromParent data.OpenableServiceRestApi.getBrothersFromParent +GET /data/OpenableService/getChildren data.OpenableServiceRestApi.getChildren +GET /data/OpenableService/getChildrenUpdate data.OpenableServiceRestApi.getChildrenUpdate +POST /data/OpenableService/getMandatoryDependencies data.OpenableServiceRestApi.getMandatoryDependencies +POST /data/OpenableService/getMandatoryDependenciesCount data.OpenableServiceRestApi.getMandatoryDependenciesCount +POST /data/OpenableService/getOptionalDependencies data.OpenableServiceRestApi.getOptionalDependencies +POST /data/OpenableService/getOptionalDependenciesCount data.OpenableServiceRestApi.getOptionalDependenciesCount +GET /data/OpenableService/loadDto data.OpenableServiceRestApi.loadDto +GET /data/OpenableService/loadForm data.OpenableServiceRestApi.loadForm +POST /data/OpenableService/move data.OpenableServiceRestApi.move +GET /data/OpenableService/preCreate data.OpenableServiceRestApi.preCreate +POST /data/OpenableService/save data.OpenableServiceRestApi.save +POST /data/RootOpenableService/computeMissingReferential data.RootOpenableServiceRestApi.computeMissingReferential +DELETE /data/RootOpenableService/delete data.RootOpenableServiceRestApi.delete +DELETE /data/RootOpenableService/deleteLayout data.RootOpenableServiceRestApi.deleteLayout +GET /data/RootOpenableService/exists data.RootOpenableServiceRestApi.exists +GET /data/RootOpenableService/getBrothers data.RootOpenableServiceRestApi.getBrothers +GET /data/RootOpenableService/getChildren data.RootOpenableServiceRestApi.getChildren +GET /data/RootOpenableService/getChildrenUpdate data.RootOpenableServiceRestApi.getChildrenUpdate +GET /data/RootOpenableService/getGroupByDtoValue data.RootOpenableServiceRestApi.getGroupByDtoValue +GET /data/RootOpenableService/getGroupByValue data.RootOpenableServiceRestApi.getGroupByValue +GET /data/RootOpenableService/loadDto data.RootOpenableServiceRestApi.loadDto +GET /data/RootOpenableService/loadForm data.RootOpenableServiceRestApi.loadForm +POST /data/RootOpenableService/moveLayout data.RootOpenableServiceRestApi.moveLayout +GET /data/RootOpenableService/preCreate data.RootOpenableServiceRestApi.preCreate +POST /data/RootOpenableService/save data.RootOpenableServiceRestApi.save +GET /data/SimpleService/loadForm data.SimpleServiceRestApi.loadForm +POST /data/SimpleService/save data.SimpleServiceRestApi.save +POST /data/ll/ActivityPairingService/applyPairing data.ll.ActivityPairingServiceRestApi.applyPairing +POST /data/ll/ActivityPairingService/computePairing data.ll.ActivityPairingServiceRestApi.computePairing +GET /data/ll/common/TripService/getAllTripIds data.ll.common.TripServiceRestApi.getAllTripIds +GET /data/ll/common/TripService/getLogbookCatchSpeciesIds data.ll.common.TripServiceRestApi.getLogbookCatchSpeciesIds +GET /data/ll/common/TripService/getMatchingTripsVesselWithinDateRange data.ll.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange +GET /data/ll/common/TripService/getSampleActivityParentCandidate data.ll.common.TripServiceRestApi.getSampleActivityParentCandidate +GET /data/ll/common/TripService/getSpeciesByListAndTrip data.ll.common.TripServiceRestApi.getSpeciesByListAndTrip +GET /data/ll/common/TripService/getTripMap data.ll.common.TripServiceRestApi.getTripMap +GET /data/ll/common/TripService/loadBranchlineForm data.ll.common.TripServiceRestApi.loadBranchlineForm +POST /data/ll/common/TripService/moveActivitySample data.ll.common.TripServiceRestApi.moveActivitySample +POST /data/ll/common/TripService/saveAndCopyProperties data.ll.common.TripServiceRestApi.saveAndCopyProperties +POST /data/ll/common/TripService/saveBranchline data.ll.common.TripServiceRestApi.saveBranchline +POST /data/ps/ActivityPairingService/applyPairing data.ps.ActivityPairingServiceRestApi.applyPairing +POST /data/ps/ActivityPairingService/computePairing data.ps.ActivityPairingServiceRestApi.computePairing +GET /data/ps/AvdthService/importData data.ps.AvdthServiceRestApi.importData +POST /data/ps/ConsolidateDataService/consolidateLocalmarketBatch data.ps.ConsolidateDataServiceRestApi.consolidateLocalmarketBatch +POST /data/ps/ConsolidateDataService/consolidateTrip data.ps.ConsolidateDataServiceRestApi.consolidateTrip +GET /data/ps/ConsolidateDataService/newSimplifiedObjectTypeManager data.ps.ConsolidateDataServiceRestApi.newSimplifiedObjectTypeManager +GET /data/ps/common/TripService/getAllTripIds data.ps.common.TripServiceRestApi.getAllTripIds +GET /data/ps/common/TripService/getLogbookWellPlanActivities data.ps.common.TripServiceRestApi.getLogbookWellPlanActivities +GET /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange +GET /data/ps/common/TripService/getSpeciesByListAndTrip data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip +GET /data/ps/common/TripService/getTripMap data.ps.common.TripServiceRestApi.getTripMap +GET /data/ps/common/TripService/isActivityEndOfSearchFound data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound +GET /data/ps/common/TripService/loadLocalmarketForm data.ps.common.TripServiceRestApi.loadLocalmarketForm +GET /data/ps/common/TripService/loadLogbookForm data.ps.common.TripServiceRestApi.loadLogbookForm +GET /data/ps/common/TripService/preCreateLogbookFloatingObject data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject +GET /data/ps/common/TripService/preCreateObservationFloatingObject data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject +POST /referential/ReferentialService/changeId referential.ReferentialServiceRestApi.changeId +DELETE /referential/ReferentialService/delete referential.ReferentialServiceRestApi.delete +GET /referential/ReferentialService/exists referential.ReferentialServiceRestApi.exists +GET /referential/ReferentialService/getEnabledReferentialLabelSet referential.ReferentialServiceRestApi.getEnabledReferentialLabelSet +GET /referential/ReferentialService/getReferenceSet referential.ReferentialServiceRestApi.getReferenceSet +POST /referential/ReferentialService/getReferentialIds referential.ReferentialServiceRestApi.getReferentialIds +GET /referential/ReferentialService/getReferentialReferenceSets referential.ReferentialServiceRestApi.getReferentialReferenceSets +POST /referential/ReferentialService/insertMissingReferential referential.ReferentialServiceRestApi.insertMissingReferential +GET /referential/ReferentialService/loadDto referential.ReferentialServiceRestApi.loadDto +POST /referential/ReferentialService/loadDtoList referential.ReferentialServiceRestApi.loadDtoList +GET /referential/ReferentialService/loadForm referential.ReferentialServiceRestApi.loadForm +GET /referential/ReferentialService/loadIds referential.ReferentialServiceRestApi.loadIds +GET /referential/ReferentialService/preCreate referential.ReferentialServiceRestApi.preCreate +POST /referential/ReferentialService/replaceReference referential.ReferentialServiceRestApi.replaceReference +POST /referential/ReferentialService/save referential.ReferentialServiceRestApi.save +POST /referential/SynchronizeService/applySql referential.SynchronizeServiceRestApi.applySql +POST /referential/SynchronizeService/filterIdsUsed referential.SynchronizeServiceRestApi.filterIdsUsed +POST /referential/SynchronizeService/getReferentialToDelete referential.SynchronizeServiceRestApi.getReferentialToDelete +POST /referential/SynchronizeService/produceSqlResult referential.SynchronizeServiceRestApi.produceSqlResult View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/00aa309fd0e40ca3b5545e4c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/00aa309fd0e40ca3b5545e4c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 8 commits: update hibernate
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: b8954c92 by Tony Chemit at 2022-11-23T15:36:53+01:00 update hibernate - - - - - 416d0b98 by Tony Chemit at 2022-11-23T18:00:08+01:00 update pom - - - - - cb589a5e by Tony Chemit at 2022-11-23T18:00:08+01:00 re-add observe.exe in observe-client assembly to be tested by windows users - - - - - f9d19d1b by Tony Chemit at 2022-11-23T18:20:47+01:00 Remove SampleDto.speciesFate field, never used - - - - - 603e56de by Tony Chemit at 2022-11-23T18:20:47+01:00 Add SampleDto.speciesFateBySpeciesMap field to be loaded only by Form - - - - - eb05f296 by Tony Chemit at 2022-11-23T18:20:47+01:00 Service - Remove TripService.getPsObservationCatchesSpeciesFateBySpeciesId (will use now SampleDto.speciesFateBySpeciesMap) - - - - - aafa5dbe by Tony Chemit at 2022-11-23T18:20:47+01:00 GUI - Use SampleDto.speciesFateBySpeciesMap field instead of calling a specific service (and avoid gson madness) - - - - - 260baa5a by Tony Chemit at 2022-11-23T18:21:10+01:00 Merge branch 'feature/issue_2541' into develop-9.0.x Closes #2541 - - - - - 18 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - client/runner/src/main/assembly/bin.xml - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SampleDto.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-warning-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-update.json - core/services/local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java - core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/common/TripService.properties - model/src/main/models/Observe/dto/20-data-ps-observation.model - pom.xml - server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; +import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.dto.referential.ps.common.SpeciesFateReference; import fr.ird.observe.navigation.id.Project; @@ -78,10 +79,15 @@ public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleD @Override public void onAfterInitAddReferentialFilters(ClientConfig clientConfig, Project observeSelectModel, ObserveServicesProvider servicesProvider, ReferencesCache referenceCache) { - speciesFateBySpeciesMap = servicesProvider.getPsCommonTripService().getPsObservationCatchesSpeciesFateBySpeciesId(observeSelectModel.getPs().getObservationSet().getId()); - referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES, ReferencesFilterHelper.<SampleDto, SpeciesReference>newSubList(e -> speciesFateBySpeciesMap.keySet())); + referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES, ReferencesFilterHelper.<SampleDto, SpeciesReference>newSubList(e -> e.getSpeciesFateBySpeciesMap().keySet())); referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES_FATE, ReferencesFilterHelper.<SampleDto, SpeciesFateReference>newSubList( - e -> speciesFateBySpeciesMap.values().stream().flatMap(Set::stream).collect(Collectors.toSet()))); + e -> e.getSpeciesFateBySpeciesMap().values().stream().flatMap(Set::stream).collect(Collectors.toSet()))); + } + + @Override + protected void copyFormToBean(Form<SampleDto> form) { + this.speciesFateBySpeciesMap = form.getObject().getSpeciesFateBySpeciesMap(); + super.copyFormToBean(form); } @Override ===================================== client/runner/src/main/assembly/bin.xml ===================================== @@ -33,7 +33,7 @@ <includes> <include>${applicationJarName}.jar</include>  - + <include>${applicationJarName}.exe</include> </includes> </fileSet> ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SampleDto.java ===================================== @@ -0,0 +1,53 @@ +package fr.ird.observe.dto.data.ps.observation; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2022 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% + */ + +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; + +import java.util.Map; +import java.util.Set; + +/** + * Created on 23/11/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.19 + */ +@GenerateJavaBeanDefinition +public class SampleDto extends GeneratedSampleDto { + + /** + * To get all species fate used per species in Set catches. + * <p> + * Only used when loading form. + */ + private Map<String, Set<String>> speciesFateBySpeciesMap; + + public Map<String, Set<String>> getSpeciesFateBySpeciesMap() { + return speciesFateBySpeciesMap; + } + + public void setSpeciesFateBySpeciesMap(Map<String, Set<String>> speciesFateBySpeciesMap) { + this.speciesFateBySpeciesMap = speciesFateBySpeciesMap; + } +} ===================================== core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java ===================================== @@ -33,9 +33,6 @@ import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Nullable; import io.ultreia.java4all.http.spi.Service; -import java.util.Map; -import java.util.Set; - /** * Created on 26/07/2021. * @@ -57,10 +54,6 @@ public interface TripService extends TripAwareService { @MethodCredential(Permission.READ_DATA) boolean isActivityEndOfSearchFound(String routeId); - @Get - @MethodCredential(Permission.READ_DATA) - Map<String, Set<String>> getPsObservationCatchesSpeciesFateBySpeciesId(String setId); - @Get @MethodCredential(Permission.WRITE_DATA) Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, @Nullable FloatingObjectPreset floatingObjectPreset); ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -13225,28 +13225,8 @@ "name": "comment", "comments": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SampleDto", - "scope": "WARNING", - "context": "create", - "fields": [ - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } ] }, @@ -13259,28 +13239,8 @@ "name": "comment", "comments": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SampleDto", - "scope": "WARNING", - "context": "update", - "fields": [ - { - "name": "speciesFate", - "comments": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } ] }, ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-error-validation.xml ===================================== @@ -35,19 +35,6 @@ <param name="maxLength">8192</param> <message/> </field-validator> - -  - <field-validator type="commentNeeded"> - <param name="propertyNames">speciesFate</param> - <message/> - </field-validator> - </field> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnErrorScope"> - <message/> - </field-validator> </field> </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-warning-validation.xml deleted ===================================== @@ -1,34 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnWarningScope"> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-error-validation.xml ===================================== @@ -35,19 +35,6 @@ <param name="maxLength">8192</param> <message/> </field-validator> - -  - <field-validator type="commentNeeded"> - <param name="propertyNames">speciesFate</param> - <message/> - </field-validator> - </field> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnErrorScope"> - <message/> - </field-validator> </field> </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-warning-validation.xml deleted ===================================== @@ -1,34 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="speciesFate"> -  - <field-validator type="checkDisabledReferentialOnWarningScope"> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java ===================================== @@ -45,6 +45,7 @@ public class SampleSpi extends GeneratedSampleSpi { SampleDto dto = form.getObject(); // always use the set id, //FIXME See why ? dto.setId(id); + dto.setSpeciesFateBySpeciesMap(getCatchesSpeciesFateBySpeciesId(parent)); return form; } @@ -72,8 +73,16 @@ public class SampleSpi extends GeneratedSampleSpi { .build(entity); } - public Map<String, java.util.Set<String>> getCatchesSpeciesFateBySpeciesId(ServiceContext context, String id) { - Set parent = Set.loadEntity(context, id); + + + protected Sample loadSampleFormEntity(ServiceContext context, Set parent) { + if (parent.isSampleEmpty()) { + return Sample.newEntity(context.now()); + } + return parent.getSample().iterator().next(); + } + + protected Map<String, java.util.Set<String>> getCatchesSpeciesFateBySpeciesId(Set parent) { Map<String, java.util.Set<String>> result = new TreeMap<>(); parent.getCatches().stream().filter(c -> c.getSpeciesFate() != null).forEach(aCatch -> { String speciesId = aCatch.getSpecies().getId(); @@ -82,11 +91,4 @@ public class SampleSpi extends GeneratedSampleSpi { }); return result; } - - protected Sample loadSampleFormEntity(ServiceContext context, Set parent) { - if (parent.isSampleEmpty()) { - return Sample.newEntity(context.now()); - } - return parent.getSample().iterator().next(); - } } ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-create.json ===================================== @@ -2,16 +2,7 @@ "comment": { "errors": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - "speciesFate": { - "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ], - "warnings": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } } \ No newline at end of file ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-update.json ===================================== @@ -2,16 +2,7 @@ "comment": { "errors": [ "comment (if not null) is not a blank string", - "comment is required if one of the selected referential requires it (speciesFate)", "comment length <= 8192" ] - }, - "speciesFate": { - "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" - ], - "warnings": [ - "check if referential speciesFate is disabled (only if validation is not strong)" - ] } } \ No newline at end of file ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java ===================================== @@ -36,8 +36,6 @@ import fr.ird.observe.services.service.data.ps.common.TripService; import java.util.Date; import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; /** * Created on 26/07/2021. @@ -82,11 +80,6 @@ public abstract class TripServiceLocalSupport extends ObserveServiceLocal implem return Trip.SPI.isActivityEndOfSearchFound(this, routeId); } - @Override - public Map<String, Set<String>> getPsObservationCatchesSpeciesFateBySpeciesId(String setId) { - return fr.ird.observe.entities.data.ps.observation.Sample.SPI.getCatchesSpeciesFateBySpeciesId(this, setId); - } - @Override public Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, FloatingObjectPreset floatingObjectPreset) { return fr.ird.observe.entities.data.ps.observation.FloatingObject.SPI.preCreate(this, floatingObjectPreset); ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java ===================================== @@ -39,9 +39,7 @@ import fr.ird.observe.services.service.data.EditableServiceFixtures; import fr.ird.observe.services.service.data.RootOpenableServiceFixtures; import org.junit.Assert; -import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; public class TripServiceFixtures extends GeneratedTripServiceFixtures { @@ -68,16 +66,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { // Assert.assertNull(dto.getLastUpdateDate()); // } - - @Override - public void getPsObservationCatchesSpeciesFateBySpeciesId(ObserveServicesProvider servicesProvider, TripService service) { - String setId = getProperty("getPsObservationCatchesSpeciesFateBySpeciesId.setId"); - Map<String, Set<String>> actual = service.getPsObservationCatchesSpeciesFateBySpeciesId(setId); - Assert.assertNotNull(actual); - Assert.assertEquals(getIntegerProperty("getPsObservationCatchesSpeciesFateBySpeciesId.speciesCount"), actual.size()); - Assert.assertEquals(getIntegerProperty("getPsObservationCatchesSpeciesFateBySpeciesId.speciesFateCount"), actual.values().stream().flatMap(Set::stream).collect(Collectors.toSet()).size()); - } - @Override public void getAllTripIds(ObserveServicesProvider servicesProvider, TripService service) { Set<String> actual = service.getAllTripIds(); ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/common/TripService.properties ===================================== @@ -25,7 +25,6 @@ defaultNewParentId=${REFERENTIAL_PS_COMMON_PROGRAM_MOVE} defaultParentId=${REFERENTIAL_PS_COMMON_PROGRAM} defaultProgramId=${REFERENTIAL_PS_COMMON_PROGRAM} defaultRouteId=FIXME -defaultSetId=${PS_OBSERVATION_SET} defaultSpeciesListId=fr.ird.referential.common.SpeciesList#1239832675370#0.1 defaultTripId=${PS_COMMON_TRIP} defaultVesselId=fr.ird.referential.common.Vessel#1239832679425#0.9136908731720471 @@ -43,9 +42,6 @@ getMatchingTripsVesselWithinDateRange.vesselId=${defaultVesselId} getParentBrothers.count=16 getParentBrothers.parentId=${defaultParentId} getParentBrothers.programId=${defaultProgramId} -getPsObservationCatchesSpeciesFateBySpeciesId.setId=${defaultSetId} -getPsObservationCatchesSpeciesFateBySpeciesId.speciesCount=6 -getPsObservationCatchesSpeciesFateBySpeciesId.speciesFateCount=4 getSpeciesByListAndTrip.count=14 getSpeciesByListAndTrip.speciesListId=${defaultSpeciesListId} getSpeciesByListAndTrip.tripId=${defaultTripId} ===================================== model/src/main/models/Observe/dto/20-data-ps-observation.model ===================================== @@ -157,7 +157,6 @@ informationSource {*:0..1} referential.ps.observation.InformationSourceReference data.ps.observation.Sample > data.Container sampleMeasure + {*} data.ps.observation.SampleMeasure -speciesFate {*:*} referential.ps.common.SpeciesFateReference data.ps.observation.SetCatch > data.Container catches {*} data.ps.observation.Catch ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.95</version> + <version>2022.97</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -119,7 +119,7 @@ <lib.version.h2>1.4.196</lib.version.h2>   - <lib.version.hibernate>5.6.12.Final</lib.version.hibernate> + <lib.version.hibernate>5.6.14.Final</lib.version.hibernate>  <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api> <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime> ===================================== server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm ===================================== @@ -16,151 +16,150 @@ # Do not remove the next line, it is used to generate the following actions. # →→→ Generated dynamic mapping -GET /AnonymousService/applySecurity AnonymousServiceRestApi.applySecurity -GET /AnonymousService/checkCanConnect AnonymousServiceRestApi.checkCanConnect -GET /AnonymousService/checkCanConnectOrBeEmpty AnonymousServiceRestApi.checkCanConnectOrBeEmpty -POST /AnonymousService/createEmpty AnonymousServiceRestApi.createEmpty -POST /AnonymousService/createFromDump AnonymousServiceRestApi.createFromDump -POST /AnonymousService/createFromImport AnonymousServiceRestApi.createFromImport -GET /AnonymousService/generateHomeId AnonymousServiceRestApi.generateHomeId -GET /AnonymousService/getAvailableDatabaseNames AnonymousServiceRestApi.getAvailableDatabaseNames -GET /AnonymousService/getModelVersion AnonymousServiceRestApi.getModelVersion -GET /AnonymousService/getServerVersion AnonymousServiceRestApi.getServerVersion -GET /AnonymousService/getUsers AnonymousServiceRestApi.getUsers -GET /AnonymousService/migrateData AnonymousServiceRestApi.migrateData -GET /AnonymousService/open AnonymousServiceRestApi.open -GET /DataSourceService/backup DataSourceServiceRestApi.backup -GET /DataSourceService/close DataSourceServiceRestApi.close -POST /DataSourceService/executeSqlScript DataSourceServiceRestApi.executeSqlScript -GET /DataSourceService/getLastUpdateDate DataSourceServiceRestApi.getLastUpdateDate -GET /DataSourceService/isIdValid DataSourceServiceRestApi.isIdValid -POST /DataSourceService/produceAddSqlScript DataSourceServiceRestApi.produceAddSqlScript -POST /DataSourceService/produceCreateSqlScript DataSourceServiceRestApi.produceCreateSqlScript -POST /DataSourceService/produceDeleteSqlScript DataSourceServiceRestApi.produceDeleteSqlScript -POST /DataSourceService/produceMoveSqlScript DataSourceServiceRestApi.produceMoveSqlScript -POST /DataSourceService/retainExistingIds DataSourceServiceRestApi.retainExistingIds -GET /NavigationService/getGroupByDtoSet NavigationServiceRestApi.getGroupByDtoSet -GET /NavigationService/getNavigation NavigationServiceRestApi.getNavigation -GET /NavigationService/loadNavigationPath NavigationServiceRestApi.loadNavigationPath -GET /NavigationService/loadNavigationRoot NavigationServiceRestApi.loadNavigationRoot -GET /NavigationService/loadSelectionRoot NavigationServiceRestApi.loadSelectionRoot -GET /ReferenceService/createData ReferenceServiceRestApi.createData -GET /ReferenceService/createReferential ReferenceServiceRestApi.createReferential -GET /ReferenceService/loadData ReferenceServiceRestApi.loadData -GET /ReferenceService/loadReferential ReferenceServiceRestApi.loadReferential -POST /ReportService/executeReport ReportServiceRestApi.executeReport -POST /ReportService/populateVariables ReportServiceRestApi.populateVariables -GET /UsageService/countMandatoryData UsageServiceRestApi.countMandatoryData -GET /UsageService/countOptionalData UsageServiceRestApi.countOptionalData -GET /UsageService/countReferential UsageServiceRestApi.countReferential -POST /UsageService/findMandatoryData UsageServiceRestApi.findMandatoryData -POST /UsageService/findOptionalData UsageServiceRestApi.findOptionalData -POST /UsageService/findReferential UsageServiceRestApi.findReferential -POST /ValidateService/validateData ValidateServiceRestApi.validateData -POST /ValidateService/validateReferential ValidateServiceRestApi.validateReferential -POST /api/DataEntityService/create api.DataEntityServiceRestApi.create -DELETE /api/DataEntityService/delete api.DataEntityServiceRestApi.delete -GET /api/DataEntityService/generateId api.DataEntityServiceRestApi.generateId -GET /api/DataEntityService/getOne api.DataEntityServiceRestApi.getOne -GET /api/DataEntityService/getSome api.DataEntityServiceRestApi.getSome -POST /api/DataEntityService/update api.DataEntityServiceRestApi.update -POST /api/ReferentialEntityService/create api.ReferentialEntityServiceRestApi.create -DELETE /api/ReferentialEntityService/delete api.ReferentialEntityServiceRestApi.delete -GET /api/ReferentialEntityService/generateId api.ReferentialEntityServiceRestApi.generateId -GET /api/ReferentialEntityService/getAll api.ReferentialEntityServiceRestApi.getAll -GET /api/ReferentialEntityService/getByModule api.ReferentialEntityServiceRestApi.getByModule -GET /api/ReferentialEntityService/getByPackage api.ReferentialEntityServiceRestApi.getByPackage -GET /api/ReferentialEntityService/getOne api.ReferentialEntityServiceRestApi.getOne -GET /api/ReferentialEntityService/getSome api.ReferentialEntityServiceRestApi.getSome -PUT /api/ReferentialEntityService/update api.ReferentialEntityServiceRestApi.update -GET /api/SqlService/select api.SqlServiceRestApi.select -GET /data/ContainerService/loadForm data.ContainerServiceRestApi.loadForm -POST /data/ContainerService/save data.ContainerServiceRestApi.save -GET /data/DataFileService/getDataFile data.DataFileServiceRestApi.getDataFile -POST /data/DataManagementService/deleteData data.DataManagementServiceRestApi.deleteData -POST /data/DataManagementService/exportData data.DataManagementServiceRestApi.exportData -POST /data/DataManagementService/importData data.DataManagementServiceRestApi.importData -DELETE /data/EditableService/delete data.EditableServiceRestApi.delete -GET /data/EditableService/exists data.EditableServiceRestApi.exists -GET /data/EditableService/loadDto data.EditableServiceRestApi.loadDto -GET /data/EditableService/loadForm data.EditableServiceRestApi.loadForm -GET /data/EditableService/preCreate data.EditableServiceRestApi.preCreate -POST /data/EditableService/save data.EditableServiceRestApi.save -DELETE /data/OpenableService/delete data.OpenableServiceRestApi.delete -GET /data/OpenableService/exists data.OpenableServiceRestApi.exists -GET /data/OpenableService/getBrothers data.OpenableServiceRestApi.getBrothers -GET /data/OpenableService/getBrothersFromParent data.OpenableServiceRestApi.getBrothersFromParent -GET /data/OpenableService/getChildren data.OpenableServiceRestApi.getChildren -GET /data/OpenableService/getChildrenUpdate data.OpenableServiceRestApi.getChildrenUpdate -POST /data/OpenableService/getMandatoryDependencies data.OpenableServiceRestApi.getMandatoryDependencies -POST /data/OpenableService/getMandatoryDependenciesCount data.OpenableServiceRestApi.getMandatoryDependenciesCount -POST /data/OpenableService/getOptionalDependencies data.OpenableServiceRestApi.getOptionalDependencies -POST /data/OpenableService/getOptionalDependenciesCount data.OpenableServiceRestApi.getOptionalDependenciesCount -GET /data/OpenableService/loadDto data.OpenableServiceRestApi.loadDto -GET /data/OpenableService/loadForm data.OpenableServiceRestApi.loadForm -POST /data/OpenableService/move data.OpenableServiceRestApi.move -GET /data/OpenableService/preCreate data.OpenableServiceRestApi.preCreate -POST /data/OpenableService/save data.OpenableServiceRestApi.save -POST /data/RootOpenableService/computeMissingReferential data.RootOpenableServiceRestApi.computeMissingReferential -DELETE /data/RootOpenableService/delete data.RootOpenableServiceRestApi.delete -DELETE /data/RootOpenableService/deleteLayout data.RootOpenableServiceRestApi.deleteLayout -GET /data/RootOpenableService/exists data.RootOpenableServiceRestApi.exists -GET /data/RootOpenableService/getBrothers data.RootOpenableServiceRestApi.getBrothers -GET /data/RootOpenableService/getChildren data.RootOpenableServiceRestApi.getChildren -GET /data/RootOpenableService/getChildrenUpdate data.RootOpenableServiceRestApi.getChildrenUpdate -GET /data/RootOpenableService/getGroupByDtoValue data.RootOpenableServiceRestApi.getGroupByDtoValue -GET /data/RootOpenableService/getGroupByValue data.RootOpenableServiceRestApi.getGroupByValue -GET /data/RootOpenableService/loadDto data.RootOpenableServiceRestApi.loadDto -GET /data/RootOpenableService/loadForm data.RootOpenableServiceRestApi.loadForm -POST /data/RootOpenableService/moveLayout data.RootOpenableServiceRestApi.moveLayout -GET /data/RootOpenableService/preCreate data.RootOpenableServiceRestApi.preCreate -POST /data/RootOpenableService/save data.RootOpenableServiceRestApi.save -GET /data/SimpleService/loadForm data.SimpleServiceRestApi.loadForm -POST /data/SimpleService/save data.SimpleServiceRestApi.save -POST /data/ll/ActivityPairingService/applyPairing data.ll.ActivityPairingServiceRestApi.applyPairing -POST /data/ll/ActivityPairingService/computePairing data.ll.ActivityPairingServiceRestApi.computePairing -GET /data/ll/common/TripService/getAllTripIds data.ll.common.TripServiceRestApi.getAllTripIds -GET /data/ll/common/TripService/getLogbookCatchSpeciesIds data.ll.common.TripServiceRestApi.getLogbookCatchSpeciesIds -GET /data/ll/common/TripService/getMatchingTripsVesselWithinDateRange data.ll.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange -GET /data/ll/common/TripService/getSampleActivityParentCandidate data.ll.common.TripServiceRestApi.getSampleActivityParentCandidate -GET /data/ll/common/TripService/getSpeciesByListAndTrip data.ll.common.TripServiceRestApi.getSpeciesByListAndTrip -GET /data/ll/common/TripService/getTripMap data.ll.common.TripServiceRestApi.getTripMap -GET /data/ll/common/TripService/loadBranchlineForm data.ll.common.TripServiceRestApi.loadBranchlineForm -POST /data/ll/common/TripService/moveActivitySample data.ll.common.TripServiceRestApi.moveActivitySample -POST /data/ll/common/TripService/saveAndCopyProperties data.ll.common.TripServiceRestApi.saveAndCopyProperties -POST /data/ll/common/TripService/saveBranchline data.ll.common.TripServiceRestApi.saveBranchline -POST /data/ps/ActivityPairingService/applyPairing data.ps.ActivityPairingServiceRestApi.applyPairing -POST /data/ps/ActivityPairingService/computePairing data.ps.ActivityPairingServiceRestApi.computePairing -GET /data/ps/AvdthService/importData data.ps.AvdthServiceRestApi.importData -POST /data/ps/ConsolidateDataService/consolidateLocalmarketBatch data.ps.ConsolidateDataServiceRestApi.consolidateLocalmarketBatch -POST /data/ps/ConsolidateDataService/consolidateTrip data.ps.ConsolidateDataServiceRestApi.consolidateTrip -GET /data/ps/ConsolidateDataService/newSimplifiedObjectTypeManager data.ps.ConsolidateDataServiceRestApi.newSimplifiedObjectTypeManager -GET /data/ps/common/TripService/getAllTripIds data.ps.common.TripServiceRestApi.getAllTripIds -GET /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange -GET /data/ps/common/TripService/getPsObservationCatchesSpeciesFateBySpeciesId data.ps.common.TripServiceRestApi.getPsObservationCatchesSpeciesFateBySpeciesId -GET /data/ps/common/TripService/getSpeciesByListAndTrip data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip -GET /data/ps/common/TripService/getTripMap data.ps.common.TripServiceRestApi.getTripMap -GET /data/ps/common/TripService/isActivityEndOfSearchFound data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound -GET /data/ps/common/TripService/loadLocalmarketForm data.ps.common.TripServiceRestApi.loadLocalmarketForm -GET /data/ps/common/TripService/loadLogbookForm data.ps.common.TripServiceRestApi.loadLogbookForm -GET /data/ps/common/TripService/preCreateLogbookFloatingObject data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject -GET /data/ps/common/TripService/preCreateObservationFloatingObject data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject -POST /referential/ReferentialService/changeId referential.ReferentialServiceRestApi.changeId -DELETE /referential/ReferentialService/delete referential.ReferentialServiceRestApi.delete -GET /referential/ReferentialService/exists referential.ReferentialServiceRestApi.exists -GET /referential/ReferentialService/getEnabledReferentialLabelSet referential.ReferentialServiceRestApi.getEnabledReferentialLabelSet -GET /referential/ReferentialService/getReferenceSet referential.ReferentialServiceRestApi.getReferenceSet -POST /referential/ReferentialService/getReferentialIds referential.ReferentialServiceRestApi.getReferentialIds -GET /referential/ReferentialService/getReferentialReferenceSets referential.ReferentialServiceRestApi.getReferentialReferenceSets -POST /referential/ReferentialService/insertMissingReferential referential.ReferentialServiceRestApi.insertMissingReferential -GET /referential/ReferentialService/loadDto referential.ReferentialServiceRestApi.loadDto -POST /referential/ReferentialService/loadDtoList referential.ReferentialServiceRestApi.loadDtoList -GET /referential/ReferentialService/loadForm referential.ReferentialServiceRestApi.loadForm -GET /referential/ReferentialService/loadIds referential.ReferentialServiceRestApi.loadIds -GET /referential/ReferentialService/preCreate referential.ReferentialServiceRestApi.preCreate -POST /referential/ReferentialService/replaceReference referential.ReferentialServiceRestApi.replaceReference -POST /referential/ReferentialService/save referential.ReferentialServiceRestApi.save -POST /referential/SynchronizeService/applySql referential.SynchronizeServiceRestApi.applySql -POST /referential/SynchronizeService/filterIdsUsed referential.SynchronizeServiceRestApi.filterIdsUsed -POST /referential/SynchronizeService/getReferentialToDelete referential.SynchronizeServiceRestApi.getReferentialToDelete -POST /referential/SynchronizeService/produceSqlResult referential.SynchronizeServiceRestApi.produceSqlResult +GET /AnonymousService/applySecurity AnonymousServiceRestApi.applySecurity +GET /AnonymousService/checkCanConnect AnonymousServiceRestApi.checkCanConnect +GET /AnonymousService/checkCanConnectOrBeEmpty AnonymousServiceRestApi.checkCanConnectOrBeEmpty +POST /AnonymousService/createEmpty AnonymousServiceRestApi.createEmpty +POST /AnonymousService/createFromDump AnonymousServiceRestApi.createFromDump +POST /AnonymousService/createFromImport AnonymousServiceRestApi.createFromImport +GET /AnonymousService/generateHomeId AnonymousServiceRestApi.generateHomeId +GET /AnonymousService/getAvailableDatabaseNames AnonymousServiceRestApi.getAvailableDatabaseNames +GET /AnonymousService/getModelVersion AnonymousServiceRestApi.getModelVersion +GET /AnonymousService/getServerVersion AnonymousServiceRestApi.getServerVersion +GET /AnonymousService/getUsers AnonymousServiceRestApi.getUsers +GET /AnonymousService/migrateData AnonymousServiceRestApi.migrateData +GET /AnonymousService/open AnonymousServiceRestApi.open +GET /DataSourceService/backup DataSourceServiceRestApi.backup +GET /DataSourceService/close DataSourceServiceRestApi.close +POST /DataSourceService/executeSqlScript DataSourceServiceRestApi.executeSqlScript +GET /DataSourceService/getLastUpdateDate DataSourceServiceRestApi.getLastUpdateDate +GET /DataSourceService/isIdValid DataSourceServiceRestApi.isIdValid +POST /DataSourceService/produceAddSqlScript DataSourceServiceRestApi.produceAddSqlScript +POST /DataSourceService/produceCreateSqlScript DataSourceServiceRestApi.produceCreateSqlScript +POST /DataSourceService/produceDeleteSqlScript DataSourceServiceRestApi.produceDeleteSqlScript +POST /DataSourceService/produceMoveSqlScript DataSourceServiceRestApi.produceMoveSqlScript +POST /DataSourceService/retainExistingIds DataSourceServiceRestApi.retainExistingIds +GET /NavigationService/getGroupByDtoSet NavigationServiceRestApi.getGroupByDtoSet +GET /NavigationService/getNavigation NavigationServiceRestApi.getNavigation +GET /NavigationService/loadNavigationPath NavigationServiceRestApi.loadNavigationPath +GET /NavigationService/loadNavigationRoot NavigationServiceRestApi.loadNavigationRoot +GET /NavigationService/loadSelectionRoot NavigationServiceRestApi.loadSelectionRoot +GET /ReferenceService/createData ReferenceServiceRestApi.createData +GET /ReferenceService/createReferential ReferenceServiceRestApi.createReferential +GET /ReferenceService/loadData ReferenceServiceRestApi.loadData +GET /ReferenceService/loadReferential ReferenceServiceRestApi.loadReferential +POST /ReportService/executeReport ReportServiceRestApi.executeReport +POST /ReportService/populateVariables ReportServiceRestApi.populateVariables +GET /UsageService/countMandatoryData UsageServiceRestApi.countMandatoryData +GET /UsageService/countOptionalData UsageServiceRestApi.countOptionalData +GET /UsageService/countReferential UsageServiceRestApi.countReferential +POST /UsageService/findMandatoryData UsageServiceRestApi.findMandatoryData +POST /UsageService/findOptionalData UsageServiceRestApi.findOptionalData +POST /UsageService/findReferential UsageServiceRestApi.findReferential +POST /ValidateService/validateData ValidateServiceRestApi.validateData +POST /ValidateService/validateReferential ValidateServiceRestApi.validateReferential +POST /api/DataEntityService/create api.DataEntityServiceRestApi.create +DELETE /api/DataEntityService/delete api.DataEntityServiceRestApi.delete +GET /api/DataEntityService/generateId api.DataEntityServiceRestApi.generateId +GET /api/DataEntityService/getOne api.DataEntityServiceRestApi.getOne +GET /api/DataEntityService/getSome api.DataEntityServiceRestApi.getSome +POST /api/DataEntityService/update api.DataEntityServiceRestApi.update +POST /api/ReferentialEntityService/create api.ReferentialEntityServiceRestApi.create +DELETE /api/ReferentialEntityService/delete api.ReferentialEntityServiceRestApi.delete +GET /api/ReferentialEntityService/generateId api.ReferentialEntityServiceRestApi.generateId +GET /api/ReferentialEntityService/getAll api.ReferentialEntityServiceRestApi.getAll +GET /api/ReferentialEntityService/getByModule api.ReferentialEntityServiceRestApi.getByModule +GET /api/ReferentialEntityService/getByPackage api.ReferentialEntityServiceRestApi.getByPackage +GET /api/ReferentialEntityService/getOne api.ReferentialEntityServiceRestApi.getOne +GET /api/ReferentialEntityService/getSome api.ReferentialEntityServiceRestApi.getSome +PUT /api/ReferentialEntityService/update api.ReferentialEntityServiceRestApi.update +GET /api/SqlService/select api.SqlServiceRestApi.select +GET /data/ContainerService/loadForm data.ContainerServiceRestApi.loadForm +POST /data/ContainerService/save data.ContainerServiceRestApi.save +GET /data/DataFileService/getDataFile data.DataFileServiceRestApi.getDataFile +POST /data/DataManagementService/deleteData data.DataManagementServiceRestApi.deleteData +POST /data/DataManagementService/exportData data.DataManagementServiceRestApi.exportData +POST /data/DataManagementService/importData data.DataManagementServiceRestApi.importData +DELETE /data/EditableService/delete data.EditableServiceRestApi.delete +GET /data/EditableService/exists data.EditableServiceRestApi.exists +GET /data/EditableService/loadDto data.EditableServiceRestApi.loadDto +GET /data/EditableService/loadForm data.EditableServiceRestApi.loadForm +GET /data/EditableService/preCreate data.EditableServiceRestApi.preCreate +POST /data/EditableService/save data.EditableServiceRestApi.save +DELETE /data/OpenableService/delete data.OpenableServiceRestApi.delete +GET /data/OpenableService/exists data.OpenableServiceRestApi.exists +GET /data/OpenableService/getBrothers data.OpenableServiceRestApi.getBrothers +GET /data/OpenableService/getBrothersFromParent data.OpenableServiceRestApi.getBrothersFromParent +GET /data/OpenableService/getChildren data.OpenableServiceRestApi.getChildren +GET /data/OpenableService/getChildrenUpdate data.OpenableServiceRestApi.getChildrenUpdate +POST /data/OpenableService/getMandatoryDependencies data.OpenableServiceRestApi.getMandatoryDependencies +POST /data/OpenableService/getMandatoryDependenciesCount data.OpenableServiceRestApi.getMandatoryDependenciesCount +POST /data/OpenableService/getOptionalDependencies data.OpenableServiceRestApi.getOptionalDependencies +POST /data/OpenableService/getOptionalDependenciesCount data.OpenableServiceRestApi.getOptionalDependenciesCount +GET /data/OpenableService/loadDto data.OpenableServiceRestApi.loadDto +GET /data/OpenableService/loadForm data.OpenableServiceRestApi.loadForm +POST /data/OpenableService/move data.OpenableServiceRestApi.move +GET /data/OpenableService/preCreate data.OpenableServiceRestApi.preCreate +POST /data/OpenableService/save data.OpenableServiceRestApi.save +POST /data/RootOpenableService/computeMissingReferential data.RootOpenableServiceRestApi.computeMissingReferential +DELETE /data/RootOpenableService/delete data.RootOpenableServiceRestApi.delete +DELETE /data/RootOpenableService/deleteLayout data.RootOpenableServiceRestApi.deleteLayout +GET /data/RootOpenableService/exists data.RootOpenableServiceRestApi.exists +GET /data/RootOpenableService/getBrothers data.RootOpenableServiceRestApi.getBrothers +GET /data/RootOpenableService/getChildren data.RootOpenableServiceRestApi.getChildren +GET /data/RootOpenableService/getChildrenUpdate data.RootOpenableServiceRestApi.getChildrenUpdate +GET /data/RootOpenableService/getGroupByDtoValue data.RootOpenableServiceRestApi.getGroupByDtoValue +GET /data/RootOpenableService/getGroupByValue data.RootOpenableServiceRestApi.getGroupByValue +GET /data/RootOpenableService/loadDto data.RootOpenableServiceRestApi.loadDto +GET /data/RootOpenableService/loadForm data.RootOpenableServiceRestApi.loadForm +POST /data/RootOpenableService/moveLayout data.RootOpenableServiceRestApi.moveLayout +GET /data/RootOpenableService/preCreate data.RootOpenableServiceRestApi.preCreate +POST /data/RootOpenableService/save data.RootOpenableServiceRestApi.save +GET /data/SimpleService/loadForm data.SimpleServiceRestApi.loadForm +POST /data/SimpleService/save data.SimpleServiceRestApi.save +POST /data/ll/ActivityPairingService/applyPairing data.ll.ActivityPairingServiceRestApi.applyPairing +POST /data/ll/ActivityPairingService/computePairing data.ll.ActivityPairingServiceRestApi.computePairing +GET /data/ll/common/TripService/getAllTripIds data.ll.common.TripServiceRestApi.getAllTripIds +GET /data/ll/common/TripService/getLogbookCatchSpeciesIds data.ll.common.TripServiceRestApi.getLogbookCatchSpeciesIds +GET /data/ll/common/TripService/getMatchingTripsVesselWithinDateRange data.ll.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange +GET /data/ll/common/TripService/getSampleActivityParentCandidate data.ll.common.TripServiceRestApi.getSampleActivityParentCandidate +GET /data/ll/common/TripService/getSpeciesByListAndTrip data.ll.common.TripServiceRestApi.getSpeciesByListAndTrip +GET /data/ll/common/TripService/getTripMap data.ll.common.TripServiceRestApi.getTripMap +GET /data/ll/common/TripService/loadBranchlineForm data.ll.common.TripServiceRestApi.loadBranchlineForm +POST /data/ll/common/TripService/moveActivitySample data.ll.common.TripServiceRestApi.moveActivitySample +POST /data/ll/common/TripService/saveAndCopyProperties data.ll.common.TripServiceRestApi.saveAndCopyProperties +POST /data/ll/common/TripService/saveBranchline data.ll.common.TripServiceRestApi.saveBranchline +POST /data/ps/ActivityPairingService/applyPairing data.ps.ActivityPairingServiceRestApi.applyPairing +POST /data/ps/ActivityPairingService/computePairing data.ps.ActivityPairingServiceRestApi.computePairing +GET /data/ps/AvdthService/importData data.ps.AvdthServiceRestApi.importData +POST /data/ps/ConsolidateDataService/consolidateLocalmarketBatch data.ps.ConsolidateDataServiceRestApi.consolidateLocalmarketBatch +POST /data/ps/ConsolidateDataService/consolidateTrip data.ps.ConsolidateDataServiceRestApi.consolidateTrip +GET /data/ps/ConsolidateDataService/newSimplifiedObjectTypeManager data.ps.ConsolidateDataServiceRestApi.newSimplifiedObjectTypeManager +GET /data/ps/common/TripService/getAllTripIds data.ps.common.TripServiceRestApi.getAllTripIds +GET /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange +GET /data/ps/common/TripService/getSpeciesByListAndTrip data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip +GET /data/ps/common/TripService/getTripMap data.ps.common.TripServiceRestApi.getTripMap +GET /data/ps/common/TripService/isActivityEndOfSearchFound data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound +GET /data/ps/common/TripService/loadLocalmarketForm data.ps.common.TripServiceRestApi.loadLocalmarketForm +GET /data/ps/common/TripService/loadLogbookForm data.ps.common.TripServiceRestApi.loadLogbookForm +GET /data/ps/common/TripService/preCreateLogbookFloatingObject data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject +GET /data/ps/common/TripService/preCreateObservationFloatingObject data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject +POST /referential/ReferentialService/changeId referential.ReferentialServiceRestApi.changeId +DELETE /referential/ReferentialService/delete referential.ReferentialServiceRestApi.delete +GET /referential/ReferentialService/exists referential.ReferentialServiceRestApi.exists +GET /referential/ReferentialService/getEnabledReferentialLabelSet referential.ReferentialServiceRestApi.getEnabledReferentialLabelSet +GET /referential/ReferentialService/getReferenceSet referential.ReferentialServiceRestApi.getReferenceSet +POST /referential/ReferentialService/getReferentialIds referential.ReferentialServiceRestApi.getReferentialIds +GET /referential/ReferentialService/getReferentialReferenceSets referential.ReferentialServiceRestApi.getReferentialReferenceSets +POST /referential/ReferentialService/insertMissingReferential referential.ReferentialServiceRestApi.insertMissingReferential +GET /referential/ReferentialService/loadDto referential.ReferentialServiceRestApi.loadDto +POST /referential/ReferentialService/loadDtoList referential.ReferentialServiceRestApi.loadDtoList +GET /referential/ReferentialService/loadForm referential.ReferentialServiceRestApi.loadForm +GET /referential/ReferentialService/loadIds referential.ReferentialServiceRestApi.loadIds +GET /referential/ReferentialService/preCreate referential.ReferentialServiceRestApi.preCreate +POST /referential/ReferentialService/replaceReference referential.ReferentialServiceRestApi.replaceReference +POST /referential/ReferentialService/save referential.ReferentialServiceRestApi.save +POST /referential/SynchronizeService/applySql referential.SynchronizeServiceRestApi.applySql +POST /referential/SynchronizeService/filterIdsUsed referential.SynchronizeServiceRestApi.filterIdsUsed +POST /referential/SynchronizeService/getReferentialToDelete referential.SynchronizeServiceRestApi.getReferentialToDelete +POST /referential/SynchronizeService/produceSqlResult referential.SynchronizeServiceRestApi.produceSqlResult View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b2bfa34a22a670540366e8c0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b2bfa34a22a670540366e8c0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.18)
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 371b11fa by Tony Chemit at 2022-11-23T13:14:16+01:00 Site checkin for project ObServe (version 9.0.18) - - - - - 8 changed files: - + 9.0.18/CHANGELOG.html - + 9.0.18/architecture-logicielle.html - + 9.0.18/avdth/common.html - + 9.0.18/avdth/index.html - + 9.0.18/avdth/landing.html - + 9.0.18/avdth/local_market.html - + 9.0.18/avdth/logbook.html - + 9.0.18/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/371b11faf66b319ae473b5e39… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/371b11faf66b319ae473b5e39… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.18
by Tony CHEMIT (＠tchemit) 23 Nov '22

23 Nov '22

Tony CHEMIT deleted branch release/9.0.18 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0