This is an automated email from the git hooks/post-receive script. New commit to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git commit a206acf33296c778f87dcada2719c184b1d4b82b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 3 09:58:57 2016 +0100 Ajout de toutes les requêtes manquantes dans les spécifications et nommage de le fichier de requêtes de l'application (See #7656) --- .../AllegroCampagne-Specifications.odt | Bin 996724 -> 1017160 bytes .../src/main/resources/queries-failsafe.hbm.xml | 82 +++++++++++++++------ 2 files changed, 61 insertions(+), 21 deletions(-) diff --git a/src/conception/specifications/AllegroCampagne-Specifications.odt b/src/conception/specifications/AllegroCampagne-Specifications.odt index 7924087..2c318ab 100644 Binary files a/src/conception/specifications/AllegroCampagne-Specifications.odt and b/src/conception/specifications/AllegroCampagne-Specifications.odt differ diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index e0d908a..c9ba0e0 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -625,10 +625,11 @@ <query-param name="attachmentId" type="java.lang.Integer"/> </query> - <!-- ===================================================================== --> - <!-- === Requete pour mettre a jour la valeur de SynchronizationStatus === --> - <!-- ===================================================================== --> + <!-- ================================================================================ --> + <!-- === Requete pour mettre a jour la valeur de SynchronizationStatus [SYNCHXXX] === --> + <!-- ================================================================================ --> + <!-- [SYNCH01] Update synchronisation status for a scientific cruise --> <query cacheable="true" name="updateScientificCruiseSynchronizationStatus"> <![CDATA[ UPDATE ScientificCruiseImpl SET synchronizationStatus=:newStatus @@ -639,43 +640,47 @@ <query-param name="newStatus" type="java.lang.String"/> </query> + <!-- [SYNCH02] Update synchronisation status for all fishing trips of a scientific cruise --> <query cacheable="true" name="updateFishingTripSynchronizationStatus"> <![CDATA[ UPDATE FishingTripImpl SET synchronizationStatus=:newStatus - WHERE synchronizationStatus=:oldStatus AND - id IN (SELECT id FROM FishingTripImpl WHERE scientificCruise.id=:cruiseId) + WHERE synchronizationStatus=:oldStatus + AND id IN (SELECT id FROM FishingTripImpl WHERE scientificCruise.id=:cruiseId) ]]> <query-param name="cruiseId" type="java.lang.Integer"/> <query-param name="oldStatus" type="java.lang.String"/> <query-param name="newStatus" type="java.lang.String"/> </query> + <!-- [SYNCH03] Update synchronisation status for all catches batch of a scientific cruise --> <query cacheable="true" name="updateCatchBatchSynchronizationStatus"> <![CDATA[ UPDATE CatchBatchImpl SET synchronizationStatus=:newStatus - WHERE synchronizationStatus=:oldStatus AND - id IN (SELECT id FROM CatchBatchImpl WHERE fishingOperation.fishingTrip.scientificCruise.id=:cruiseId) + WHERE synchronizationStatus=:oldStatus + AND id IN (SELECT id FROM CatchBatchImpl WHERE fishingOperation.fishingTrip.scientificCruise.id=:cruiseId) ]]> <query-param name="cruiseId" type="java.lang.Integer"/> <query-param name="oldStatus" type="java.lang.String"/> <query-param name="newStatus" type="java.lang.String"/> </query> + <!-- [SYNCH04] Update synchronisation status for all samples of a scientific cruise --> <query cacheable="true" name="updateSampleSynchronizationStatus"> <![CDATA[ UPDATE SampleImpl SET synchronizationStatus=:newStatus - WHERE synchronizationStatus=:oldStatus AND - id IN (SELECT id FROM SampleImpl WHERE fishingOperation.fishingTrip.scientificCruise.id=:cruiseId) + WHERE synchronizationStatus=:oldStatus + AND id IN (SELECT id FROM SampleImpl WHERE fishingOperation.fishingTrip.scientificCruise.id=:cruiseId) ]]> <query-param name="cruiseId" type="java.lang.Integer"/> <query-param name="oldStatus" type="java.lang.String"/> <query-param name="newStatus" type="java.lang.String"/> </query> - <!-- ===================================================================== --> - <!-- === Requete techniques de remplacements de référentiels === --> - <!-- ===================================================================== --> + <!-- ========================================================================== --> + <!-- === Requete sur remplacements de référentiels temporaires [REF-TEMPXXX] == --> + <!-- ========================================================================== --> + <!-- [REF-TEMP01-00] Replace manager person in scientific cruise --> <query cacheable="true" name="replaceManagerPersonInScientificCruise"> <![CDATA[ UPDATE ScientificCruiseImpl sc @@ -686,6 +691,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-01] Replace recorder person in scientific cruise --> <query cacheable="true" name="replaceRecorderPersonInScientificCruise"> <![CDATA[ UPDATE ScientificCruiseImpl sc @@ -696,6 +702,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-02] Replace recorder person in fishing trip --> <query cacheable="true" name="replaceRecorderPersonInFishingTrip"> <![CDATA[ UPDATE FishingTripImpl ft @@ -706,6 +713,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-03] Replace person in vessel person features --> <query cacheable="true" name="replacePersonInVesselPersonFeatures"> <![CDATA[ UPDATE VesselPersonFeaturesImpl vpf @@ -716,6 +724,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-04] Count manager person in scientific cruise --> <query cacheable="true" name="countManagerPersonInScientificCruise"> <![CDATA[ SELECT count(*) @@ -725,6 +734,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-05] Count recorder person in scientific cruise --> <query cacheable="true" name="countRecorderPersonInScientificCruise"> <![CDATA[ SELECT count(*) @@ -734,6 +744,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-06] Count recorder person in fishing trip --> <query cacheable="true" name="countRecorderPersonInFishingTrip"> <![CDATA[ SELECT count(*) @@ -743,6 +754,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP01-07] Count person in vessel person features --> <query cacheable="true" name="countPersonInVesselPersonFeatures"> <![CDATA[ SELECT count(*) @@ -752,6 +764,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP02-00] Replacer gear in physical features --> <query cacheable="true" name="replaceGearInGearPhysicalFeatures"> <![CDATA[ UPDATE GearPhysicalFeaturesImpl gpf @@ -762,6 +775,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP02-01] Replacer gear in gear use features --> <query cacheable="true" name="replaceGearInGearUseFeatures"> <![CDATA[ UPDATE GearUseFeaturesImpl gpf @@ -772,6 +786,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP02-02] Count gear in gear physical features --> <query cacheable="true" name="countGearInGearPhysicalFeatures"> <![CDATA[ SELECT count(*) @@ -781,6 +796,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP02-03] Count gear in gear use features --> <query cacheable="true" name="countGearInGearUseFeatures"> <![CDATA[ SELECT count(*) @@ -790,6 +806,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP03-00] Get reference taxon in sorting batch --> <query cacheable="true" name="getReferenceTaxonInSortingBatch"> <![CDATA[ Select b.id From BatchImpl b @@ -798,6 +815,7 @@ <query-param name="sourceId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP03-01] Replace reference taxon in sorting batch --> <query cacheable="true" name="replaceReferenceTaxonInSortingBatch2"> <![CDATA[ UPDATE SortingBatchImpl b @@ -808,6 +826,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP03-02] Replace reference taxon in batch --> <query cacheable="true" name="replaceReferenceTaxonInSortingBatch"> <![CDATA[ UPDATE BatchImpl b @@ -818,6 +837,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP03-03] Replace reference taxon in sample --> <query cacheable="true" name="replaceReferenceTaxonInSample"> <![CDATA[ UPDATE SampleImpl s @@ -828,6 +848,7 @@ <query-param name="targetId" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP03-04] Count reference taxon in batch --> <query cacheable="true" name="countReferenceTaxonInSortingBatch"> <![CDATA[ SELECT count(*) @@ -837,6 +858,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP03-05] Count reference taxon in sample --> <query cacheable="true" name="countReferenceTaxonInSample"> <![CDATA[ SELECT count(*) @@ -846,6 +868,7 @@ <query-param name="id" type="java.lang.Integer"/> </query> + <!-- [REF-TEMP04-00] Replace vessel in cruise --> <query cacheable="true" name="replaceVesselInCruise"> <![CDATA[ UPDATE ScientificCruiseImpl sc @@ -856,6 +879,7 @@ <query-param name="targetId" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-01] Replace vessel in operation vesel association --> <query cacheable="true" name="replaceVesselInOperationVesselAssociation"> <![CDATA[ UPDATE OperationVesselAssociationImpl va @@ -866,6 +890,7 @@ <query-param name="targetId" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-02] Replace vessel in fishing operation --> <query cacheable="true" name="replaceVesselInFishingOperation"> <![CDATA[ UPDATE FishingOperationImpl fo @@ -876,6 +901,7 @@ <query-param name="targetId" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-03] Replace vessel in daily activity calendar --> <query name="replaceVesselInDailyActivityCalendar"> <![CDATA[ UPDATE DailyActivityCalendarImpl ac @@ -886,6 +912,7 @@ <query-param name="targetId" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-04] Replace vessel in landing --> <query name="replaceVesselInLanding"> <![CDATA[ UPDATE LandingImpl l @@ -896,6 +923,7 @@ <query-param name="targetId" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-05] Replace vessel in fishing trip --> <query name="replaceVesselInFishingtrip"> <![CDATA[ UPDATE FishingTripImpl ft @@ -905,7 +933,8 @@ <query-param name="sourceId" type="java.lang.String"/> <query-param name="targetId" type="java.lang.String"/> </query> - + + <!-- [REF-TEMP04-06] Replace vessel in vessel use features --> <query name="replaceVesselInVesselUseFeatures"> <![CDATA[ UPDATE VesselUseFeaturesImpl vuf @@ -915,7 +944,8 @@ <query-param name="sourceId" type="java.lang.String"/> <query-param name="targetId" type="java.lang.String"/> </query> - + + <!-- [REF-TEMP04-07] Replace vessel in gear use features --> <query name="replaceVesselInGearUseFeatures"> <![CDATA[ UPDATE GearUseFeaturesImpl guf @@ -925,7 +955,8 @@ <query-param name="sourceId" type="java.lang.String"/> <query-param name="targetId" type="java.lang.String"/> </query> - + + <!-- [REF-TEMP04-08] Replace vessel in gear physical features --> <query name="replaceVesselInGearPhysicalFeatures"> <![CDATA[ UPDATE GearPhysicalFeaturesImpl gpf @@ -936,6 +967,7 @@ <query-param name="targetId" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-09] Count vessel in cruise --> <query cacheable="true" name="countVesselInCruise"> <![CDATA[ SELECT count(*) @@ -945,6 +977,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-10] Count vessel in operation vessel association --> <query cacheable="true" name="countVesselInOperationVesselAssociation"> <![CDATA[ SELECT count(*) @@ -954,6 +987,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-11] Count vessel in fishing operation --> <query cacheable="true" name="countVesselInFishingOperation"> <![CDATA[ SELECT count(*) @@ -963,6 +997,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-12] Count vessel in activity calendar --> <query name="countVesselInDailyActivityCalendar"> <![CDATA[ SELECT count(*) @@ -972,6 +1007,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-13] Count vessel in landing --> <query name="countVesselInLanding"> <![CDATA[ SELECT count(*) @@ -981,6 +1017,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-14] Count vessel in fishing trip --> <query name="countVesselInFishingtrip"> <![CDATA[ SELECT count(*) @@ -990,6 +1027,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-15] Count vessel in vessel use features --> <query name="countVesselInVesselUseFeatures"> <![CDATA[ SELECT count(*) @@ -999,6 +1037,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-16] Count vessel in gear use features --> <query name="countVesselInGearUseFeatures"> <![CDATA[ SELECT count(*) @@ -1008,6 +1047,7 @@ <query-param name="id" type="java.lang.String"/> </query> + <!-- [REF-TEMP04-17] Count vessel in gear physical features --> <query name="countVesselInGearPhysicalFeatures"> <![CDATA[ SELECT count(*) @@ -1094,7 +1134,7 @@ <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> - <!-- [REF-T04] Get all locations by level and classification --> + <!-- [REF-T04-0] Get all locations by level and classification --> <query cacheable="true" name="allLocationsByLevelAndClassificiation"> <![CDATA[ SELECT @@ -1152,7 +1192,7 @@ </query> - <!-- [REF-T06] Get all ObjectType --> + <!-- [REF-T06-0] Get all ObjectType --> <query cacheable="true" name="allObjectType"> <![CDATA[ SELECT @@ -1180,7 +1220,7 @@ <!-- === Requete sur référentiels [REF-XXX] === --> <!-- ===================================================================== --> - <!-- [REF-01] Get all fishing operation strata / substrata / localite --> + <!-- [REF-01-0] Get all fishing operation strata / substrata / localite --> <query cacheable="true" name="allFishingOperationLocationByParent"> <![CDATA[ SELECT @@ -1235,7 +1275,7 @@ <query-param name="statusDisableCode" type="java.lang.String"/> </query> - <!-- [REF-02] Get all vessel for a given vesselType --> + <!-- [REF-02-0] Get all vessel for a given vesselType --> <query cacheable="true" name="allVessels"> <![CDATA[ SELECT @@ -1353,7 +1393,7 @@ <query-param name="statusDisableCode" type="java.lang.String"/> </query> - <!-- [REF-03] Get all gears for a given gearType --> + <!-- [REF-03-0] Get all gears for a given gearType --> <query cacheable="true" name="allGears"> <![CDATA[ SELECT @@ -1432,7 +1472,7 @@ <query-param name="statusDisableCode" type="java.lang.String"/> </query> - <!-- [REF-04] Get all persons --> + <!-- [REF-04-0] Get all persons --> <query cacheable="true" name="allPersons"> <![CDATA[ SELECT DISTINCT -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.