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

[Git][ultreiaio/ird-observe][develop] 5 commits: Add more TimeLog and fix log.debug issues in ReportRequestExecutor
by Tony CHEMIT (＠tchemit) 16 Mar '24

16 Mar '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 88b13f8a by Tony Chemit at 2024-03-16T13:06:10+01:00 Add more TimeLog and fix log.debug issues in ReportRequestExecutor - - - - - 71e34b77 by Tony Chemit at 2024-03-16T13:15:56+01:00 Optimisation du rapport Livre de bord - Vérification des plan de cuves - Closes #2849 - - - - - 0a4cdf76 by Tony Chemit at 2024-03-16T13:33:34+01:00 Optimisation du rapport Livre de bord - Plan de cuves - Closes #2850 - - - - - d07f7bc5 by Tony Chemit at 2024-03-16T15:48:14+01:00 Optimisation du rapport Observations - Utilisation des FOB, tableau simplifiée - Closes #2851 - - - - - c375649a by Tony Chemit at 2024-03-16T15:48:14+01:00 Optimisation du rapport Observations - Utilisation des FOB, tableau détaillé - Closes #2852 - - - - - 10 changed files: - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookWellPlan.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookWellPlanCheck.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationFobUsageExtended.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationFobUsageMinimal.report - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationFobUsageExtendedReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationFobUsageMinimalReportFixture.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationFobUsageExtended.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationFobUsageMinimal.properties - toolkit/api-report/src/main/java/fr/ird/observe/report/ReportRequestExecutor.java Changes: ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookWellPlan.report ===================================== @@ -39,19 +39,16 @@ w.well, \ r.date, \ a.number, \ Cast(a.time As java.sql.Time), \ -species.@i18nColumnName@, \ -weightCategory.@i18nColumnName@, \ +was.species.@i18nColumnName@, \ +was.weightCategory.@i18nColumnName@, \ was.weight \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join was.species species \ -Join was.weightCategory weightCategory \ Join t.routeLogbook r \ Join r.activity a \ Join t.vessel vessel \ Left Join a.vesselActivity vesselActivity \ -Left Join a.schoolType schoolType \ Where t.id In :tripId and wa.activity = a \ Order By vessel.code,t.startDate,t.endDate,w.well,r.date,a.time ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookWellPlanCheck.report ===================================== @@ -29,16 +29,6 @@ description.es= columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence columns.en=Vessel code,Vessel name,Departure date,Landing date,Day of route,Activity number,Activity hour,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook others,Well plan YFT,Well plan SKJ,Well plan BET,Well plan ALB,Well plan others,Logbook Total,Well plan Total,Difference columns.es= -repeatVariable.1.name=activity -repeatVariable.1.type=fr.ird.observe.entities.data.ps.logbook.Activity -repeatVariable.1.request=Select a \ -From TripImpl t \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Order By vessel.code,t.startDate,r.date,a.number,a.time request.1.location=0,0 request.1.layout=row request.1.request=Select vessel.code,\ @@ -47,74 +37,33 @@ t.startDate, \ t.endDate, \ r.date, \ a.number, \ -Cast(a.time As java.sql.Time) \ -From TripImpl t \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Where t.id In :tripId and a = :activity -request.1.repeat.name=activity -request.1.repeat.layout=column -request.2.location=7,0 -request.2.layout=row -request.2.request=Select \ -Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ -Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ -Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ -Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then ct.weight Else 0.0 End), \ -Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ +Cast(a.time As java.sql.Time), \ +(Select Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End) From fr.ird.observe.entities.data.ps.logbook.ActivityImpl aa Join a.catches ct Where aa = a), \ +(Select Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End) From fr.ird.observe.entities.data.ps.logbook.ActivityImpl aa Join a.catches ct Where aa = a), \ +(Select Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End) From fr.ird.observe.entities.data.ps.logbook.ActivityImpl aa Join a.catches ct Where aa = a), \ +(Select Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then ct.weight Else 0.0 End) From fr.ird.observe.entities.data.ps.logbook.ActivityImpl aa Join a.catches ct Where aa = a), \ +(Select Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ -Else ct.weight End) \ -From TripImpl t \ -Join t.routeLogbook r \ -Join r.activity a \ -Join a.catches ct \ -Where t.id In :tripId and a = :activity -request.2.repeat.name=activity -request.2.repeat.layout=column -request.3.location=12,0 -request.3.layout=row -request.3.request=Select \ -Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ -Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ -Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ -Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then was.weight Else 0.0 End), \ -Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ +Else ct.weight End) From fr.ird.observe.entities.data.ps.logbook.ActivityImpl aa Join a.catches ct Where aa = a), \ +(Select Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End) From WellActivityImpl wa Join wa.wellActivitySpecies was Where wa.activity = a), \ +(Select Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End) From WellActivityImpl wa Join wa.wellActivitySpecies was Where wa.activity = a), \ +(Select Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End) From WellActivityImpl wa Join wa.wellActivitySpecies was Where wa.activity = a), \ +(Select Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then was.weight Else 0.0 End) From WellActivityImpl wa Join wa.wellActivitySpecies was Where wa.activity = a), \ +(Select Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ -Else was.weight End) \ -From TripImpl t \ -Join t.well w \ -Join w.wellActivity wa \ -Join wa.wellActivitySpecies was \ -Where t.id In :tripId and wa.activity = :activity -request.3.repeat.name=activity -request.3.repeat.layout=column -request.4.location=17,0 -request.4.layout=row -request.4.request=Select \ -Sum(ct.weight) \ +Else was.weight End) From WellActivityImpl wa Join wa.wellActivitySpecies was Where wa.activity = a), \ +(Select Sum(ct.weight) From fr.ird.observe.entities.data.ps.logbook.ActivityImpl aa Join a.catches ct Where aa = a), \ +(Select Sum(was.weight) From WellActivityImpl wa Join wa.wellActivitySpecies was Where wa.activity = a) \ From TripImpl t \ Join t.routeLogbook r \ -Join r.activity a \ -Join a.catches ct \ -Where t.id In :tripId and a = :activity -request.4.repeat.name=activity -request.4.repeat.layout=column -request.5.location=18,0 -request.5.layout=row -request.5.request=Select \ -Sum(was.weight) \ -From TripImpl t \ -Join t.well w \ -Join w.wellActivity wa \ -Join wa.wellActivitySpecies was \ -Where t.id In :tripId and wa.activity = :activity -request.5.repeat.name=activity -request.5.repeat.layout=column +Join r.activity a With a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Join t.vessel vessel \ +Where t.id In :tripId \ +Order By vessel.code,t.startDate,r.date,a.number,a.time operations.1.type=SubtractColum operations.1.parameters=17|18|19 operations.2.type=SumColumn ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationFobUsageExtended.report ===================================== @@ -33,17 +33,20 @@ repeatVariable.1.name=typeObjetId repeatVariable.1.type=java.lang.String repeatVariable.1.request=Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ -Where standardCode is not null \ -And standardCode != '' \ -And (Select Count(dcp) \ +Where om.standardCode is not null \ +And om.standardCode != '' \ +And (om.standardCode In (Select Distinct(dcp.computedWhenArrivingSimplifiedObjectType) \ From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.routeObs r \ Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ -) > 0 +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId ) Or om.standardCode In (Select Distinct(dcp.computedWhenLeavingSimplifiedObjectType) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeObs r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId )) \ +Order by om.standardCode request.1.location=0,0 request.1.layout=row request.1.request=Select concat(str(om.standardCode) , ' - ', om.@i18nColumnName@) \ @@ -55,258 +58,30 @@ request.1.repeat.name=typeObjetId request.1.repeat.layout=column request.2.location=1,0 request.2.layout=row -request.2.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' +request.2.request=Select \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' Or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' Or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectObservedSpecies Is Not Empty Then (Select Sum(efo.count) From fr.ird.observe.entities.data.ps.observation.FloatingObjectImpl dcp1 Join dcp1.objectObservedSpecies efo With efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' Where dcp1 = dcp) Else 0 End) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeObs r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ +Where \ +m.id In :tripId request.2.repeat.name=typeObjetId request.2.repeat.layout=column -request.2.comment=visite + peche -request.3.location=2,0 -request.3.layout=row -request.3.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.3.repeat.name=typeObjetId -request.3.repeat.layout=column -request.3.comment=visite - peche -request.4.location=3,0 -request.4.layout=row -request.4.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.4.repeat.name=typeObjetId -request.4.repeat.layout=column -request.4.comment=Deploiement + peche -request.5.location=4,0 -request.5.layout=row -request.5.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.5.repeat.name=typeObjetId -request.5.repeat.layout=column -request.5.comment=Deploiement - peche -request.6.location=5,0 -request.6.layout=row -request.6.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.6.repeat.name=typeObjetId -request.6.repeat.layout=column -request.6.comment=Modifie + peche -request.7.location=6,0 -request.7.layout=row -request.7.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.7.repeat.name=typeObjetId -request.7.repeat.layout=column -request.7.comment=Modifie - peche -request.8.location=7,0 -request.8.layout=row -request.8.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.8.repeat.name=typeObjetId -request.8.repeat.layout=column -request.8.comment=Retire + peche -request.9.location=8,0 -request.9.layout=row -request.9.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.9.repeat.name=typeObjetId -request.9.repeat.layout=column -request.9.comment=Retire - peche -request.10.location=9,0 -request.10.layout=row -request.10.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.10.repeat.name=typeObjetId -request.10.repeat.layout=column -request.10.comment=Abandonne + peche -request.11.location=10,0 -request.11.layout=row -request.11.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.11.repeat.name=typeObjetId -request.11.repeat.layout=column -request.11.comment=Abandonne - peche -request.12.location=11,0 -request.12.layout=row -request.12.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.12.repeat.name=typeObjetId -request.12.repeat.layout=column -request.12.comment=Coule + peche -request.13.location=12,0 -request.13.layout=row -request.13.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.13.repeat.name=typeObjetId -request.13.repeat.layout=column -request.13.comment=Coule - peche -request.14.location=13,0 -request.14.layout=row -request.14.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.14.repeat.name=typeObjetId -request.14.repeat.layout=column -request.14.comment=Remplace + peche -request.15.location=14,0 -request.15.layout=row -request.15.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.15.repeat.name=typeObjetId -request.15.repeat.layout=column -request.15.comment=Remplace - peche -request.16.location=15,0 -request.16.layout=row -request.16.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ -or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.16.repeat.name=typeObjetId -request.16.repeat.layout=column -request.16.comment=Autre ou ancien peche + peche -request.17.location=16,0 -request.17.layout=row -request.17.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ -or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' -request.17.repeat.name=typeObjetId -request.17.repeat.layout=column -request.17.comment=Autre ou ancien peche - peche -request.18.location=17,0 -request.18.layout=row -request.18.request=Select Sum(efo.count) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Join dcp.objectObservedSpecies efo \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' -request.18.repeat.name=typeObjetId -request.18.repeat.layout=column -request.18.comment=Nombre de tortues +request.2.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/psObservationFobUsageMinimal.report ===================================== @@ -33,17 +33,20 @@ repeatVariable.1.name=typeObjetId repeatVariable.1.type=java.lang.String repeatVariable.1.request=Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ -Where standardCode is not null \ -And standardCode != '' \ -And (Select Count(dcp) \ +Where om.standardCode is not null \ +And om.standardCode != '' \ +And (om.standardCode In (Select Distinct(dcp.computedWhenArrivingSimplifiedObjectType) \ From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.routeObs r \ Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ -) > 0 +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId ) Or om.standardCode In (Select Distinct(dcp.computedWhenLeavingSimplifiedObjectType) \ +From fr.ird.observe.entities.data.ps.common.TripImpl m \ +Join m.routeObs r \ +Join r.activity a \ +Join a.floatingObject dcp With dcp.computedWhenLeavingSimplifiedObjectType Is Not Null \ +Where m.id In :tripId )) \ +Order by om.standardCode repeatVariable.1.comment=liste des types CECOFAD en presence sur les donnees selectionnees request.1.location=0,0 request.1.layout=row @@ -56,74 +59,31 @@ request.1.repeat.name=typeObjetId request.1.repeat.layout=column request.2.location=1,0 request.2.layout=row -request.2.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ +request.2.request=Select \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' And (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ -or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') -request.2.repeat.name=typeObjetId -request.2.repeat.layout=column -request.2.comment=rencontres + peches -request.3.location=2,0 -request.3.layout=row -request.3.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' And (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ -or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') -request.3.repeat.name=typeObjetId -request.3.repeat.layout=column -request.3.comment=rencontres - peches -request.4.location=3,0 -request.4.layout=row -request.4.request=Select Count(dcp) \ -From fr.ird.observe.entities.data.ps.common.TripImpl m \ -Join m.routeObs r \ -Join r.activity a \ -Join a.floatingObject dcp \ -Where \ -m.id In :tripId \ -and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ -and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' -request.4.repeat.name=typeObjetId -request.4.repeat.layout=column -request.4.comment=deployes -request.5.location=4,0 -request.5.layout=row -request.5.request=Select Sum(efo.count) \ +or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId And dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' Then 1 Else 0 End), \ +Sum(Case When dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId And dcp.objectObservedSpecies Is Not Empty Then (Select Sum(efo.count) From fr.ird.observe.entities.data.ps.observation.FloatingObjectImpl dcp1 Join dcp1.objectObservedSpecies efo With efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' Where dcp1 = dcp) Else 0 End) \ From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.routeObs r \ Join r.activity a \ -Join a.floatingObject dcp \ -Join dcp.objectObservedSpecies efo \ +Join a.floatingObject dcp With dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ Where \ -m.id In :tripId \ -and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ -and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' -request.5.repeat.name=typeObjetId -request.5.repeat.layout=column -request.5.comment=Nombre de tortues +m.id In :tripId +request.2.repeat.name=typeObjetId +request.2.repeat.layout=column +request.2.comment=rencontres + peches / rencontres - peches / deployes / Nombre de tortues ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationFobUsageExtendedReportFixture.java ===================================== @@ -45,6 +45,5 @@ public class PsObservationFobUsageExtendedReportFixture extends ReportFixture { Iterator<ReportRequestDefinition> requests = getRequestIterator(report); assertReportRequestDimension(requests, RequestLayout.row, 0, 0); assertReportRequestDimension(requests, RequestLayout.row, 1, 0); - assertReportRequestDimension(requests, RequestLayout.row, 2, 0); } } ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationFobUsageMinimalReportFixture.java ===================================== @@ -45,6 +45,5 @@ public class PsObservationFobUsageMinimalReportFixture extends ReportFixture { Iterator<ReportRequestDefinition> requests = getRequestIterator(report); assertReportRequestDimension(requests, RequestLayout.row, 0, 0); assertReportRequestDimension(requests, RequestLayout.row, 1, 0); - assertReportRequestDimension(requests, RequestLayout.row, 2, 0); } } ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties ===================================== @@ -25,7 +25,7 @@ syntax.rows=-1 syntax.columns=20 syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de route^Numéro activité^Heure activité^Logbook YFT^Logbook SKJ^Logbook BET^Logbook ALB^Logbook Autres^Plan de cuves YFT^Plan de cuves SKJ^Plan de cuves BET^Plan de cuves ALB^Plan de cuves Autres^Logbook Total^Plan de cuves Total^Différence syntax.rowsHeader= -syntax.nbRequests=5 +syntax.nbRequests=1 result.columns=20 result.rows=4 result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^30/03/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^154.0 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationFobUsageExtended.properties ===================================== @@ -19,14 +19,14 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=FOB - FOB^0^1^0^0^0^0^0^0^0^0^0^0^0^0^0^0^null -result.1=DFAD - DFAD (FAD dérivant)^1^15^1^27^0^0^0^0^0^0^0^0^0^0^0^0^null +result.0=DFAD - DFAD (FAD dérivant)^1^15^1^27^0^0^0^0^0^0^0^0^0^0^0^0^0 +result.1=FOB - FOB^0^1^0^0^0^0^0^0^0^0^0^0^0^0^0^0^0 result.columns=18 result.rows=2 syntax.columns=18 syntax.columnsHeader=Type de FOB^Visités Pêchés^Visités non Pêchés^Déploiement après Pêches^Déploiement seul^Modifiés Pêchés^Modifiés non Pêchés^Retirés Pêchés^Retirés non Pêchés^Abandonnés Pêchés^Abandonnés non Pêchés^Coulés Pêchés^Coulés non Pêchés^Remplacés Pêchés^Remplacés non Pêchés^Autre Pêchés^Autre non Pêchés^Tortues associées syntax.description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions (déploiements, simples visites, modifications, diverses modalités de retraits), avec et sans pêche, et nombres de tortues observées syntax.name=Observations - Utilisation des FOB, tableau détaillé -syntax.nbRequests=18 +syntax.nbRequests=2 syntax.rows=-1 syntax.rowsHeader= ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationFobUsageMinimal.properties ===================================== @@ -19,14 +19,14 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=FOB - FOB^0^1^0^null -result.1=DFAD - DFAD (FAD dérivant)^1^15^28^null +result.0=DFAD - DFAD (FAD dérivant)^1^15^28^0 +result.1=FOB - FOB^0^1^0^0 result.columns=5 result.rows=2 syntax.columns=5 syntax.columnsHeader=Type de FOB^Rencontrés pêchés^Rencontrés non pêchés^Déployés^Tortues associées syntax.description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions regroupés (rencontrés et pêchés, rencontrés non pêchés, déployés), et nombres de tortues observées syntax.name=Observations - Utilisation des FOB, tableau simplifiée -syntax.nbRequests=5 +syntax.nbRequests=2 syntax.rows=-1 syntax.rowsHeader= ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/ReportRequestExecutor.java ===================================== @@ -107,7 +107,9 @@ public interface ReportRequestExecutor { String variableName = variable.getName(); if (variable.isValuesLoaded()) { // variable already loaded - log.debug(String.format("Do not populate variable %s, variable already loaded.", variableName)); + if (log.isDebugEnabled()) { + log.debug(String.format("Do not populate variable %s, variable already loaded.", variableName)); + } continue; } Map<String, Object> vars = new TreeMap<>(); @@ -178,64 +180,84 @@ public interface ReportRequestExecutor { } // remplissage des variables de répétition si nécessaire populateRepeatVariables(report, tripId); - log.debug(String.format("Build result for report [%s] on %s", report.getName(), tripId)); + if (log.isDebugEnabled()) { + log.debug(String.format("Build result for report [%s] on %s", report.getName(), tripId)); + } int rows = report.getRows(); int columns = report.getColumns(); - log.debug(String.format("Dimension : [%d,%d]", rows, columns)); + if (log.isDebugEnabled()) { + log.debug(String.format("Dimension : [%d,%d]", rows, columns)); + } // lancement de la première opération et la matrice de résultat DataMatrix result = ReportOperationConsumers.executeReportOperation(this, ExecuteRequests.OPERATION, report, tripId, new DataMatrix()); // lancement des opérations supplémentaires for (ReportOperationDefinition operation : report.getOperations()) { DataMatrix tmp = result; - log.debug(String.format("Apply operation %s to %s", operation, tmp)); + if (log.isDebugEnabled()) { + log.debug(String.format("Apply operation %s to %s", operation, tmp)); + } result = ReportOperationConsumers.executeReportOperation(this, operation, report, tripId, tmp); } - log.debug(String.format("Final result : %s", result)); + if (log.isDebugEnabled()) { + log.debug(String.format("Final result : %s", result)); + } return result; } default DataMatrix executeReportRequest(ReportRequestDefinition request, Report report, Set<String> dataId) { - Map<String, Object> params = extractParams(report, dataId); - ReportDefinition reportDefinition = report.definition(); - String hql = i18nContext().translateRequest(reportDefinition, request); - for (ReportRepeatVariable<?> repeatVariable : report.getRepeatVariables()) { - if (isVariableUsed(hql, repeatVariable.getName())) { - // add this repeat variable values to parameters - params.put(repeatVariable.getName(), repeatVariable.computeIndexList()); + long t0 = TimeLog.getTime(); + try { + Map<String, Object> params = extractParams(report, dataId); + ReportDefinition reportDefinition = report.definition(); + String hql = i18nContext().translateRequest(reportDefinition, request); + for (ReportRepeatVariable<?> repeatVariable : report.getRepeatVariables()) { + if (isVariableUsed(hql, repeatVariable.getName())) { + // add this repeat variable values to parameters + params.put(repeatVariable.getName(), repeatVariable.computeIndexList()); + } } + return executeReportRequest(reportDefinition, request, params); + } finally { + TIME_LOG.log(t0, "executeReportRequest", request.toString()); } - return executeReportRequest(reportDefinition, request, params); } default DataMatrix executeReportRequest(ReportRequestDefinition request, Report report, Set<String> dataId, ReportRepeatVariable<?> repeatValues) { - Map<String, Object> params = extractParams(report, dataId); - DataMatrix result = new DataMatrix(); - RequestRepeatVariableDefinition requestRepeatVariable = request.getRepeat(); - RequestLayout requestRepeatVariableLayout = requestRepeatVariable.getLayout(); - String repeatVariableName = requestRepeatVariable.getVariableName(); - ReportDefinition reportDefinition = report.definition(); - for (Object repeatValue : repeatValues.getValues()) { - params.put(repeatVariableName, repeatValue); - DataMatrix tmp = executeReportRequest(reportDefinition, request, params); - switch (requestRepeatVariableLayout) { - case row: - // add current result on the same row (at the right of the current result) - tmp.setX(result.getX() + result.getWidth()); - tmp.setY(result.getY()); - break; - case column: - // add current result on the same column (at the bottom of the current result) - tmp.setX(result.getX()); - tmp.setY(result.getY() + result.getHeight()); - break; + long t0 = TimeLog.getTime(); + try { + Map<String, Object> params = extractParams(report, dataId); + DataMatrix result = new DataMatrix(); + RequestRepeatVariableDefinition requestRepeatVariable = request.getRepeat(); + RequestLayout requestRepeatVariableLayout = requestRepeatVariable.getLayout(); + String repeatVariableName = requestRepeatVariable.getVariableName(); + ReportDefinition reportDefinition = report.definition(); + for (Object repeatValue : repeatValues.getValues()) { + params.put(repeatVariableName, repeatValue); + DataMatrix tmp = executeReportRequest(reportDefinition, request, params); + switch (requestRepeatVariableLayout) { + case row: + // add current result on the same row (at the right of the current result) + tmp.setX(result.getX() + result.getWidth()); + tmp.setY(result.getY()); + break; + case column: + // add current result on the same column (at the bottom of the current result) + tmp.setX(result.getX()); + tmp.setY(result.getY() + result.getHeight()); + break; + } + result = DataMatrix.merge(result, tmp); } - result = DataMatrix.merge(result, tmp); + result.setX(request.getX()); + result.setY(request.getY()); + if (log.isDebugEnabled()) { + log.debug(String.format("Result location : %s", result.getLocation())); + log.debug(String.format("Result data :\n%s", result.getClipboardContent(true, true, false, '\t'))); + } + return result; + } finally { + TIME_LOG.log(t0, "executeReportRequest", request.toString()); } - result.setX(request.getX()); - result.setY(request.getY()); - log.debug(String.format("Result location : %s", result.getLocation())); - log.debug(String.format("Result data :\n%s", result.getClipboardContent(true, true, false, '\t'))); - return result; } default DataMatrix executeReportRequest(ReportDefinition reportDefinition, ReportRequestDefinition reportRequestDefinition, Map<String, Object> params) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b5ef9ebc78e3cab2442d0bb8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b5ef9ebc78e3cab2442d0bb8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2848
by Tony CHEMIT (＠tchemit) 15 Mar '24

15 Mar '24

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

1 0

[Git][ultreiaio/ird-observe][develop] Update reports documentation
by Tony CHEMIT (＠tchemit) 15 Mar '24

15 Mar '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5ef9ebc by Tony Chemit at 2024-03-15T14:38:31+01:00 Update reports documentation - - - - - 2 changed files: - src/site/markdown/report/index.md.vm - src/site/markdown/report/syntax.md Changes: ===================================== src/site/markdown/report/index.md.vm ===================================== @@ -118,7 +118,7 @@ version applicative, à savoir dans Dans la configuration de l'assistant, par défaut on utilise ce fichier. -Il est envisagé en *v10* de faire évoluer cela pour que chaque rapport puisse être décrit dans un fichier séparé. +Depuis la version **9.3.0**, chaque rapport est décrit dans un fichier séparé. Cela aura pour avantage : @@ -126,6 +126,54 @@ Cela aura pour avantage : * de simplifier l'écriture de ceux-ci (on pourra alors supprimer tous les préfixes actuellement utilisés pour identifier un rapport). * de pouvoir organiser ces rapports par modèle métier, ou par type d'organisation +Tous les rapports sont regroupés dans un répertoire des resources de la version applicative, à savoir dans + +```.observe/resources-${project.version}/report/default``` + +dont voici le contenu (en 9.3.0) + +``` +resources-9.3.0-RC-5/report/ +└── default + ├── ll + │ ├── llCommonTripGearUseFeatures.report + │ ├── llLanding.report + │ ├── llLogbookActivities.report + │ ├── llLogbookCatches.report + │ ├── llLogbookSamplesOnActivity.report + │ ├── llLogbookSamplesOnBoth.report + │ └── llLogbookSamplesOnTrip.report + └── ps + ├── psCommonTripGearUseFeatures.report + ├── psLocalmarketBatch.report + ├── psLocalmarketSample.report + ├── psLocalmarketSurvey.report + ├── psLogbookActivity.report + ├── psLogbookSampleMeasures.report + ├── psLogbookSampleSet.report + ├── psLogbookSampleSpeciesMeasuresCount.report + ├── psLogbookSampleSpeciesMeasures.report + ├── psLogbookTrip.report + ├── psLogbookWellPlanCheck.report + ├── psLogbookWellPlan.report + ├── psObservationActivitiesByZone.report + ├── psObservationActivityWithComment.report + ├── psObservationAllActivities.report + ├── psObservationCatch.report + ├── psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.report + ├── psObservationCatchTotalCountByGroupPerReasonForDiscard.report + ├── psObservationCatchTotalCountByGroupPerSpeciesFate.report + ├── psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.report + ├── psObservationCatchWeightByGroupPerReasonForDiscard.report + ├── psObservationCatchWeightByGroupPerSpeciesFate.report + ├── psObservationDailySetAndCatch.report + ├── psObservationFobUsageExtended.report + ├── psObservationFobUsageMinimal.report + ├── psObservationLengthsDistribution.report + ├── psObservationRepartionCaleeParCuve.report + └── psObservationSetByAssociation.report +``` + ## Description du fonctionnement général d'un rapport ### Prération des variables ===================================== src/site/markdown/report/syntax.md ===================================== @@ -6,78 +6,110 @@ Ce document décrit comment écrire un rapport. Comme écrit dans la page de présentation des rapports, ceux-ci sont décrits dans un fichier de type *properties*. -La syntaxe a été uniformisée en version 9. +La syntaxe a été uniformisée en version 9 et depuis la 9.3.0 chaque rapport est décrit dans un fichier séparé. ### Identifiant d'un rapport -Chaque rapport possède un identifiant unique; celui-ci est utilisé pour identifier toute sa description dans le fichier -global. +Chaque rapport possède un identifiant unique; le nom du fichier correspondant est **id.report**. Voici un premier exemple de rapport pour mieux comprendre comment cela s'organise : ```properties -report.llCommonTripGearUseFeatures.modelType=LL -report.llCommonTripGearUseFeatures.name=Liste des équipements -report.llCommonTripGearUseFeatures.description=Afficher les équipements -report.llCommonTripGearUseFeatures.columns=Equipement,Nombre,Utilisé dans la marée,Mesures -report.llCommonTripGearUseFeatures.repeatVariable.1.name=gearUseFeaturesId -report.llCommonTripGearUseFeatures.repeatVariable.1.type=java.lang.String -report.llCommonTripGearUseFeatures.repeatVariable.1.request=Select g.id \ +modelType=LL +name=Liste des équipements +name.en=Gears uses features +name.es= +description=Afficher les équipements +description.en=Display gear uses features +description.es= +columns=Equipement,Nombre,Utilisé dans la marée,Mesures +columns.en=Gear,Number,Used in trip?,Measures +columns.es= +repeatVariable.1.name=gearUseFeaturesId +repeatVariable.1.type=java.lang.String +repeatVariable.1.request=Select g.id \ From fr.ird.observe.entities.data.ll.common.TripImpl m \ Join m.gearUseFeatures g \ Where \ m.id In :tripId \ and g in elements (m.gearUseFeatures) \ -Order By g.gear.label2 -report.llCommonTripGearUseFeatures.request.1.location=0,0 -report.llCommonTripGearUseFeatures.request.1.layout=row -report.llCommonTripGearUseFeatures.request.1.request=Select \ -concat(CASE When g.gear.code IS NULL Then 'Aucun code' Else g.gear.code End, ' - ', g.gear.label2), \ +Order By g.gear.@i18nColumnName@ +request.1.location=0,0 +request.1.layout=row +request.1.request=Select \ +concat(CASE When g.gear.code IS NULL Then '@noCode@' Else g.gear.code End, ' - ', g.gear.@i18nColumnName@), \ g.number, \ -( CASE g.usedInTrip When true Then 'Oui' Else Case g.usedInTrip When false Then 'Non' Else 'Indéterminé' End End )\ +( CASE g.usedInTrip When true Then '@yes@' Else Case g.usedInTrip When false Then '@no@' Else '@Null@' End End )\ From fr.ird.observe.entities.data.ll.common.GearUseFeaturesImpl g \ Where g.id = :gearUseFeaturesId -report.llCommonTripGearUseFeatures.request.1.repeat.name=gearUseFeaturesId -report.llCommonTripGearUseFeatures.request.1.repeat.layout=column -report.llCommonTripGearUseFeatures.operations.1.type=ComputeMeasurementsLongline +request.1.repeat.name=gearUseFeaturesId +request.1.repeat.layout=column +operations.1.type=ComputeMeasurementsLongline +i18n.Null=Indéterminé +i18n.Null.en=Undefined +i18n.Null.es=Indeterminado +i18n.noCode=Aucun code +i18n.noCode.en=No code +i18n.noCode.es= ``` Ici l'identifiant du rapport est ```llCommonTripGearUseFeatures```. Par convention, on utilise le domaine métier **ll**, suivi du sous-domaine métier **Common**, puis enfin un suffixe qui exprime ce que le rapport doit produire **TripGearUseFeatures**. - -Dans le fichier global, toutes les entrées commençants par **report.llCommonTripGearUseFeatures** permettent alors de -décrire le rapport. - + ### Méta-données d'un rapport Il existe cinq méta-données pour un rapport (dont trois sont obligatoires) : ```properties -report.xxx.modelType=PS ou LL -report.xxx.name=Nom du rapport -report.xxx.description=Description du rapport -report.xxx.columns=En-têtes des colonnes du rapport (séparées par des virgules) [Optionnel] -report.xxx.rows=En-têtes des lignes du rapport (séparées par des virgules) [Optionnel] +modelType=PS ou LL +name=Nom du rapport +name.en=Nom du rapport (Anglais) +name.es=Nom du rapport (Espagnol) +description=Description du rapport +description.en=Description du rapport (Anglais) +description.es=Description du rapport (Espagnol) +columns=En-têtes des colonnes du rapport (séparées par des virgules) [Optionnel] +columns.en=En-têtes des colonnes du rapport (séparées par des virgules) (Anglais) [Optionnel] +columns.es=En-têtes des colonnes du rapport (séparées par des virgules) (Espagnol) [Optionnel] +rows=En-têtes des lignes du rapport (séparées par des virgules) [Optionnel] +rows.en=En-têtes des lignes du rapport (séparées par des virgules) (Anglais) [Optionnel] +rows.es=En-têtes des lignes du rapport (séparées par des virgules) (Espagnol) [Optionnel] ``` -```report.xxx.modelType``` permet de définir le domaine métier sur lequel porte le rapport, valeurs possibles : +```modelType``` permet de définir le domaine métier sur lequel porte le rapport, valeurs possibles : * **PS** pour le domaine *Senne* * **LL** pour le domaine *Palangre*. En *V10*, on ajoutera certainement **COMMON** pour le domaine métier des marées agnostiques. -```report.xxx.name``` permet de définir le nom du rapport, ce texte est celui affiché dans la liste déroulante des +```name``` permet de définir le nom du rapport en français, ce texte est celui affiché dans la liste déroulante des rapports à sélectionner dans l'assistant. -```report.xxx.description``` permet de définir une description longue d'un rapport, ce texte est celui affiché +```name.en``` permet de définir le nom du rapport en anglais, si vide le texte français est utilisé. + +```name.es``` permet de définir le nom du rapport en espagnol, si vide le texte français est utilisé. + +```description``` permet de définir une description longue d'un rapport, ce texte est celui affiché comme description lorsqu'un rapport est sélectionné dans l'assistant. -```report.xxx.colomns``` **[Optionnel]** permet de définir les en-têtes de colonnes de manière fixe. +```description.en``` version anglaise, si vide le texte français est utilisé. + +```description.es``` version espagnole, si vide le texte français est utilisé. -```report.xxx.rows``` **[Optionnel]** permet de définir les en-têtes de lignes de manière fixe. +```colomns``` **[Optionnel]** permet de définir les en-têtes de colonnes de manière fixe. + +```colomns.en``` version anglaise, si vide le texte français est utilisé. + +```colomns.es``` version espagnole, si vide le texte français est utilisé. + +```rows``` **[Optionnel]** permet de définir les en-têtes de lignes de manière fixe. + +```rows.en``` version anglaise, si vide le texte français est utilisé. + +```rows.es``` version espagnole, si vide le texte français est utilisé. Il est possible de ne pas les indiquer si le rapport n'a pas d'en-têtes de colonnes ou de lignes fixes; Ces en-têtes seront alors définies via les requêtes du rapport. @@ -100,9 +132,9 @@ variable attend que la seconde soit remplie...** Pour décrire une variable trois lignes sont nécessaires, comme on peut le voir dans l'exemple suivant : ```properties -report.xxx.variable.1.name=speciesGroup -report.xxx.variable.1.type=fr.ird.observe.dto.referential.common.SpeciesGroupReference -report.xxx.variable.1.request=Select distinct sg \ +variable.1.name=speciesGroup +variable.1.type=fr.ird.observe.dto.referential.common.SpeciesGroupReference +variable.1.request=Select distinct sg \ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ @@ -114,11 +146,11 @@ Where t.id In :tripId \ Order By sg.code ``` -```report.xxx.variable.1.name``` définit l'*alias* de la variable que l'on pourra ensuite utiliser dans le +```variable.1.name``` définit l'*alias* de la variable que l'on pourra ensuite utiliser dans le reste de la définition du rapport (par exemple dans d'autres variables, variables de répétition, requêtes ou opérations). -```report.xxx.variable.1.type``` définit le type de la variable. Ce type doit être un type de *dto* ou une +```variable.1.type``` définit le type de la variable. Ce type doit être un type de *dto* ou une *référence de dto*. On ne peut pas ici utiliser un type d'*entité*, puisque l'interface graphique (selon le principe de séparation des couches) n'a pas connaissance du modèle des entités. @@ -133,13 +165,13 @@ l'arbre de navigation; la notion de *dto* étant utilisée au niveau d'un formul * comment décorer la donnée * comment transformer l'entité -```report.xxx.variable.1.request``` définit la requête **hql** pour récupérer l'univers des valeurs de +```variable.1.request``` définit la requête **hql** pour récupérer l'univers des valeurs de la variable. Il est possible de documenter cette variable en utilise une quatrième ligne optionnelle : ```properties -report.xxx.variable.1.comment=Un commentaire optionnel pour documenter la variable +variable.1.comment=Un commentaire optionnel pour documenter la variable ``` **À noter que l'utilisation d'une variable dans le reste du rapport se fait toujours via son identifiant technique @@ -151,9 +183,9 @@ sélection des marées sur lequel on veut appliquer le rapport**. Voici un second exemple de deux variables dont la seconde utilise la première : ```properties -report.xxx.variable.1.name=discardMode -report.xxx.variable.1.type=fr.ird.observe.dto.data.ps.observation.SpeciesFateDiscardModeDto -report.xxx.variable.1.request=Select distinct new fr.ird.observe.dto.data.ps.observation.SpeciesFateDiscardModeDto(sf.discard) \ +variable.1.name=discardMode +variable.1.type=fr.ird.observe.dto.data.ps.observation.SpeciesFateDiscardModeDto +variable.1.request=Select distinct new fr.ird.observe.dto.data.ps.observation.SpeciesFateDiscardModeDto(sf.discard) \ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ @@ -162,9 +194,9 @@ Join c.catches ca with ca.totalCount Is Not Null \ Join ca.speciesFate sf \ Where t.id In :tripId \ Order By sf.discard -report.xxx.variable.2.name=speciesGroup -report.xxx.variable.2.type=fr.ird.observe.dto.referential.common.SpeciesGroupReference -report.xxx.variable.2.request=Select distinct sg \ +variable.2.name=speciesGroup +variable.2.type=fr.ird.observe.dto.referential.common.SpeciesGroupReference +variable.2.request=Select distinct sg \ From TripImpl t \ Join t.routeObs r \ Join r.activity a \ @@ -194,9 +226,9 @@ Comme indiqué plus haut, la syntaxe d'une variable de répétition est identiqu Pour décrire une variable de répétition, trois lignes sont nécessaires, comme on peut le voir dans l'exemple suivant : ```properties -report.xxx.repeatVariable.1.name=gearUseFeaturesId -report.xxx.repeatVariable.1.type=java.lang.String -report.xxx.repeatVariable.1.request=Select g.id \ +repeatVariable.1.name=gearUseFeaturesId +repeatVariable.1.type=java.lang.String +repeatVariable.1.request=Select g.id \ From fr.ird.observe.entities.data.ll.common.TripImpl m \ Join m.gearUseFeatures g \ Where \ @@ -205,10 +237,10 @@ and g in elements (m.gearUseFeatures) \ Order By g.gear.label2 ``` -```report.xxx.repeatVariable.1.name``` définit l'*alias* de la variable de répétition à utiliser dans une requête, autre +```repeatVariable.1.name``` définit l'*alias* de la variable de répétition à utiliser dans une requête, autre variable de répétition ou opération -```report.xxx.repeatVariable.1.type``` définit le type de la variable de répétition. Contrairement aux variables, les +```repeatVariable.1.type``` définit le type de la variable de répétition. Contrairement aux variables, les variables de répétition sont utilisées en interne pour exécuter le rapport, on peut donc utiliser directement des types d'*entité*, ou bien des types *simples* qui correspondent aux types d'une colonne en base (**java.lang.String**, **java.lang.Float @@ -219,7 +251,7 @@ requêtes : si on définit une variable de type *entité*, c'est bien l'entité qui sera injectée dans la requête *hql*, et non pas juste son identifiant technique.** -```report.xxx.repeatVariable.1.request``` définit la requête **hql** pour récupérer l'univers des valeurs de la variable +```repeatVariable.1.request``` définit la requête **hql** pour récupérer l'univers des valeurs de la variable de répétition Il est possible d'utiliser dans une requête de variable de répétition, un alias sur toute variable du rapport (dont la @@ -235,13 +267,13 @@ l'univers de cette variable de répétion, ce qui peut etre utilise (et nous nou pas décrire via la requete *hql. ```properties -report.xxx.repeatVariable.1.addNull=true +repeatVariable.1.addNull=true ``` Il est possible de documenter cette variable de répétition en utilisant une ligne optionnelle : ```properties -report.xxx.repeatVariable.1.comment=Un commentaire optionnel pour documenter la variable de répétition +repeatVariable.1.comment=Un commentaire optionnel pour documenter la variable de répétition ``` ### requêtes d'un rapport @@ -255,9 +287,9 @@ On distingue deux types de requêtes : Les deux types de requêtes nécessitent les trois lignes, comme décrit dans l'exemple suivant : ```properties -report.xxx.request.1.location=0,0 -report.xxx.request.1.layout=row -report.xxx.request.1.request=Select \ +request.1.location=0,0 +request.1.layout=row +request.1.request=Select \ concat(CASE When g.gear.code IS NULL Then 'Aucun code' Else g.gear.code End, ' - ', g.gear.label2), \ g.number, \ ( CASE g.usedInTrip When true Then 'Oui' Else Case g.usedInTrip When false Then 'Non' Else 'Indéterminé' End End )\ @@ -265,10 +297,10 @@ From fr.ird.observe.entities.data.ll.common.GearUseFeaturesImpl g \ Where g.id = :gearUseFeaturesId ``` -```report.xxx.request.1.location``` définit la position dans le résultat final où positionner le résultat de cette +```request.1.location``` définit la position dans le résultat final où positionner le résultat de cette requête. -```report.xxx.request.1.layout``` définit la disposition à utiliser pour placer le résultat de cette requête dans le +```request.1.layout``` définit la disposition à utiliser pour placer le résultat de cette requête dans le résultat final. Deux valeurs sont possibles : * **row** pour signifier que le résultat de la requête sera positionné en ligne à partir de la position précedemment @@ -277,24 +309,24 @@ résultat final. Deux valeurs sont possibles : précedemment définie. Ce mode est une transposition du résultat de la requête : une ligne du résultat de la requête sera une colonne dans le résultat final -```report.xxx.request.1.request``` définit le code **hql** qui permet de construire le résultat à placer ensuite dans le +```request.1.request``` définit le code **hql** qui permet de construire le résultat à placer ensuite dans le résultat final du rapport Pour une requête avec variable de répétition, il faut alors ajouter les deux lignes suivantes : ```properties -report.xxx.request.1.repeat.name=gearUseFeaturesId -report.xxx.request.1.repeat.layout=column +request.1.repeat.name=gearUseFeaturesId +request.1.repeat.layout=column ``` -```report.xxx.request.1.repeat.name``` définit l'*alias* de la variable de répétition à utiliser. La requête sera +```request.1.repeat.name``` définit l'*alias* de la variable de répétition à utiliser. La requête sera exécutée autant de fois qu'il y a de valeurs dans l'univers calculé de la variable de répétition. **À noter qu'il faut alors que le corps de cette requête doit utiliser l'alias de cette variable de répétition, même si dans les faits, rien ne l'oblige, mais le résultat sera alors toujours le même...** -```report.xxx.request.1.repeat.layout``` définit la disposition à utiliser pour constuire le résultat final de la +```request.1.repeat.layout``` définit la disposition à utiliser pour constuire le résultat final de la requête appliqué à chaque valeur de la variable de répétition. Deux valeurs sont possibles : * **row** pour signifier que pour chaque valeur de l'univers de la variable de répétition, le résultat de la requête @@ -309,7 +341,7 @@ sont pas compatibles.** Il est possible de documenter cette requête en utilisant une ligne optionnelle : ```properties -report.xxx.request.1.comment=Un commentaire optionnel pour documenter la requête +request.1.comment=Un commentaire optionnel pour documenter la requête ``` ### Opérations d'un rapport @@ -323,23 +355,23 @@ Les deux types d'opération nécessitent une première ligne pour déclarer le t dans l'exemple suivant : ```properties -report.xxx.operations.1.type=SumIntRow +operations.1.type=SumIntRow ``` -```report.xxx.operations.1.type``` définit le type d'opération à réaliser. +```operations.1.type``` définit le type d'opération à réaliser. Dans le cas où l'opération est paramétrable, on doit alors ajouter une autre ligne avec le paramétrage de l'opération : ```properties -report.xxx.operations.1.parameters=0|1 +operations.1.parameters=0|1 ``` -```report.xxx.operations.1.parameters``` définit le paramétrage à utiliser pour exécuter l'opération. +```operations.1.parameters``` définit le paramétrage à utiliser pour exécuter l'opération. Il est possible de documenter cette opération en utilisant une ligne optionnelle : ```properties -report.xxx.operations.1.comment=Un commentaire optionnel pour documenter l'opération +operations.1.comment=Un commentaire optionnel pour documenter l'opération ``` Les opérations disponibles et leur documentation sont décrites dans le document [suivant](./embedded-operations.html). @@ -355,14 +387,18 @@ Un rendu est défini par deux lignes : 2. Une pour paramétrer ce rendu ```properties -report.xxx.columnRenderers.1.type=HighlightIfAbsoluteDeltaIsPositive -report.ccc.columnRenderers.1.parameters=10|11|0.0001|0.5 +columnRenderers.1.type=HighlightIfAbsoluteDeltaIsPositive +columnRenderers.1.parameters=10|11|0.0001|0.5 ``` Il est possible d'ajouter plusieurs rendus sur un même rapport. Les rendus disponibles et leur documentation sont décrits dans le document [suivant](./embedded-column-renderers.html). +### Traductions + +**TODO** + ## Pour aller plus loin Vous pouvez aussi consulter la [documentation des rapports embarqués par l'application](./embedded-reports.html). View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b5ef9ebc78e3cab2442d0bb8f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b5ef9ebc78e3cab2442d0bb8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Test method ReportService.initColumnRendererParameters
by Tony CHEMIT (＠tchemit) 15 Mar '24

15 Mar '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c9a29d65 by Tony Chemit at 2024-03-15T13:54:37+01:00 Test method ReportService.initColumnRendererParameters - - - - - c211705f by Tony Chemit at 2024-03-15T13:54:37+01:00 Reports are not copied to the right place... - - - - - 72f76dab by Tony Chemit at 2024-03-15T13:54:37+01:00 Update reports documentation - - - - - 4 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportServiceFixtures.java - src/site/markdown/report/index.md.vm Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -395,7 +395,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig for (String location : locations) { String reportLocation = ReportDefinitionsBuilder.reportLocation(location); URL resource = getClass().getClassLoader().getResource(reportLocation); - Path reportPath = reportDirectory.toPath().resolve(reportLocation); + Path reportPath = reportDirectory.toPath().resolve(location); createDirectory(reportPath.getParent().toFile()); log.info("Copy report from {} to {}", reportLocation, reportPath); Files.writeString(reportPath, ObserveUtil.loadResourceContent(resource)); ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/ReportFixture.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.report.Report; +import fr.ird.observe.report.ReportColumnRenderersParameters; import fr.ird.observe.report.ReportVariable; import fr.ird.observe.report.definition.ReportRequestDefinition; import fr.ird.observe.report.definition.RequestLayout; @@ -116,6 +117,13 @@ public abstract class ReportFixture { assertReportNbRequests(actual); } + public void initColumnRendererParameters(ReportService service, Report definition) { + ReportColumnRenderersParameters actual = service.initColumnRendererParameters(definition.definition()); + Assert.assertNotNull(actual); + Assert.assertNotNull(actual.getColumnRendererParameters()); + Assert.assertEquals(definition.definition().getColumnRenderers().length, actual.getColumnRendererParameters().size()); + } + public final void assertResult(DataMatrix actual) { log.info(String.format("Start assertResult for %s", getReportId())); if (WITH_ASSERT) { ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/ReportServiceFixtures.java ===================================== @@ -94,9 +94,12 @@ public class ReportServiceFixtures extends GeneratedReportServiceFixtures { } } - public void executeReport(ReportService service, String id) { - Report definition = getReport(id); - executeReport(definition, service); + @Override + public void initColumnRendererParameters(ObserveServicesProvider servicesProvider, ReportService service) { + for (String id : ReportServiceFixtures.getReportIds()) { + Report definition = getReport(id); + initColumnRendererParameters(definition, service); + } } @Override @@ -107,6 +110,20 @@ public class ReportServiceFixtures extends GeneratedReportServiceFixtures { } } + public void executeReport(ReportService service, String id) { + Report definition = getReport(id); + executeReport(definition, service); + } + + protected void initColumnRendererParameters(Report definition, ReportService service) { + ReportFixture reportFixture = getReportFixture(definition); + if (reportFixture == null) { + Assume.assumeFalse(String.format("Missing report fixture for %s", definition.getId()), true); + return; + } + reportFixture.initColumnRendererParameters(service, definition); + } + protected void populateVariables(Report definition, ReportService service) { ReportFixture reportFixture = getReportFixture(definition); if (reportFixture == null) { ===================================== src/site/markdown/report/index.md.vm ===================================== @@ -118,7 +118,7 @@ version applicative, à savoir dans Dans la configuration de l'assistant, par défaut on utilise ce fichier. -Il est envisagé en *v10* de faire évoluer cela pour que chaque rapport puisse être décrit dans un fichier séparé. +Depuis la version **9.3.0**, chaque rapport est décrit dans un fichier séparé. Cela aura pour avantage : @@ -126,6 +126,54 @@ Cela aura pour avantage : * de simplifier l'écriture de ceux-ci (on pourra alors supprimer tous les préfixes actuellement utilisés pour identifier un rapport). * de pouvoir organiser ces rapports par modèle métier, ou par type d'organisation +Tous les rapports sont regroupés dans un répertoire des resources de la version applicative, à savoir dans + +```.observe/resources-${project.version}/report/default``` + +dont voici le contenu (en 9.3.0) + +``` +resources-9.3.0-RC-5/report/ +└── default + ├── ll + │ ├── llCommonTripGearUseFeatures.report + │ ├── llLanding.report + │ ├── llLogbookActivities.report + │ ├── llLogbookCatches.report + │ ├── llLogbookSamplesOnActivity.report + │ ├── llLogbookSamplesOnBoth.report + │ └── llLogbookSamplesOnTrip.report + └── ps + ├── psCommonTripGearUseFeatures.report + ├── psLocalmarketBatch.report + ├── psLocalmarketSample.report + ├── psLocalmarketSurvey.report + ├── psLogbookActivity.report + ├── psLogbookSampleMeasures.report + ├── psLogbookSampleSet.report + ├── psLogbookSampleSpeciesMeasuresCount.report + ├── psLogbookSampleSpeciesMeasures.report + ├── psLogbookTrip.report + ├── psLogbookWellPlanCheck.report + ├── psLogbookWellPlan.report + ├── psObservationActivitiesByZone.report + ├── psObservationActivityWithComment.report + ├── psObservationAllActivities.report + ├── psObservationCatch.report + ├── psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.report + ├── psObservationCatchTotalCountByGroupPerReasonForDiscard.report + ├── psObservationCatchTotalCountByGroupPerSpeciesFate.report + ├── psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.report + ├── psObservationCatchWeightByGroupPerReasonForDiscard.report + ├── psObservationCatchWeightByGroupPerSpeciesFate.report + ├── psObservationDailySetAndCatch.report + ├── psObservationFobUsageExtended.report + ├── psObservationFobUsageMinimal.report + ├── psObservationLengthsDistribution.report + ├── psObservationRepartionCaleeParCuve.report + └── psObservationSetByAssociation.report +``` + ## Description du fonctionnement général d'un rapport ### Prération des variables View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8c5dacfebf7ea147603d69c1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8c5dacfebf7ea147603d69c1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: persistence - Introduction de SqlConversions pour gérer les conversions java → sql
by Tony CHEMIT (＠tchemit) 15 Mar '24

15 Mar '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 47f1b396 by Tony Chemit at 2024-03-05T16:39:59+01:00 persistence - Introduction de SqlConversions pour gérer les conversions java → sql - - - - - 2c4fed94 by Tony Chemit at 2024-03-08T12:54:45+01:00 persistence - introduce ToolkitIdModificationsToSql - - - - - ae84f818 by Tony Chemit at 2024-03-08T12:54:52+01:00 persistence - introduce toSql method on consolidate engine to produce sql script of modifications - - - - - 6af33613 by Tony Chemit at 2024-03-08T12:54:58+01:00 persistence - on TripConsolidateEngine.consolidate, now use the generated sql script to finalize consolidation instead of letting Hibernate doing it for us - - - - - 8a4f3493 by Tony Chemit at 2024-03-15T08:19:43+01:00 Merge branch 'feature/issue-2843' into develop Erreur sur transaction et plantage de Tomcat sur consolidation en mode serveur - Closes #2843 - - - - - 8c5dacfe by Tony Chemit at 2024-03-15T08:55:32+01:00 update pom - - - - - 30 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesMeasureWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SurveyWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/CatchWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/RouteWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleActivityWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleSpeciesMeasureWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleSpeciesWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/WellActivityWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/WellWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/ReferentialInterceptor.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/WeightCategoryExtractor.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/PackagingInterceptor.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/WeightCategoryInterceptor.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/SampleMeasureRecord.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/SampleRecord.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/TargetCatchRecord.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1a82f8d0c4d7546b0cdaf572… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1a82f8d0c4d7546b0cdaf572… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2843
by Tony CHEMIT (＠tchemit) 15 Mar '24

15 Mar '24

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

1 0

[Git][ultreiaio/ird-observe][feature/issue-2843] 3 commits: persistence - introduce ToolkitIdModificationsToSql
by Tony CHEMIT (＠tchemit) 08 Mar '24

08 Mar '24

Tony CHEMIT pushed to branch feature/issue-2843 at ultreiaio / ird-observe Commits: 2c4fed94 by Tony Chemit at 2024-03-08T12:54:45+01:00 persistence - introduce ToolkitIdModificationsToSql - - - - - ae84f818 by Tony Chemit at 2024-03-08T12:54:52+01:00 persistence - introduce toSql method on consolidate engine to produce sql script of modifications - - - - - 6af33613 by Tony Chemit at 2024-03-08T12:54:58+01:00 persistence - on TripConsolidateEngine.consolidate, now use the generated sql script to finalize consolidation instead of letting Hibernate doing it for us - - - - - 4 changed files: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java - + toolkit/persistence/src/main/java/fr/ird/observe/spi/consolidation/ToolkitIdModificationsToSql.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java ===================================== @@ -33,13 +33,19 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.localmarket.Batch; +import fr.ird.observe.entities.data.ps.logbook.SampleActivity; import fr.ird.observe.entities.referential.common.LengthLengthParameterCache; import fr.ird.observe.entities.referential.common.LengthWeightParameterCache; +import fr.ird.observe.spi.consolidation.ToolkitIdModificationsToSql; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.decoration.Decorator; +import io.ultreia.java4all.util.sql.SqlScript; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.nuiton.topia.service.sql.model.TopiaEntitySqlModel; +import java.io.IOException; +import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -95,15 +101,38 @@ public class TripConsolidateEngine { decoratorService.installDecorator(Trip.class, trip); String tripLabel = trip.toString(); TripConsolidateResult result = new TripConsolidateResult(tripId, tripLabel, observationActivityConsolidateResults, logbookActivityConsolidateResults, logbookSampleActivityResults, localmarketBatchResults); - if (result.withModifications()) { + boolean withModifications = result.withModifications(); + if (withModifications) { log.info(String.format("Found some modifications on trip: %s - %s", tripId, result.getTripLabel())); } if (result.withWarnings()) { log.info(String.format("Found some warnings on trip: %s - %s", tripId, result.getTripLabel())); } + // clear hibernate session (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2843) + context.getTopiaPersistenceContext().getHibernateSupport().clearSession(); + if (withModifications) { + // generate sql script + Path scriptPath = context.getTemporaryDirectoryRoot().resolve(String.format("TripConsolidateResult%d.sql", System.nanoTime())); + log.info("Produce TripConsolidateResult sql script to: {}", scriptPath); + SqlScript script = toSql(scriptPath, result, context.getTopiaApplicationContext().getModel()); + // consume sql script + context.getTopiaPersistenceContext().executeSqlScript(script); + } return Optional.of(result); } + public SqlScript toSql(Path scriptPath, TripConsolidateResult result, TopiaEntitySqlModel entitySqlModel) { + try (ToolkitIdModificationsToSql toolkitIdModificationsToSql = new ToolkitIdModificationsToSql(scriptPath, context.timestampNow(), entitySqlModel)) { + observationActivityConsolidateEngine.toSql(result.getActivityObservationResults(), toolkitIdModificationsToSql); + logbookActivityConsolidateEngine.toSql(result.getActivityLogbookResults(), toolkitIdModificationsToSql); + toolkitIdModificationsToSql.toSql(Batch.SPI, result.getLocalmarketBatchResults()); + toolkitIdModificationsToSql.toSql(SampleActivity.SPI, result.getLogbookSampleActivityResults()); + return toolkitIdModificationsToSql.build(); + } catch (IOException e) { + throw new IllegalStateException("Could not produce sql script to " + scriptPath, e); + } + } + private Set<ToolkitIdModifications> consolidateLogbookSampleActivities(Trip trip) { Set<ToolkitIdModifications> result = new LinkedHashSet<>(); if (trip.isWellEmpty() || trip.isSampleEmpty()) { ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java ===================================== @@ -33,6 +33,7 @@ import fr.ird.observe.entities.data.ps.logbook.Activity; import fr.ird.observe.entities.data.ps.logbook.FloatingObject; import fr.ird.observe.entities.data.ps.logbook.FloatingObjectPart; import fr.ird.observe.entities.data.ps.logbook.Route; +import fr.ird.observe.spi.consolidation.ToolkitIdModificationsToSql; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.decoration.Decorator; import io.ultreia.java4all.util.Dates; @@ -41,6 +42,7 @@ import org.apache.logging.log4j.Logger; import java.util.LinkedHashSet; import java.util.Optional; +import java.util.Set; /** * Created on 12/03/2023. @@ -60,6 +62,12 @@ public class ActivityConsolidateEngine { this.activityDecorator = context.getDecoratorService().getDecoratorByType(Activity.class, ActivityAware.CLASSIFIER_WITH_ROUTE); } + public void toSql(Set<ActivityConsolidateResult> activityLogbookResults, ToolkitIdModificationsToSql toolkitIdModificationsToSql) { + for (ActivityConsolidateResult activityConsolidateResult : activityLogbookResults) { + toolkitIdModificationsToSql.toSql(FloatingObject.SPI, activityConsolidateResult.getFloatingObjectModifications()); + } + } + public Optional<ActivityConsolidateResult> consolidateActivity(Trip trip, Route route, Activity activity, @@ -142,5 +150,4 @@ public class ActivityConsolidateEngine { } } } - } ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java ===================================== @@ -30,11 +30,15 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.observation.Activity; +import fr.ird.observe.entities.data.ps.observation.Catch; import fr.ird.observe.entities.data.ps.observation.FloatingObject; import fr.ird.observe.entities.data.ps.observation.FloatingObjectPart; import fr.ird.observe.entities.data.ps.observation.Route; +import fr.ird.observe.entities.data.ps.observation.SampleMeasure; +import fr.ird.observe.entities.data.ps.observation.Set; import fr.ird.observe.entities.referential.common.LengthLengthParameterCache; import fr.ird.observe.entities.referential.common.LengthWeightParameterCache; +import fr.ird.observe.spi.consolidation.ToolkitIdModificationsToSql; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.decoration.Decorator; import io.ultreia.java4all.util.Dates; @@ -70,6 +74,15 @@ public class ActivityConsolidateEngine { this.activityDecorator = context.getDecoratorService().getDecoratorByType(Activity.class, ActivityAware.CLASSIFIER_WITH_ROUTE); } + public void toSql(java.util.Set<ActivityConsolidateResult> activityObservationResults, ToolkitIdModificationsToSql toolkitIdModificationsToSql) { + for (ActivityConsolidateResult activityConsolidateResult : activityObservationResults) { + toolkitIdModificationsToSql.toSql(FloatingObject.SPI, activityConsolidateResult.getFloatingObjectModifications()); + toolkitIdModificationsToSql.toSql(Set.SPI, activityConsolidateResult.getSetModifications()); + toolkitIdModificationsToSql.toSql(Catch.SPI, activityConsolidateResult.getCatchModifications()); + toolkitIdModificationsToSql.toSql(SampleMeasure.SPI, activityConsolidateResult.getSampleMeasureModifications()); + } + } + public Optional<ActivityConsolidateResult> consolidateActivity(Trip trip, Route route, Activity activity, @@ -163,5 +176,4 @@ public class ActivityConsolidateEngine { } } } - } ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/consolidation/ToolkitIdModificationsToSql.java ===================================== @@ -0,0 +1,153 @@ +package fr.ird.observe.spi.consolidation; + +/*- + * #%L + * ObServe Toolkit :: Persistence + * %% + * 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% + */ + +import fr.ird.observe.dto.ToolkitIdModifications; +import fr.ird.observe.entities.Entity; +import fr.ird.observe.spi.SqlConversions; +import fr.ird.observe.spi.context.DtoEntityContext; +import io.ultreia.java4all.bean.monitor.JavaBeanPropertyModification; +import io.ultreia.java4all.util.sql.SqlScript; +import io.ultreia.java4all.util.sql.SqlScriptWriter; +import org.nuiton.topia.service.sql.model.TopiaEntitySqlModel; +import org.nuiton.topia.service.sql.model.TopiaEntitySqlTable; + +import java.io.Closeable; +import java.io.IOException; +import java.nio.file.Path; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +/** + * To produce sql update code from some consolidation modifications. + * <p> + * Created at 04/03/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class ToolkitIdModificationsToSql implements Closeable { + + public static final String UPDATE_SQL = "UPDATE %s SET %s WHERE topiaId = '%s';"; + public static final String SET_SQL_CLAUSE = "%s = %s"; + + /** + * Where to write sql statements. + */ + private final Path target; + /** + * Now timestamp to used in any sql statement that requires it. + */ + private final Timestamp now; + /** + * Topia Entity sql model used to perform conversions while writing sql statements. + */ + private final TopiaEntitySqlModel entitySqlModel; + /** + * Set of spi used to produce sql statements (we be used in method {@link #build()} to add extra sql statements + * to update {@code LastUpdateDate} table). + */ + private final Set<DtoEntityContext<?, ?, ?, ?>> spiUsed; + /** + * Internal writer used to store sql statements. + */ + private SqlScriptWriter writer; + + public ToolkitIdModificationsToSql(Path target, Timestamp now, TopiaEntitySqlModel entitySqlModel) { + this.target = Objects.requireNonNull(target); + this.now = Objects.requireNonNull(now); + this.entitySqlModel = Objects.requireNonNull(entitySqlModel); + this.spiUsed = new LinkedHashSet<>(); + } + + + public static String toSetClause(TopiaEntitySqlTable sqlModelDescriptorTable, String propertyName, Object value) { + String stringValue = SqlConversions.convertValue(sqlModelDescriptorTable, propertyName, value); + return String.format(SET_SQL_CLAUSE, propertyName, stringValue); + } + + public SqlScript build() { + SqlScriptWriter writer = writer(); + Set<String> lastUpdateDateStatements = new LinkedHashSet<>(); + spiUsed.forEach(spi -> spi.getUpdateLastUpdateDateTableScript().generate(now).forEach(l -> lastUpdateDateStatements.add(l.trim()))); + lastUpdateDateStatements.forEach(writer::writeSql); + return SqlScript.of(target); + } + + public void toSql(DtoEntityContext<?, ?, ?, ?> spi, ToolkitIdModifications modifications) { + if (modifications == null) { + return; + } + TopiaEntitySqlTable sqlModelDescriptorTable = entitySqlModel.getDescriptor(spi.toEntityType()).getTable(); + boolean used = toSql(sqlModelDescriptorTable, modifications); + if (used) { + spiUsed.add(spi); + } + } + + public void toSql(DtoEntityContext<?, ?, ?, ?> spi, Set<ToolkitIdModifications> modificationsSet) { + if (modificationsSet == null) { + return; + } + TopiaEntitySqlTable sqlModelDescriptorTable = entitySqlModel.getDescriptor(spi.toEntityType()).getTable(); + boolean used = false; + for (ToolkitIdModifications modifications : modificationsSet) { + used |= toSql(sqlModelDescriptorTable, modifications); + } + if (used) { + spiUsed.add(spi); + } + } + + @Override + public void close() throws IOException { + if (writer != null) { + writer.close(); + } + } + + protected SqlScriptWriter writer() { + return writer == null ? writer = SqlScriptWriter.of(target) : writer; + } + + protected boolean toSql(TopiaEntitySqlTable sqlModelDescriptorTable, ToolkitIdModifications modifications) { + if (modifications == null || !modifications.withModifications()) { + // only warning on this one + return false; + } + List<String> setClauses = new ArrayList<>(modifications.modificationsCount() + 2); + String schemaAndTableName = sqlModelDescriptorTable.getSchemaAndTableName(); + for (JavaBeanPropertyModification modification : modifications.getModifications()) { + setClauses.add(toSetClause(sqlModelDescriptorTable, modification.getPropertyName(), modification.getNewValue())); + } + setClauses.add(String.format(SET_SQL_CLAUSE, Entity.PROPERTY_TOPIA_VERSION, Entity.PROPERTY_TOPIA_VERSION + " + 1")); + setClauses.add(toSetClause(sqlModelDescriptorTable, Entity.PROPERTY_LAST_UPDATE_DATE, now)); + String sql = String.format(UPDATE_SQL, schemaAndTableName, String.join(", ", setClauses), modifications.getId()); + writer().writeSql(sql); + return true; + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7e395260dffcb63904ef21f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7e395260dffcb63904ef21f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2843
by Tony CHEMIT (＠tchemit) 05 Mar '24

05 Mar '24

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

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: persistence meta-model: add more stuff in TopiaMetadataEntity
by Tony CHEMIT (＠tchemit) 05 Mar '24

05 Mar '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bab62840 by Tony Chemit at 2024-03-05T16:23:48+01:00 persistence meta-model: add more stuff in TopiaMetadataEntity - - - - - 22aa0c31 by Tony Chemit at 2024-03-05T16:24:12+01:00 persistence sql-model: add more stuff in TopiaEntitySqlTable - - - - - df0a7b49 by Tony Chemit at 2024-03-05T16:24:13+01:00 persistence: update TopiaEntitySqlModel.json - - - - - ac3d0822 by Tony Chemit at 2024-03-05T16:26:12+01:00 Merge branch 'feature/augments-entityModel' into develop - - - - - f3055cda by Tony Chemit at 2024-03-05T16:39:51+01:00 persistence - add timestampNow on ServiceContext - - - - - 1a82f8d0 by Tony Chemit at 2024-03-05T16:39:51+01:00 persistence - add method clearSession on TopiaHibernateSupport - - - - - 0 changed files: The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/895a9697b9f2d3b9edace91a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/895a9697b9f2d3b9edace91a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: toolkit-templates - vérification que la tag-value digits est bien définie pour...
by Tony CHEMIT (＠tchemit) 05 Mar '24

05 Mar '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69c33e34 by Tony Chemit at 2024-03-05T16:20:51+01:00 toolkit-templates - vérification que la tag-value digits est bien définie pour tout attribute de type décimal sur le modèle de persistance - - - - - bee7fdae by Tony Chemit at 2024-03-05T16:20:54+01:00 model - Remplissages de la tag-value digits manquante - - - - - 330e1682 by Tony Chemit at 2024-03-05T16:20:58+01:00 persistence - Mise à jour des descripteurs d'entités - - - - - 895a9697 by Tony Chemit at 2024-03-05T16:23:06+01:00 Merge branch 'feature/issue-2844' into develop Consolidation du modèle de persistence sur les données de type décimales - Closes #2844 - - - - - 24 changed files: - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPartImpl.hbm.xml - 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/ll/logbook/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BranchlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/WeightMeasureImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/observation/NonTargetCatchReleaseImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/common/VesselImpl.hbm.xml - model/src/main/models/Observe/persistence/attribute/digits.properties - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ExtractTagValues.java Changes: ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPartImpl.hbm.xml ===================================== @@ -38,16 +38,16 @@ <many-to-one name="species" class="fr.ird.observe.entities.referential.common.SpeciesImpl" column="species" foreign-key="fk_ll_landing_landingpart_species" not-null="true" /> <many-to-one name="dataQuality" class="fr.ird.observe.entities.referential.common.DataQualityImpl" column="dataQuality" foreign-key="fk_ll_landing_landingpart_dataquality" /> <property name="categoryMin" access="field" type="java.lang.Float"> - <column name="categoryMin" sql-type="numeric"/> + <column name="categoryMin" precision="6" scale="3" sql-type="numeric"/> </property> <property name="categoryMax" access="field" type="java.lang.Float"> - <column name="categoryMax" sql-type="numeric"/> + <column name="categoryMax" precision="6" scale="3" sql-type="numeric"/> </property> <many-to-one name="onBoardProcessing" class="fr.ird.observe.entities.referential.ll.common.OnBoardProcessingImpl" column="onBoardProcessing" foreign-key="fk_ll_landing_landingpart_onboardprocessing" /> <many-to-one name="conservation" class="fr.ird.observe.entities.referential.ll.landing.ConservationImpl" column="conservation" foreign-key="fk_ll_landing_landingpart_conservation" /> <property name="count" access="field" type="java.lang.Integer" column="count"/> <property name="weight" access="field" type="java.lang.Float"> - <column name="weight" sql-type="numeric"/> + <column name="weight" precision="6" scale="3" sql-type="numeric"/> </property> <many-to-one name="weightMeasureMethod" class="fr.ird.observe.entities.referential.common.WeightMeasureMethodImpl" column="weightMeasureMethod" foreign-key="fk_ll_landing_landingpart_weightmeasuremethod" /> </class> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml ===================================== @@ -51,12 +51,12 @@ <column name="longitude" precision="6" scale="4" sql-type="numeric"/> </property> <property name="seaSurfaceTemperature" access="field" type="java.lang.Float"> - <column name="seaSurfaceTemperature" sql-type="numeric"/> + <column name="seaSurfaceTemperature" precision="6" scale="2" sql-type="numeric"/> </property> <many-to-one name="wind" class="fr.ird.observe.entities.referential.common.WindImpl" column="wind" foreign-key="fk_ll_logbook_activity_wind" /> <property name="windDirection" access="field" type="java.lang.Integer" column="windDirection"/> <property name="currentSpeed" access="field" type="java.lang.Float"> - <column name="currentSpeed" sql-type="numeric"/> + <column name="currentSpeed" precision="6" scale="1" sql-type="numeric"/> </property> <property name="currentDirection" access="field" type="java.lang.Integer" column="currentDirection"/> <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" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BaitsCompositionImpl.hbm.xml ===================================== @@ -38,7 +38,7 @@ <property name="proportion" access="field" type="java.lang.Integer" column="proportion"/> <property name="individualSize" access="field" type="java.lang.Integer" column="individualSize"/> <property name="individualWeight" access="field" type="java.lang.Float"> - <column name="individualWeight" sql-type="numeric"/> + <column name="individualWeight" precision="6" scale="3" sql-type="numeric"/> </property> <many-to-one name="baitSettingStatus" class="fr.ird.observe.entities.referential.ll.common.BaitSettingStatusImpl" column="baitSettingStatus" foreign-key="fk_ll_logbook_baitscomposition_baitsettingstatus" /> <many-to-one name="baitType" class="fr.ird.observe.entities.referential.ll.common.BaitTypeImpl" column="baitType" foreign-key="fk_ll_logbook_baitscomposition_baittype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BranchlinesCompositionImpl.hbm.xml ===================================== @@ -36,11 +36,11 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="length" access="field" type="java.lang.Float" not-null="true"> - <column name="length" sql-type="numeric"/> + <column name="length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="proportion" access="field" type="java.lang.Integer" column="proportion"/> <property name="tracelineLength" access="field" type="java.lang.Float"> - <column name="tracelineLength" sql-type="numeric"/> + <column name="tracelineLength" precision="6" scale="4" sql-type="numeric"/> </property> <many-to-one name="topType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="topType" foreign-key="fk_ll_logbook_branchlinescomposition_toptype" not-null="true" /> <many-to-one name="tracelineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="tracelineType" foreign-key="fk_ll_logbook_branchlinescomposition_tracelinetype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml ===================================== @@ -40,12 +40,12 @@ </property> <property name="count" access="field" type="java.lang.Integer" column="count"/> <property name="totalWeight" access="field" type="java.lang.Float"> - <column name="totalWeight" sql-type="numeric"/> + <column name="totalWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="hookWhenDiscarded" access="field" type="java.lang.Boolean" column="hookWhenDiscarded"/> <property name="depredated" access="field" type="java.lang.Boolean" column="depredated"/> <property name="beatDiameter" access="field" type="java.lang.Float"> - <column name="beatDiameter" sql-type="numeric"/> + <column name="beatDiameter" precision="6" scale="3" sql-type="numeric"/> </property> <property name="photoReferences" access="field" type="java.lang.String" column="photoReferences"/> <property name="number" access="field" type="java.lang.Integer" column="number"/> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml ===================================== @@ -36,7 +36,7 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="length" access="field" type="java.lang.Float" not-null="true"> - <column name="length" sql-type="numeric"/> + <column name="length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="proportion" access="field" type="java.lang.Integer" column="proportion"/> <many-to-one name="lineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="lineType" foreign-key="fk_ll_logbook_floatlinescomposition_linetype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml ===================================== @@ -36,10 +36,10 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="length" access="field" type="java.lang.Float"> - <column name="length" sql-type="numeric"/> + <column name="length" precision="6" scale="1" sql-type="numeric"/> </property> <property name="weight" access="field" type="java.lang.Float"> - <column name="weight" sql-type="numeric"/> + <column name="weight" precision="6" scale="2" sql-type="numeric"/> </property> <property name="count" access="field" type="java.lang.Integer" column="count" not-null="true"/> <property name="acquisitionMode" access="field" type="int" column="acquisitionMode"/> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml ===================================== @@ -48,16 +48,16 @@ <property name="totalLightsticksCount" access="field" type="java.lang.Integer" column="totalLightsticksCount"/> <property name="weightedSnap" access="field" type="java.lang.Boolean" column="weightedSnap"/> <property name="snapWeight" access="field" type="java.lang.Float"> - <column name="snapWeight" sql-type="numeric"/> + <column name="snapWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="weightedSwivel" access="field" type="java.lang.Boolean" column="weightedSwivel"/> <property name="swivelWeight" access="field" type="java.lang.Float"> - <column name="swivelWeight" sql-type="numeric"/> + <column name="swivelWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="timeBetweenHooks" access="field" type="java.lang.Long" column="timeBetweenHooks"/> <property name="shooterUsed" access="field" type="java.lang.Boolean" column="shooterUsed"/> <property name="shooterSpeed" access="field" type="java.lang.Float"> - <column name="shooterSpeed" sql-type="numeric"/> + <column name="shooterSpeed" precision="6" scale="3" sql-type="numeric"/> </property> <property name="maxDepthTargeted" access="field" type="java.lang.Float"> <column name="maxDepthTargeted" precision="6" scale="4" sql-type="numeric"/> @@ -81,7 +81,7 @@ <column name="settingEndLongitude" precision="6" scale="4" sql-type="numeric"/> </property> <property name="settingVesselSpeed" access="field" type="java.lang.Float"> - <column name="settingVesselSpeed" sql-type="numeric"/> + <column name="settingVesselSpeed" precision="6" scale="3" sql-type="numeric"/> </property> <property name="haulingDirectionSameAsSetting" access="field" type="java.lang.Boolean" column="haulingDirectionSameAsSetting"/> <property name="haulingStartTimeStamp" access="field" type="timestamp"> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml ===================================== @@ -38,7 +38,7 @@ <property name="proportion" access="field" type="java.lang.Integer" column="proportion" not-null="true"/> <property name="individualSize" access="field" type="java.lang.Integer" column="individualSize"/> <property name="individualWeight" access="field" type="java.lang.Float"> - <column name="individualWeight" sql-type="numeric"/> + <column name="individualWeight" precision="6" scale="3" sql-type="numeric"/> </property> <many-to-one name="baitSettingStatus" class="fr.ird.observe.entities.referential.ll.common.BaitSettingStatusImpl" column="baitSettingStatus" foreign-key="fk_ll_observation_baitscomposition_baitsettingstatus" /> <many-to-one name="baitType" class="fr.ird.observe.entities.referential.ll.common.BaitTypeImpl" column="baitType" foreign-key="fk_ll_observation_baitscomposition_baittype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml ===================================== @@ -38,10 +38,10 @@ <property name="settingIdentifier" access="field" type="java.lang.Integer" column="settingIdentifier" not-null="true"/> <property name="haulingIdentifier" access="field" type="java.lang.Integer" column="haulingIdentifier"/> <property name="floatline1Length" access="field" type="java.lang.Float"> - <column name="floatline1Length" sql-type="numeric"/> + <column name="floatline1Length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="floatline2Length" access="field" type="java.lang.Float"> - <column name="floatline2Length" sql-type="numeric"/> + <column name="floatline2Length" precision="6" scale="4" sql-type="numeric"/> </property> <set name="branchline" order-by="settingIdentifier" lazy="true" cascade="all,delete-orphan" > <key column="basket" foreign-key="fk_ll_observation_basket_branchline" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml ===================================== @@ -49,7 +49,7 @@ <property name="timeSinceContact" access="field" type="java.lang.Integer" column="timeSinceContact"/> <property name="hookOffset" access="field" type="java.lang.Integer" column="hookOffset"/> <property name="branchlineLength" access="field" type="java.lang.Float"> - <column name="branchlineLength" sql-type="numeric"/> + <column name="branchlineLength" precision="6" scale="4" sql-type="numeric"/> </property> <property name="weightedSwivel" access="field" type="boolean" not-null="true"> <column default="false" name="weightedSwivel"/> @@ -61,13 +61,13 @@ <column default="false" name="weightedSnap"/> </property> <property name="swivelWeight" access="field" type="java.lang.Float"> - <column name="swivelWeight" sql-type="numeric"/> + <column name="swivelWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="snapWeight" access="field" type="java.lang.Float"> - <column name="snapWeight" sql-type="numeric"/> + <column name="snapWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="tracelineLength" access="field" type="java.lang.Float"> - <column name="tracelineLength" sql-type="numeric"/> + <column name="tracelineLength" precision="6" scale="4" sql-type="numeric"/> </property> <property name="hookLost" access="field" type="boolean" not-null="true"> <column default="false" name="hookLost"/> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml ===================================== @@ -36,11 +36,11 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="length" access="field" type="java.lang.Float" not-null="true"> - <column name="length" sql-type="numeric"/> + <column name="length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="proportion" access="field" type="java.lang.Integer" column="proportion" not-null="true"/> <property name="tracelineLength" access="field" type="java.lang.Float"> - <column name="tracelineLength" sql-type="numeric"/> + <column name="tracelineLength" precision="6" scale="4" sql-type="numeric"/> </property> <many-to-one name="topType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="topType" foreign-key="fk_ll_observation_branchlinescomposition_toptype" not-null="true" /> <many-to-one name="tracelineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="tracelineType" foreign-key="fk_ll_observation_branchlinescomposition_tracelinetype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml ===================================== @@ -40,17 +40,17 @@ </property> <property name="count" access="field" type="java.lang.Integer" column="count" not-null="true"/> <property name="totalWeight" access="field" type="java.lang.Float"> - <column name="totalWeight" sql-type="numeric"/> + <column name="totalWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="hookWhenDiscarded" access="field" type="java.lang.Boolean" column="hookWhenDiscarded"/> <property name="depredated" access="field" type="boolean" not-null="true"> <column default="false" name="depredated"/> </property> <property name="beatDiameter" access="field" type="java.lang.Float"> - <column name="beatDiameter" sql-type="numeric"/> + <column name="beatDiameter" precision="6" scale="3" sql-type="numeric"/> </property> <property name="gonadeWeight" access="field" type="java.lang.Float"> - <column name="gonadeWeight" sql-type="numeric"/> + <column name="gonadeWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="photoReferences" access="field" type="java.lang.String" column="photoReferences"/> <property name="number" access="field" type="java.lang.Integer" column="number"/> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml ===================================== @@ -36,7 +36,7 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="distance" access="field" type="java.lang.Float"> - <column name="distance" sql-type="numeric"/> + <column name="distance" precision="6" scale="3" sql-type="numeric"/> </property> <property name="count" access="field" type="java.lang.Integer" column="count"/> <many-to-one name="encounterType" class="fr.ird.observe.entities.referential.ll.observation.EncounterTypeImpl" column="encounterType" foreign-key="fk_ll_observation_encounter_encountertype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml ===================================== @@ -36,7 +36,7 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="length" access="field" type="java.lang.Float" not-null="true"> - <column name="length" sql-type="numeric"/> + <column name="length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="proportion" access="field" type="java.lang.Integer" column="proportion" not-null="true"/> <many-to-one name="lineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="lineType" foreign-key="fk_ll_observation_floatlinescomposition_linetype" not-null="true" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml ===================================== @@ -48,13 +48,13 @@ <column default="false" name="weightedSnap"/> </property> <property name="snapWeight" access="field" type="java.lang.Float"> - <column name="snapWeight" sql-type="numeric"/> + <column name="snapWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="weightedSwivel" access="field" type="boolean" not-null="true"> <column default="false" name="weightedSwivel"/> </property> <property name="swivelWeight" access="field" type="java.lang.Float"> - <column name="swivelWeight" sql-type="numeric"/> + <column name="swivelWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="lightsticksPerBasketCount" access="field" type="java.lang.Integer" column="lightsticksPerBasketCount"/> <property name="timeBetweenHooks" access="field" type="java.lang.Long" column="timeBetweenHooks"/> @@ -62,7 +62,7 @@ <column default="false" name="shooterUsed"/> </property> <property name="shooterSpeed" access="field" type="java.lang.Float"> - <column name="shooterSpeed" sql-type="numeric"/> + <column name="shooterSpeed" precision="6" scale="4" sql-type="numeric"/> </property> <property name="maxDepthTargeted" access="field" type="java.lang.Float"> <column name="maxDepthTargeted" precision="6" scale="4" sql-type="numeric"/> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml ===================================== @@ -36,7 +36,7 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="size" access="field" type="java.lang.Float" not-null="true"> - <column name="size" sql-type="numeric"/> + <column name="size" precision="6" scale="4" sql-type="numeric"/> </property> <many-to-one name="sizeMeasureType" class="fr.ird.observe.entities.referential.common.SizeMeasureTypeImpl" column="sizeMeasureType" foreign-key="fk_ll_observation_sizemeasure_sizemeasuretype" not-null="true" /> </class> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml ===================================== @@ -36,10 +36,10 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="floatline1Length" access="field" type="java.lang.Float"> - <column name="floatline1Length" sql-type="numeric"/> + <column name="floatline1Length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="floatline2Length" access="field" type="java.lang.Float"> - <column name="floatline2Length" sql-type="numeric"/> + <column name="floatline2Length" precision="6" scale="4" sql-type="numeric"/> </property> <property name="serialNo" access="field" type="java.lang.String" column="serialNo"/> <property name="data" access="field" type="java.sql.Blob" column="data"/> @@ -58,28 +58,28 @@ <column name="fishingEnd" sql-type="timestamp"/> </property> <property name="fishingStartDepth" access="field" type="java.lang.Float"> - <column name="fishingStartDepth" sql-type="numeric"/> + <column name="fishingStartDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="fishingEndDepth" access="field" type="java.lang.Float"> - <column name="fishingEndDepth" sql-type="numeric"/> + <column name="fishingEndDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="meanDeploymentDepth" access="field" type="java.lang.Float"> - <column name="meanDeploymentDepth" sql-type="numeric"/> + <column name="meanDeploymentDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="medianDeploymentDepth" access="field" type="java.lang.Float"> - <column name="medianDeploymentDepth" sql-type="numeric"/> + <column name="medianDeploymentDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="minFishingDepth" access="field" type="java.lang.Float"> - <column name="minFishingDepth" sql-type="numeric"/> + <column name="minFishingDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="maxFishingDepth" access="field" type="java.lang.Float"> - <column name="maxFishingDepth" sql-type="numeric"/> + <column name="maxFishingDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="meanFishingDepth" access="field" type="java.lang.Float"> - <column name="meanFishingDepth" sql-type="numeric"/> + <column name="meanFishingDepth" precision="6" scale="2" sql-type="numeric"/> </property> <property name="medianFishingDepth" access="field" type="java.lang.Float"> - <column name="medianFishingDepth" sql-type="numeric"/> + <column name="medianFishingDepth" precision="6" scale="2" sql-type="numeric"/> </property> <many-to-one name="section" class="fr.ird.observe.entities.data.ll.observation.SectionImpl" column="section" foreign-key="fk_ll_observation_tdr_section" /> <many-to-one name="basket" class="fr.ird.observe.entities.data.ll.observation.BasketImpl" column="basket" foreign-key="fk_ll_observation_tdr_basket" /> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/WeightMeasureImpl.hbm.xml ===================================== @@ -36,7 +36,7 @@ </property> <property name="homeId" access="field" type="java.lang.String" column="homeId"/> <property name="weight" access="field" type="java.lang.Float" not-null="true"> - <column name="weight" sql-type="numeric"/> + <column name="weight" precision="6" scale="4" sql-type="numeric"/> </property> <many-to-one name="weightMeasureType" class="fr.ird.observe.entities.referential.common.WeightMeasureTypeImpl" column="weightMeasureType" foreign-key="fk_ll_observation_weightmeasure_weightmeasuretype" not-null="true" /> </class> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/common/TripImpl.hbm.xml ===================================== @@ -45,10 +45,10 @@ <property name="timeAtSea" access="field" type="java.lang.Integer" column="timeAtSea"/> <property name="fishingTime" access="field" type="java.lang.Integer" column="fishingTime"/> <property name="landingTotalWeight" access="field" type="java.lang.Float"> - <column name="landingTotalWeight" sql-type="numeric"/> + <column name="landingTotalWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="localMarketTotalWeight" access="field" type="java.lang.Float"> - <column name="localMarketTotalWeight" sql-type="numeric"/> + <column name="localMarketTotalWeight" precision="6" scale="3" sql-type="numeric"/> </property> <property name="loch" access="field" type="java.lang.Integer" column="loch"/> <property name="generalComment" access="field" type="java.lang.String" length="8192"> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/observation/NonTargetCatchReleaseImpl.hbm.xml ===================================== @@ -39,7 +39,7 @@ <column length="8192" name="comment"/> </property> <property name="length" access="field" type="java.lang.Float"> - <column name="length" sql-type="numeric"/> + <column name="length" precision="6" scale="3" sql-type="numeric"/> </property> <property name="count" access="field" type="java.lang.Integer" column="count" not-null="true"/> <property name="brailNumber" access="field" type="java.lang.Integer" column="brailNumber"/> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/common/VesselImpl.hbm.xml ===================================== @@ -64,7 +64,7 @@ <column name="length" precision="6" scale="2" sql-type="numeric"/> </property> <property name="capacity" access="field" type="java.lang.Float"> - <column name="capacity" sql-type="numeric"/> + <column name="capacity" precision="6" scale="2" sql-type="numeric"/> </property> <property name="powerCv" access="field" type="java.lang.Integer" column="powerCv"/> <property name="powerKW" access="field" type="java.lang.Integer" column="powerKW"/> ===================================== model/src/main/models/Observe/persistence/attribute/digits.properties ===================================== @@ -21,10 +21,23 @@ ### data.ll.landing.Landing.attribute.latitude=4 data.ll.landing.Landing.attribute.longitude=4 +data.ll.landing.LandingPart.attribute.categoryMax=3 +data.ll.landing.LandingPart.attribute.categoryMin=3 +data.ll.landing.LandingPart.attribute.weight=3 +data.ll.logbook.Activity.attribute.currentSpeed=1 data.ll.logbook.Activity.attribute.latitude=4 data.ll.logbook.Activity.attribute.longitude=4 +data.ll.logbook.Activity.attribute.seaSurfaceTemperature=2 +data.ll.logbook.BaitsComposition.attribute.individualWeight=3 +data.ll.logbook.BranchlinesComposition.attribute.length=4 +data.ll.logbook.BranchlinesComposition.attribute.tracelineLength=4 +data.ll.logbook.Catch.attribute.beatDiameter=3 +data.ll.logbook.Catch.attribute.totalWeight=3 +data.ll.logbook.FloatlinesComposition.attribute.length=4 data.ll.logbook.Sample.attribute.latitude=4 data.ll.logbook.Sample.attribute.longitude=4 +data.ll.logbook.SamplePart.attribute.length=1 +data.ll.logbook.SamplePart.attribute.weight=2 data.ll.logbook.Set.attribute.basketLineLength=4 data.ll.logbook.Set.attribute.haulingEndLatitude=4 data.ll.logbook.Set.attribute.haulingEndLongitude=4 @@ -36,10 +49,28 @@ data.ll.logbook.Set.attribute.settingEndLatitude=4 data.ll.logbook.Set.attribute.settingEndLongitude=4 data.ll.logbook.Set.attribute.settingStartLatitude=4 data.ll.logbook.Set.attribute.settingStartLongitude=4 +data.ll.logbook.Set.attribute.settingVesselSpeed=3 +data.ll.logbook.Set.attribute.shooterSpeed=3 +data.ll.logbook.Set.attribute.snapWeight=3 +data.ll.logbook.Set.attribute.swivelWeight=3 data.ll.logbook.Set.attribute.totalLineLength=4 data.ll.observation.Activity.attribute.latitude=4 data.ll.observation.Activity.attribute.longitude=4 data.ll.observation.Activity.attribute.seaSurfaceTemperature=2 +data.ll.observation.BaitsComposition.attribute.individualWeight=3 +data.ll.observation.Basket.attribute.floatline1Length=4 +data.ll.observation.Basket.attribute.floatline2Length=4 +data.ll.observation.Branchline.attribute.branchlineLength=4 +data.ll.observation.Branchline.attribute.snapWeight=3 +data.ll.observation.Branchline.attribute.swivelWeight=3 +data.ll.observation.Branchline.attribute.tracelineLength=4 +data.ll.observation.BranchlinesComposition.attribute.length=4 +data.ll.observation.BranchlinesComposition.attribute.tracelineLength=4 +data.ll.observation.Catch.attribute.beatDiameter=3 +data.ll.observation.Catch.attribute.gonadeWeight=3 +data.ll.observation.Catch.attribute.totalWeight=3 +data.ll.observation.Encounter.attribute.distance=3 +data.ll.observation.FloatlinesComposition.attribute.length=4 data.ll.observation.Set.attribute.haulingEndLatitude=4 data.ll.observation.Set.attribute.haulingEndLongitude=4 data.ll.observation.Set.attribute.haulingStartLatitude=4 @@ -50,6 +81,23 @@ data.ll.observation.Set.attribute.settingEndLongitude=4 data.ll.observation.Set.attribute.settingStartLatitude=4 data.ll.observation.Set.attribute.settingStartLongitude=4 data.ll.observation.Set.attribute.settingVesselSpeed=2 +data.ll.observation.Set.attribute.shooterSpeed=4 +data.ll.observation.Set.attribute.snapWeight=3 +data.ll.observation.Set.attribute.swivelWeight=3 +data.ll.observation.SizeMeasure.attribute.size=4 +data.ll.observation.Tdr.attribute.fishingEndDepth=2 +data.ll.observation.Tdr.attribute.fishingStartDepth=2 +data.ll.observation.Tdr.attribute.floatline1Length=4 +data.ll.observation.Tdr.attribute.floatline2Length=4 +data.ll.observation.Tdr.attribute.maxFishingDepth=2 +data.ll.observation.Tdr.attribute.meanDeploymentDepth=2 +data.ll.observation.Tdr.attribute.meanFishingDepth=2 +data.ll.observation.Tdr.attribute.medianDeploymentDepth=2 +data.ll.observation.Tdr.attribute.medianFishingDepth=2 +data.ll.observation.Tdr.attribute.minFishingDepth=2 +data.ll.observation.WeightMeasure.attribute.weight=4 +data.ps.common.Trip.attribute.landingTotalWeight=3 +data.ps.common.Trip.attribute.localMarketTotalWeight=3 data.ps.landing.Landing.attribute.weight=4 data.ps.localmarket.Batch.attribute.weight=4 data.ps.localmarket.SampleSpeciesMeasure.attribute.sizeClass=1 @@ -79,6 +127,7 @@ data.ps.observation.Catch.attribute.maxWeight=4 data.ps.observation.Catch.attribute.meanLength=1 data.ps.observation.Catch.attribute.meanWeight=2 data.ps.observation.Catch.attribute.minWeight=4 +data.ps.observation.NonTargetCatchRelease.attribute.length=3 data.ps.observation.Route.attribute.endLogValue=2 data.ps.observation.Route.attribute.startLogValue=2 data.ps.observation.SampleMeasure.attribute.length=1 @@ -94,6 +143,7 @@ referential.common.Species.attribute.maxLength=2 referential.common.Species.attribute.maxWeight=2 referential.common.Species.attribute.minLength=2 referential.common.Species.attribute.minWeight=2 +referential.common.Vessel.attribute.capacity=2 referential.common.Vessel.attribute.length=2 referential.common.Vessel.attribute.searchMaximum=2 referential.common.Wind.attribute.maxSwellHeight=2 ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ExtractTagValues.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.toolkit.templates; import fr.ird.observe.dto.WithAtLeastOneSelected; import fr.ird.observe.dto.data.NoValidationDto; +import fr.ird.observe.spi.ProjectPackagesDefinition; import fr.ird.observe.toolkit.templates.io.TagValuesExtractor; import fr.ird.observe.toolkit.templates.validation.ValidationTagValues; import io.ultreia.java4all.util.SortedProperties; @@ -35,11 +36,14 @@ import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelType; +import org.nuiton.topia.templates.TopiaExtensionTagValues; import org.nuiton.topia.templates.TopiaHibernateTagValues; import java.io.File; import java.io.IOException; import java.io.Writer; +import java.net.URL; +import java.net.URLClassLoader; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -55,6 +59,11 @@ import java.util.Set; @Component(role = Template.class, hint = "fr.ird.observe.toolkit.templates.ExtractTagValues") public class ExtractTagValues extends ObjectModelGenerator { + private static final Set<String> DECIMAL_TYPES = Set.of( + Float.class.getSimpleName(), Float.class.getName(), + Double.class.getSimpleName(), Double.class.getName() + ); + private String filePrefix; private Path outputFile; private Path resourceDirectory; @@ -67,6 +76,7 @@ public class ExtractTagValues extends ObjectModelGenerator { Path rootResourcePath = getConfiguration().getProperty(PROP_RESOURCE_DIRECTORY, File.class).toPath(); Path rootOutputPath = getConfiguration().getProperty(PROP_OUTPUT_DIRECTORY, File.class).toPath().getParent().resolve("java"); + String classifier; if (packageName.contains(".dto")) { classifier = "dto"; @@ -78,7 +88,11 @@ public class ExtractTagValues extends ObjectModelGenerator { resourceDirectory = TagValuesExtractor.getModelPath(rootResourcePath, model, classifier); getLog().info(String.format("[%s] Will generate tag values at %s", classifier, resourceDirectory)); - extractor = createExtractor(model, packageName, classifier); + ProjectPackagesDefinition projectPackagesDefinition; + try (URLClassLoader urlClassLoader = new URLClassLoader(new URL[]{rootResourcePath.toUri().toURL()}, getClassLoader())) { + projectPackagesDefinition = ProjectPackagesDefinition.of(urlClassLoader); + } + extractor = createExtractor(model, packageName, classifier, projectPackagesDefinition); extractor.load(getClassLoader(), resourceDirectory); Set<String> tagValueKeys = extractor.getModelTagValueKeys(); @@ -88,14 +102,15 @@ public class ExtractTagValues extends ObjectModelGenerator { } extractor.store(rootOutputPath); } - - protected TagValuesExtractor createExtractor(ObjectModel model, String packageName, String classifier) { + protected TagValuesExtractor createExtractor(ObjectModel model, String packageName, String classifier, ProjectPackagesDefinition projectPackagesDefinition) { if ("persistence".equals(classifier)) { return new TagValuesExtractor(model, packageName, classifier, getLog()) { + @Override protected void extractAttributeTagValues(ObjectModelClass aClass, ObjectModelAttribute attribute) { super.extractAttributeTagValues(aClass, attribute); checkDateTagValue(aClass, attribute); + checkDecimalAttribute(aClass, attribute); } private void checkDateTagValue(ObjectModelClass aClass, ObjectModelAttribute attribute) { @@ -109,6 +124,18 @@ public class ExtractTagValues extends ObjectModelGenerator { throw new IllegalStateException(String.format("Missing hibernateAttributeType.java.util.Date tag-value on %s#%s (you can use time, date or timestamp)", aClass.getQualifiedName(), attributeName)); } } + + private void checkDecimalAttribute( ObjectModelClass aClass, ObjectModelAttribute attribute) { + if (DECIMAL_TYPES.contains(attribute.getType())) { + // check if digits tag value is set + String attributeName = attribute.getName(); + boolean booleanTagValue = containsAttributeTagValue(aClass, attributeName, TopiaExtensionTagValues.Store.digits.name()); + if (booleanTagValue) { + return; + } + throw new IllegalStateException(String.format("Missing digits tag-value on %1$s#%2$s (you need to set it on %1$s.attribute.%2$s)", projectPackagesDefinition.getRelativeEntityPackage(aClass.getQualifiedName()).substring(1), attributeName)); + } + } }; } if ("dto".equals(classifier)) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/02bad5814cd6573b50c48394… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/02bad5814cd6573b50c48394… You're receiving this email because of your account on gitlab.com.

1 0