This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit fb06996978cd37ecb364a1929335ece4ddbf1b3a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 15 14:12:41 2015 +0100 fix some lost code :( --- .../referential/GearPersistenceServiceImpl.java | 9 +- .../referential/SpeciesPersistenceServiceImpl.java | 2 +- .../src/main/resources/queries-failsafe.hbm.xml | 103 +++++++++++++++++++-- 3 files changed, 102 insertions(+), 12 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index 0c9d64b..91191b4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -33,6 +33,7 @@ import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationId; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.springframework.stereotype.Service; @@ -89,7 +90,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup @Override public Gear getGear(Integer gearId) { - Object[] source = queryUnique( + Object[] source = queryUniqueWithStatus( "gearById", "gearId", IntegerType.INSTANCE, gearId); @@ -293,9 +294,9 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkArgument(Gears.isTemporaryId(source.getIdAsInt())); - Object[] row = queryUnique( - "gearById", - "gearId", IntegerType.INSTANCE, source.getName()); + Object[] row = queryUniqueWithStatus( + "gearByName", + "gearName", StringType.INSTANCE, source.getName()); Gear result = row == null ? null : loadGear(row); return result; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java index 482f950..f41db68 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java @@ -335,7 +335,7 @@ public class SpeciesPersistenceServiceImpl extends ReferentialPersistenceService String taxonName =TemporaryDataHelper.TEMPORARY_NAME_PREFIX + source.getName(); Object[] row = queryUnique( - "taxonNameReferenceTaxonId", + "taxonNameReferenceTaxonIdByName", "taxonName", StringType.INSTANCE, taxonName); Integer referenceTaxonId = (Integer) row[0]; diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index 80cb2b4..d4aefb1 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -1178,8 +1178,8 @@ <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> - <!-- [REF-02-1] Get a vessel --> - <query cacheable="true" name="vessel"> + <!-- [REF-02-1] Get a vessel by his code --> + <query cacheable="true" name="vesselByCode"> <![CDATA[ SELECT v.code AS vesselCode, @@ -1205,6 +1205,33 @@ <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> + <!-- [REF-02-2] Get a vessel by his internationalRegistrationCode --> + <query cacheable="true" name="vesselByInternationalRegistrationCode"> + <![CDATA[ + SELECT + v.code AS vesselCode, + vrp.registrationCode AS nationalRegistrationCode, + vrp.internationalRegistrationCode as internationalRegistrationCode, + vf.name AS vesselName, + v.status AS status + FROM + VesselImpl v + INNER JOIN v.vesselRegistrationPeriods AS vrp + LEFT OUTER JOIN v.vesselFeatures AS vf + WHERE + v.internationalRegistrationCode = :vesselInternationalRegistrationCode + AND v.status.code IN (:statusValidCode, :statusTemporaryCode) + AND NOT(coalesce(vrp.endDateTime, '2999-12-31 00:00:00') < coalesce(:refDate,sysdate) + OR vrp.vesselRegistrationPeriodPk.startDateTime > coalesce(:refDate,sysdate) + ) + ORDER BY vf.startDateTime DESC + ]]> + <query-param name="vesselInternationalRegistrationCode" type="java.lang.String"/> + <query-param name="refDate" type="java.util.Date"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> + </query> + <!-- [REF-03] Get all gears for a given gearType --> <query cacheable="true" name="allGears"> <![CDATA[ @@ -1224,8 +1251,8 @@ <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> - <!-- [REF-03-1] Get a gear --> - <query cacheable="true" name="gear"> + <!-- [REF-03-1] Get a gear by his id --> + <query cacheable="true" name="gearById"> <![CDATA[ SELECT g.id, @@ -1236,8 +1263,30 @@ FROM GearImpl g WHERE g.id = :gearId + AND g.status.code IN (:statusValidCode, :statusTemporaryCode) ]]> <query-param name="gearId" type="java.lang.Integer"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> + </query> + + <!-- [REF-03-1] Get a gear by his name --> + <query cacheable="true" name="gearByName"> + <![CDATA[ + SELECT + g.id, + g.label, + g.name, + g.gearClassification, + g.status AS status + FROM GearImpl g + WHERE + g.name = :gearName + AND g.status.code IN (:statusValidCode, :statusTemporaryCode) + ]]> + <query-param name="gearName" type="java.lang.String"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> <!-- [REF-04] Get all persons --> @@ -1269,8 +1318,8 @@ <query-param name="departementPrefixCode" type="java.lang.String"/> </query> - <!-- [REF-04-1] Get one person --> - <query cacheable="true" name="person"> + <!-- [REF-04-1] Get one person by his id --> + <query cacheable="true" name="personById"> <![CDATA[ SELECT DISTINCT p.id, @@ -1279,9 +1328,49 @@ p.department.code, p.status FROM PersonImpl p - WHERE p.id = :personId + WHERE + p.id = :personId + AND p.status.code IN (:statusValidCode, :statusTemporaryCode) ]]> <query-param name="personId" type="java.lang.Integer"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> + </query> + + <!-- [REF-04-2] Get one person by his full name --> + <query cacheable="true" name="personByFullName"> + <![CDATA[ + SELECT DISTINCT + p.id, + p.lastname, + p.firstname, + p.department.code, + p.status + FROM PersonImpl p + WHERE + p.firstname = :personFirstName + p.lastname = :personLastName + AND p.status.code IN (:statusValidCode, :statusTemporaryCode) + ]]> + <query-param name="personFirstName" type="java.lang.String"/> + <query-param name="personLastName" type="java.lang.String"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> + </query> + + <!-- [REF-05-0] Get a taxon reference id by his name --> + <query cacheable="true" name="taxonNameReferenceTaxonIdByName"> + <![CDATA[ + SELECT + tn.referenceTaxon.id + FROM + TaxonNameImpl tn + WHERE + tn.name = :taxonName + AND tn.isReferent = true + AND tn.isObsolete = false + ]]> + <query-param name="taxonName" type="java.lang.String"/> </query> <!-- ===================================================================== --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.