GitLab

at 2023-12-11T09:15:48+01:00

Add migration script to remove redundant TransmittingBuoy.country

Add validation rule on TransmittingBuoyDto.country

Merge branch 'feature/issue-2821' into develop
En prévision du peaufinage des forms Balise, effacer le Pays si le Navire est connu
- See #2821

Improve Report tests

       {

         "name": "country",

         "comments": [

-          "check if referential country is disabled (only if validation is strong)"

+          "check if referential country is disabled (only if validation is strong)",

+          "country must be null if vessel is filled"

         ]

       },

       {

       {

         "name": "country",

         "comments": [

-          "check if referential country is disabled (only if validation is strong)"

+          "check if referential country is disabled (only if validation is strong)",

+          "country must be null if vessel is filled"

         ]

       },

       {

       {

         "name": "country",

         "comments": [

-          "check if referential country is disabled (only if validation is strong)"

+          "check if referential country is disabled (only if validation is strong)",

+          "country must be null if vessel is filled"

         ]

       },

       {

       {

         "name": "country",

         "comments": [

-          "check if referential country is disabled (only if validation is strong)"

+          "check if referential country is disabled (only if validation is strong)",

+          "country must be null if vessel is filled"

         ]

       },

       {

 observe.data.ps.SampleSpecies.validation.mismatch.measuredCount

 observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber

 observe.data.ps.TransmittingBuoy.validation.code

+observe.data.ps.TransmittingBuoy.validation.country.not.required

 observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled

 observe.data.ps.common.Trip.departureWellContentStatus.validation.required

 observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled

     <field-validator type="checkDisabledReferentialOnErrorScope">

       <message/>

     </field-validator>

+

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

   </field>

   <field name="homeId">

     <field-validator type="checkDisabledReferentialOnErrorScope">

       <message/>

     </field-validator>

+

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

   </field>

   <field name="homeId">

     <field-validator type="checkDisabledReferentialOnErrorScope">

       <message/>

     </field-validator>

+

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

   </field>

   <field name="homeId">

     <field-validator type="checkDisabledReferentialOnErrorScope">

       <message/>

     </field-validator>

+

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

   </field>

   <field name="homeId">

       <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message>

     </field-validator>

   </field>

+  <field name="country">

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

+  </field>

 </validators>
       <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message>

     </field-validator>

   </field>

+  <field name="country">

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

+  </field>

 </validators>
       <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message>

     </field-validator>

   </field>

+  <field name="country">

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

+  </field>

 </validators>
       <message>observe.data.ps.TransmittingBuoy.validation.code##${code}##${transmittingBuoyType.regex}</message>

     </field-validator>

   </field>

+  <field name="country">

+    <!-- country must be null if vessel is filled -->

+    <field-validator type="fieldexpression">

+      <param name="expression"><![CDATA[ country == null || vessel == null ]]></param>

+      <message>observe.data.ps.TransmittingBuoy.validation.country.not.required</message>

+    </field-validator>

+  </field>

 </validators>
         if (withIds) {

             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044

             executor.addScript("01", "issue-2044");

+            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2821

+            executor.addScript("02", "issue-2821");

         }

     }

+---

+-- #%L

+-- ObServe Core :: Persistence :: Migration

+-- %%

+-- Copyright (C) 2008 - 2023 IRD, Ultreia.io

+-- %%

+-- This program is free software: you can redistribute it and/or modify

+-- it under the terms of the GNU General Public License as

+-- published by the Free Software Foundation, either version 3 of the

+-- License, or (at your option) any later version.

+--

+-- This program is distributed in the hope that it will be useful,

+-- but WITHOUT ANY WARRANTY; without even the implied warranty of

+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+-- GNU General Public License for more details.

+--

+-- You should have received a copy of the GNU General Public

+-- License along with this program.  If not, see

+-- <http://www.gnu.org/licenses/gpl-3.0.html>.

+-- #L%

+---

+UPDATE ps_observation.TransmittingBuoy SET country = NULL WHERE vessel IS NOT NULL;

+UPDATE ps_logbook.TransmittingBuoy SET country = NULL WHERE vessel IS NOT NULL;
   },

   "country": {

     "errors": [

-      "check if referential country is disabled (only if validation is strong)"

+      "check if referential country is disabled (only if validation is strong)",

+      "country must be null if vessel is filled"

     ],

     "warnings": [

       "check if referential country is disabled (only if validation is not strong)"

   },

   "country": {

     "errors": [

-      "check if referential country is disabled (only if validation is strong)"

+      "check if referential country is disabled (only if validation is strong)",

+      "country must be null if vessel is filled"

     ],

     "warnings": [

       "check if referential country is disabled (only if validation is not strong)"

   },

   "country": {

     "errors": [

-      "check if referential country is disabled (only if validation is strong)"

+      "check if referential country is disabled (only if validation is strong)",

+      "country must be null if vessel is filled"

     ],

     "warnings": [

       "check if referential country is disabled (only if validation is not strong)"

   },

   "country": {

     "errors": [

-      "check if referential country is disabled (only if validation is strong)"

+      "check if referential country is disabled (only if validation is strong)",

+      "country must be null if vessel is filled"

     ],

     "warnings": [

       "check if referential country is disabled (only if validation is not strong)"

+package fr.ird.observe.services.client.service;

+

+/*-

+ * #%L

+ * ObServe Core :: Services :: Client

+ * %%

+ * Copyright (C) 2008 - 2023 IRD, Ultreia.io

+ * %%

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation, either version 3 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public

+ * License along with this program.  If not, see

+ * <http://www.gnu.org/licenses/gpl-3.0.html>.

+ * #L%

+ */

+

+import fr.ird.observe.services.service.ReportService;

+import fr.ird.observe.services.service.ReportServiceFixtures;

+import org.junit.Test;

+import org.junit.runners.Parameterized;

+

+import java.util.Set;

+

+/**

+ * Created at 11/12/2023.

+ *

+ * @author Tony Chemit - dev@tchemit.fr

+ * @since 9.3.0

+ */

+public class ReportsTest extends ServiceClientTestSupportRead<ReportService> {

+

+    protected static final ReportServiceFixtures fixtures = new ReportServiceFixtures();

+

+    @Parameterized.Parameter

+    public String reportId;

+

+    public ReportsTest() {

+        super(ReportService.class);

+    }

+

+    @Parameterized.Parameters(name = "{0}")

+    public static Set<String> data() {

+        return ReportServiceFixtures.getReports().keySet();

+    }

+

+    @Test

+    public void tesReport() {

+        ReportService service = getService();

+        fixtures.executeReport(service, reportId);

+    }

+}
 observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s)

 observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=The sub sample number must be strictly positive if the sample is a « super sample ».

 observe.data.ps.TransmittingBuoy.validation.code=The buoy identifier (%s) does not respect the following regular expression «%s».

+observe.data.ps.TransmittingBuoy.validation.country.not.required=Country not required if vessel is filled.

 observe.data.ps.common.Trip.action.move.all=Move all

 observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip

 observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip

 observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s)

 observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=The sub sample number must be strictly positive if the sample is a « super sample ». \#TODO

 observe.data.ps.TransmittingBuoy.validation.code=El identificador de boya ingresado (%s) no respeta la sintaxis definida por la expresión regular “%s”.

+observe.data.ps.TransmittingBuoy.validation.country.not.required=Country not required if vessel is filled. \#TODO

 observe.data.ps.common.Trip.action.move.all=Move all

 observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip

 observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip

 observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Le nombre mesuré (%s) doit valoir la somme des effectifs de fréquences (%s)

 observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=Le numéro de sous-échantillon doit être strictement positif si l'échantillon est un « super échantillon ».

 observe.data.ps.TransmittingBuoy.validation.code=L'identifiant de balise (%s) ne respecte pas la syntaxe définie via l'expression régulière «%s».

+observe.data.ps.TransmittingBuoy.validation.country.not.required=Le pavillon ne doit pas être renseigné si le navire est renseigné.

 observe.data.ps.common.Trip.action.move.all=Déplacer des données

 observe.data.ps.common.Trip.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les données sélectionnées ?

 observe.data.ps.common.Trip.action.move.all.choose.parent.title=Changer la marée des données sélectionnées

  */

 import fr.ird.observe.report.Report;

-import fr.ird.observe.services.service.ReportService;

-import org.junit.Ignore;

+import fr.ird.observe.services.service.ReportServiceFixtures;

 import org.junit.Test;

-import javax.annotation.Generated;

 import java.util.Map;

-@Generated(value = "io.ultreia.java4all.http.maven.plugin.test.GenerateApiImplMojo", date = "Mon Nov 14 16:20:02 CET 2022")

 public class ReportServiceLocalReadTest extends GeneratedReportServiceLocalReadTest {

     @Test

     public void loadDefault() {

-        ReportService service = getService();

-        Map<String, Report> reports = fixtures.getReports();

+        Map<String, Report> reports = ReportServiceFixtures.getReports();

         fixtures.assertReports(reports);

     }

-    //FIXME Generate a method for each report

-    @Ignore

-    @Test

-    public void executeReportLlLanding() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "llLanding");

-    }

-    @Ignore

-    @Test

-    public void executeReportLlLogbookActivities() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "llLogbookActivities");

-    }

-

-    @Ignore

-    @Test

-    public void executeReportLlLogbookCatches() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "llLogbookCatches");

-    }

-  @Ignore

-    @Test

-    public void executeReportLlLogbookSamplesOnActivity() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "llLogbookSamplesOnActivity");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationLengthsDistribution() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationLengthsDistribution");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationCatchTotalCountByGroupPerSpeciesFate() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationCatchTotalCountByGroupPerSpeciesFate");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationCatchWeightByGroupPerSpeciesFate() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationCatchWeightByGroupPerSpeciesFate");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationCatchWeightByGroupPerReasonForDiscard() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationCatchWeightByGroupPerReasonForDiscard");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationCatchTotalCountByGroupPerReasonForDiscard() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationCatchTotalCountByGroupPerReasonForDiscard");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation");

-    }

-

-    @Test

-    @Ignore

-    public void executeReportPsLogbookWellPlanCheck() {

-        ReportService service = getService();

-        fixtures.executeReport(service, "psLogbookWellPlanCheck");

-    }

 }
+package fr.ird.observe.services.local.service;

+

+/*-

+ * #%L

+ * ObServe Core :: Services :: Local

+ * %%

+ * Copyright (C) 2008 - 2023 IRD, Ultreia.io

+ * %%

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation, either version 3 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public

+ * License along with this program.  If not, see

+ * <http://www.gnu.org/licenses/gpl-3.0.html>.

+ * #L%

+ */

+

+import fr.ird.observe.services.service.ReportService;

+import fr.ird.observe.services.service.ReportServiceFixtures;

+import org.junit.Test;

+import org.junit.runner.RunWith;

+import org.junit.runners.Parameterized;

+

+import java.util.Set;

+

+/**

+ * Created at 11/12/2023.

+ *

+ * @author Tony Chemit - dev@tchemit.fr

+ * @since 9.3.0

+ */

+@RunWith(Parameterized.class)

+public class ReportsTest extends ServiceLocalTestSupportRead<ReportService> {

+

+    protected static final ReportServiceFixtures fixtures = new ReportServiceFixtures();

+

+    @Parameterized.Parameter

+    public String reportId;

+

+    public ReportsTest() {

+        super(ReportService.class);

+    }

+

+    @Parameterized.Parameters(name = "{0}")

+    public static Set<String> data() {

+        return ReportServiceFixtures.getReports().keySet();

+    }

+

+    @Test

+    public void tesReport() {

+        ReportService service = getService();

+        fixtures.executeReport(service, reportId);

+    }

+}
                         "lastUpdateDate": "2021-02-09T09:41:09.117Z"

                       },

                       "messages": [

+                        {

+                          "fieldName": "country",

+                          "scope": "ERROR",

+                          "message": "Le pavillon ne doit pas être renseigné si le navire est renseigné."

+                        },

                         {

                           "fieldName": "transmittingBuoyType",

                           "scope": "WARNING",

                 "topiaVersion": 8,

                 "lastUpdateDate": "2021-03-28T20:24:25.360Z"

               },

+              "children": [

+                {

+                  "datum": {

+                    "text": " DCP Abandonné (sans balise, non détruit, non coulé)",

+                    "type": "fr.ird.observe.dto.data.ps.logbook.FloatingObjectDto",

+                    "id": "fr.ird.data.ps.logbook.FloatingObject#1616955224271#0.8748844202241",

+                    "topiaVersion": 3,

+                    "lastUpdateDate": "2021-03-28T20:15:12.010Z"

+                  },

+                  "children": [

+                    {

+                      "datum": {

+                        "text": "Marine Instrument (ou Nautical) modèle indéterminé##Mise à l'eau##12##sd",

+                        "type": "fr.ird.observe.dto.data.ps.logbook.TransmittingBuoyDto",

+                        "id": "fr.ird.data.ps.logbook.TransmittingBuoy#1616955224272#0.1758599871793043",

+                        "topiaVersion": 1,

+                        "lastUpdateDate": "2021-03-28T20:13:44.266Z"

+                      },

+                      "messages": [

+                        {

+                          "fieldName": "country",

+                          "scope": "ERROR",

+                          "message": "Le pavillon ne doit pas être renseigné si le navire est renseigné."

+                        }

+                      ]

+                    }

+                  ]

+                }

+              ],

               "messages": [

                 {

                   "fieldName": "schoolType",

...	...	@@ -11820,7 +11820,8 @@
11820	11820	{
11821	11821	"name": "country",
11822	11822	"comments": [
11823		- "check if referential country is disabled (only if validation is strong)"
	11823	+ "check if referential country is disabled (only if validation is strong)",
	11824	+ "country must be null if vessel is filled"
11824	11825	]
11825	11826	},
11826	11827	{
...	...	@@ -11944,7 +11945,8 @@
11944	11945	{
11945	11946	"name": "country",
11946	11947	"comments": [
11947		- "check if referential country is disabled (only if validation is strong)"
	11948	+ "check if referential country is disabled (only if validation is strong)",
	11949	+ "country must be null if vessel is filled"
11948	11950	]
11949	11951	},
11950	11952	{
...	...	@@ -14990,7 +14992,8 @@
14990	14992	{
14991	14993	"name": "country",
14992	14994	"comments": [
14993		- "check if referential country is disabled (only if validation is strong)"
	14995	+ "check if referential country is disabled (only if validation is strong)",
	14996	+ "country must be null if vessel is filled"
14994	14997	]
14995	14998	},
14996	14999	{
...	...	@@ -15114,7 +15117,8 @@
15114	15117	{
15115	15118	"name": "country",
15116	15119	"comments": [
15117		- "check if referential country is disabled (only if validation is strong)"
	15120	+ "check if referential country is disabled (only if validation is strong)",
	15121	+ "country must be null if vessel is filled"
15118	15122	]
15119	15123	},
15120	15124	{

...	...	@@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe
49	49	if (withIds) {
50	50	// See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044
51	51	executor.addScript("01", "issue-2044");
	52	+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2821
	53	+ executor.addScript("02", "issue-2821");
52	54	}
53	55	}
54	56

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

Commits:

23 changed files:

Changes: