Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 953f4cbe by Tony Chemit at 2022-04-26T14:05:31+02:00 Erreur non explicitée s'il manque l'information de base par défaut - Closes #2284 - - - - - b090ae7c by Tony Chemit at 2022-04-26T14:33:33+02:00 update pom - - - - - 9b4f96e9 by Tony Chemit at 2022-04-26T15:55:35+02:00 fix not composite relation - - - - - 3c94bea0 by Tony Chemit at 2022-04-26T16:26:05+02:00 fix not composite relation - - - - - 0ea354f2 by Tony Chemit at 2022-04-27T07:11:20+02:00 update topia extension - - - - - 7 changed files: - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.hbm.xml - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - model/src/main/models/Observe/persistence/31-data-ll-logbook.model - pom.xml - server/configuration/src/test/java/fr/ird/observe/dto/server/ServerModelTest.java - + server/configuration/src/test/resources/META-INF/configuration/security-2284-3.yml Changes: ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml ===================================== @@ -56,7 +56,7 @@ <many-to-one name="vesselActivity" class="fr.ird.observe.entities.referential.ll.common.VesselActivityImpl" column="vesselActivity" foreign-key="fk_ll_logbook_activity_vesselactivity" lazy="false" not-null="true" /> <many-to-one name="dataQuality" class="fr.ird.observe.entities.referential.common.DataQualityImpl" column="dataQuality" foreign-key="fk_ll_logbook_activity_dataquality" /> <many-to-one name="fpaZone" class="fr.ird.observe.entities.referential.common.FpaZoneImpl" column="fpaZone" foreign-key="fk_ll_logbook_activity_fpazone" /> - <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ll.observation.ActivityImpl" column="relatedObservedActivity" cascade="delete" foreign-key="fk_ll_logbook_activity_relatedobservedactivity" /> + <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ll.observation.ActivityImpl" column="relatedObservedActivity" foreign-key="fk_ll_logbook_activity_relatedobservedactivity" /> <many-to-one name="set" class="fr.ird.observe.entities.data.ll.logbook.SetImpl" column="set" cascade="delete-orphan" foreign-key="fk_ll_logbook_activity_set" not-null="false" unique="true" unique-key="uk_ll_logbook_activity_set" /> <many-to-one name="sample" class="fr.ird.observe.entities.data.ll.logbook.SampleImpl" column="sample" cascade="delete-orphan" foreign-key="fk_ll_logbook_activity_sample" not-null="false" unique="true" unique-key="uk_ll_logbook_activity_sample" /> </class> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.hbm.xml ===================================== @@ -74,7 +74,7 @@ </property> <property name="currentDirection" access="field" type="java.lang.Integer" column="currentDirection"/> <many-to-one name="schoolType" class="fr.ird.observe.entities.referential.ps.common.SchoolTypeImpl" column="schoolType" foreign-key="fk_ps_logbook_activity_schooltype" /> - <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ps.observation.ActivityImpl" column="relatedObservedActivity" cascade="delete" foreign-key="fk_ps_logbook_activity_relatedobservedactivity" /> + <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ps.observation.ActivityImpl" column="relatedObservedActivity" foreign-key="fk_ps_logbook_activity_relatedobservedactivity" /> <list name="catches" lazy="true" cascade="all,delete-orphan" > <key column="activity" foreign-key="fk_ps_logbook_activity_catches" not-null="true" /> <list-index column="activity_idx"/> ===================================== model/src/main/models/Observe/persistence/21-data-ps-logbook.model ===================================== @@ -20,7 +20,7 @@ totalWeight + {*:1} Float currentSpeed + {*:1} Float currentDirection + {*:1} Integer schoolType {*:1} referential.ps.common.SchoolType -relatedObservedActivity + {0..1} data.ps.observation.Activity +relatedObservedActivity {0..1} data.ps.observation.Activity catches + {*} data.ps.logbook.Catch floatingObject + {*} data.ps.logbook.FloatingObject observedSystem {*:*} referential.ps.common.ObservedSystem ===================================== model/src/main/models/Observe/persistence/31-data-ll-logbook.model ===================================== @@ -14,7 +14,7 @@ currentDirection + {*:1} Integer vesselActivity {*:1} referential.ll.common.VesselActivity dataQuality {*:0..1} referential.common.DataQuality fpaZone {*:1} referential.common.FpaZone -relatedObservedActivity + {0..1} data.ll.observation.Activity +relatedObservedActivity {0..1} data.ll.observation.Activity set + {0..1} data.ll.logbook.Set sample + {0..1} data.ll.logbook.Sample ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.44</version> + <version>2022.45</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -156,6 +156,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> <lib.version.toolkit>6.0.10</lib.version.toolkit> + <lib.version.java4all.topia>1.75</lib.version.java4all.topia> <lib.version.ognl>3.1.29</lib.version.ognl> <!-- FIXME <lib.version.ognl>3.3.2</lib.version.ognl>--> <lib.version.h2>1.4.196</lib.version.h2> ===================================== server/configuration/src/test/java/fr/ird/observe/dto/server/ServerModelTest.java ===================================== @@ -73,6 +73,17 @@ public class ServerModelTest { } catch (InvalidServerModelException e) { Assert.assertEquals("Should have found this message error", "No default databases defined", e.getMessage()); } + + securityConfiguration = new ServerResources.ConfigResource2("/META-INF/configuration/security-2284-3.yml"); + + content = String.join("\n", securityConfiguration.readLines()); + model = ServerModelHelper.load(content); + try { + ServerModelHelper.validate(model); + Assert.fail("Should have an error"); + } catch (InvalidServerModelException e) { + Assert.assertEquals("Should have found this message error", "No default databases defined", e.getMessage()); + } } @Test ===================================== server/configuration/src/test/resources/META-INF/configuration/security-2284-3.yml ===================================== @@ -0,0 +1,43 @@ +roles: + - &role-admin + password: a + - &role-technicien + password: a + - &role-referentiel + password: a + - &role-test + password: a +databases: + - &db-production + url: jdbc:postgresql://localhost:5432/obstuna-production + defaultDatabase: false + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - &db-test + url: jdbc:postgresql://localhost:5432/obstuna-test + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - *role-test +users: + - login: utilisateur-technicien + password: a + permissions: + - database: *db-production + role: *role-technicien + apiAccess: ALL + validationMode: STRONG + - database: *db-test + role: *role-technicien + apiAccess: PUBLIC + validationMode: PERMISSIVE + - login: utilisateur-referentiel + password: a + permissions: + - database: *db-production + role: *role-referentiel + apiAccess: CLIENT + validationMode: NONE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ef773d124164437c4e7ee270... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ef773d124164437c4e7ee270... You're receiving this email because of your account on gitlab.com.