[Git][ultreiaio/ird-observe][develop] 4 commits: La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la...

20 Mar 2024


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


Commits:
bbaef632 by Tony Chemit at 2024-03-20T14:51:13+01:00
La valeur du champs ps_observation.Catch.well a des fois la valeur vide, à la place de la valeur nulle - Closes #2857

- - - - -
6229d78f by Tony Chemit at 2024-03-20T14:51:13+01:00
Use updated check-services-types configuration

- - - - -
e8744294 by Tony Chemit at 2024-03-20T14:51:13+01:00
update pom

- - - - -
84da9a9a by Tony Chemit at 2024-03-20T14:51:13+01:00
fix Observations - Types d'activités par zones FPA report (missing GroupBy for postgresql)

- - - - -


7 changed files:

- core/api/services/pom.xml
- core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java
- + core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql
- core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report
- core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report
- pom.xml
- toolkit/api-services/pom.xml


Changes:

=====================================
core/api/services/pom.xml
=====================================
@@ -203,18 +203,30 @@
               <goal>check-services-types</goal>
             </goals>
             <configuration>
-              <acceptedTypes>
+              <acceptedParameterTypes>
                 <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
                 <acceptedType>java.lang.Class</acceptedType>
                 <acceptedType>java.lang.String</acceptedType>
-                <acceptedType>java.util.List</acceptedType>
+                <!--                <acceptedType>java.util.List</acceptedType>-->
                 <acceptedType>java.util.Set</acceptedType>
                 <acceptedType>java.util.Map</acceptedType>
                 <acceptedType>java.util.Date</acceptedType>
-              </acceptedTypes>
-              <acceptedAssignableTypes>
+              </acceptedParameterTypes>
+              <acceptedReturnTypes>
+                <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
+                <!--                <acceptedType>java.lang.Class</acceptedType>-->
+                <acceptedType>java.lang.String</acceptedType>
+                <acceptedType>java.util.List</acceptedType>
+                <acceptedType>java.util.Set</acceptedType>
+                <!--                <acceptedType>java.util.Map</acceptedType>-->
+                <acceptedType>java.util.Date</acceptedType>
+              </acceptedReturnTypes>
+              <acceptedAssignableParameterTypes>
+                <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
+              </acceptedAssignableParameterTypes>
+              <acceptedAssignableReturnTypes>
                 <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
-              </acceptedAssignableTypes>
+              </acceptedAssignableReturnTypes>
             </configuration>
           </execution>
         </executions>


=====================================
core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java
=====================================
@@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe
         if (withIds) {
             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044
             executor.addScript("01", "issue-2044");
+            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857
+            executor.addScript("02", "issue-2857");
         }
     }
 


=====================================
core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql
=====================================
@@ -0,0 +1,22 @@
+---
+-- #%L
+-- ObServe Core :: Persistence :: Migration
+-- %%
+-- Copyright (C) 2008 - 2024 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.Catch Set well = NULL Where well = '';


=====================================
core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report
=====================================
@@ -42,7 +42,8 @@ From fr.ird.observe.entities.data.ps.common.TripImpl m \
 Join m.routeObs r \
 Join r.activity a With a.currentFpaZone.id = :zoneFpaId \
 Join a.floatingObject dcp \
-Where m.id In :tripId
+Where m.id In :tripId \
+Group By a.currentFpaZone.code, a.currentFpaZone.@i18nColumnName@
 request.1.repeat.name=zoneFpaId
 request.1.repeat.layout=column
 request.1.comment=visite + peche / visite - peche / Deploiement + peche / Deploiement - peche / Modifie + peche / Modifie - peche / Retire + peche / Retire - peche / Abandonne + peche / Abandonne - peche / Coule + peche / Coule - peche / Remplace + peche / Remplace - peche / Autre ou ancien peche + peche / Autre ou ancien peche - peche / Nombre de tortues


=====================================
core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report
=====================================
@@ -34,14 +34,15 @@ request.1.layout=row
 request.1.request=Select r.date, Cast(a.time As java.sql.Time), \
 a.latitude, \
 a.longitude, \
-case when a.set.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \
+case when s.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \
 tc.species.faoCode, \
 Sum(tc.catchWeight), \
 tc.well \
 From TripImpl t \
 Join t.routeObs r \
-Join r.activity a \
-Join a.set.catches tc \
-Where t.id In :tripId and tc.well != null \
-Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, a.set.schoolType \
+Join r.activity a With a.set Is Not Null \
+Join a.set s With s.catches Is Not Empty \
+Join s.catches tc With tc.well Is Not Null And tc.well != '' \
+Where t.id In :tripId \
+Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, s.schoolType \
 Order By r.date, a.time, tc.species, tc.well


=====================================
pom.xml
=====================================
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2024.13</version>
+    <version>2024.14</version>
   </parent>
   <groupId>fr.ird.observe</groupId>
   <artifactId>ird-observe</artifactId>


=====================================
toolkit/api-services/pom.xml
=====================================
@@ -154,18 +154,30 @@
               <goal>check-services-types</goal>
             </goals>
             <configuration>
-              <acceptedTypes>
+              <acceptedParameterTypes>
                 <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
                 <acceptedType>java.lang.Class</acceptedType>
                 <acceptedType>java.lang.String</acceptedType>
-                <acceptedType>java.util.List</acceptedType>
+<!--                <acceptedType>java.util.List</acceptedType>-->
                 <acceptedType>java.util.Set</acceptedType>
                 <acceptedType>java.util.Map</acceptedType>
                 <acceptedType>java.util.Date</acceptedType>
-              </acceptedTypes>
-              <acceptedAssignableTypes>
+              </acceptedParameterTypes>
+              <acceptedReturnTypes>
+                <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
+<!--                <acceptedType>java.lang.Class</acceptedType>-->
+                <acceptedType>java.lang.String</acceptedType>
+                <acceptedType>java.util.List</acceptedType>
+                <acceptedType>java.util.Set</acceptedType>
+<!--                <acceptedType>java.util.Map</acceptedType>-->
+                <acceptedType>java.util.Date</acceptedType>
+              </acceptedReturnTypes>
+              <acceptedAssignableParameterTypes>
+                <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
+              </acceptedAssignableParameterTypes>
+              <acceptedAssignableReturnTypes>
                 <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
-              </acceptedAssignableTypes>
+              </acceptedAssignableReturnTypes>
             </configuration>
           </execution>
         </executions>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52f465b8c60de2af1cde0be84...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52f465b8c60de2af1cde0be84...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)