Author: tchemit Date: 2013-01-14 10:05:07 +0100 (Mon, 14 Jan 2013) New Revision: 185 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/185 Log: refs #1807: [Persistence] Adagio r?\195?\169f?\195?\169rentiel (fix fishingLocation requests) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-13 14:58:21 UTC (rev 184) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 09:05:07 UTC (rev 185) @@ -337,7 +337,7 @@ public List<FishingOperationLocation> getAllFishingOperationStrata(String zoneId) { Iterator<Object[]> sources = queryListWithStatus( "allFishingOperationStratas", - "locationLevel", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_STRATA); + "locationLevelId", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_STRATA); List<FishingOperationLocation> result = Lists.newArrayList(); while (sources.hasNext()) { Object[] source = sources.next(); @@ -351,7 +351,7 @@ public List<FishingOperationLocation> getAllFishingOperationSubStrata(String locationId) { Iterator<Object[]> sources = queryListWithStatus( "allFishingOperationSubStratas", - "locationLevel", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_SUB_STRATA); + "locationLevelId", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_SUB_STRATA); List<FishingOperationLocation> result = Lists.newArrayList(); while (sources.hasNext()) { Object[] source = sources.next(); @@ -365,7 +365,7 @@ public List<FishingOperationLocation> getAllFishingOperationLocation(String locationId) { Iterator<Object[]> sources = queryListWithStatus( "allFishingOperationLocalites", - "locationLevel", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_LOCALITE); + "locationLevelId", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_LOCALITE); List<FishingOperationLocation> result = Lists.newArrayList(); while (sources.hasNext()) { Object[] source = sources.next(); @@ -490,10 +490,10 @@ target.setId(String.valueOf(source[0])); target.setName((String)source[1]); target.setLabel((String)source[2]); - target.setDescription((String)source[3]); - target.setLocationLevel((Integer)source[4]); +// target.setDescription((String)source[3]); + target.setLocationLevel((Integer)source[3]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[5], target); + setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target); return target; } Modified: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-13 14:58:21 UTC (rev 184) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-14 09:05:07 UTC (rev 185) @@ -442,7 +442,7 @@ l.status.code IN (:statusValidCode, :statusTemporaryCode) AND l.locationLevel.id = :locationLevelId ]]> - <query-param name="locationLevel" type="java.lang.Integer"/> + <query-param name="locationLevelId" type="java.lang.Integer"/> <query-param name="statusValidCode" type="java.lang.String"/> <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> @@ -461,6 +461,7 @@ l.status.code IN (:statusValidCode, :statusTemporaryCode) AND l.locationLevel.id = :locationLevelId ]]> + <query-param name="locationLevelId" type="java.lang.Integer"/> <query-param name="statusValidCode" type="java.lang.String"/> <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> @@ -479,6 +480,7 @@ l.status.code IN (:statusValidCode, :statusTemporaryCode) AND l.locationLevel.id = :locationLevelId ]]> + <query-param name="locationLevelId" type="java.lang.Integer"/> <query-param name="statusValidCode" type="java.lang.String"/> <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-01-13 14:58:21 UTC (rev 184) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-01-14 09:05:07 UTC (rev 185) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Country; +import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -215,14 +216,32 @@ @Test public void getAllFishingOperationStrata(/*String zoneId*/) { + List<FishingOperationLocation> result = + service.getAllFishingOperationStrata(null); + Assert.assertNotNull(result); + Assert.assertEquals(596, result.size()); + persistList(FishingOperationLocation.class, "Strata", result); + assertSize(result, storage.getAllFishingOperationStrata(null)); } @Test public void getAllFishingOperationSubStrata(/*String locationId*/) { + List<FishingOperationLocation> result = + service.getAllFishingOperationSubStrata(null); + Assert.assertNotNull(result); + Assert.assertEquals(0, result.size()); + persistList(FishingOperationLocation.class, "SubStrata", result); + assertSize(result, storage.getAllFishingOperationSubStrata(null)); } @Test public void getAllFishingOperationLocation(/*String locationId*/) { + List<FishingOperationLocation> result = + service.getAllFishingOperationLocation(null); + Assert.assertNotNull(result); + Assert.assertEquals(322, result.size()); + persistList(FishingOperationLocation.class, "Localite", result); + assertSize(result, storage.getAllFishingOperationLocation(null)); } @Test