Author: blavenier Date: 2013-02-07 18:32:30 +0100 (Thu, 07 Feb 2013) New Revision: 360 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/360 Log: Fix : - NullPointerException on saveFishingOperation() - Fix getFishingOperation query, when no gear store in database Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-02-07 16:04:51 UTC (rev 359) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-02-07 17:32:30 UTC (rev 360) @@ -557,7 +557,9 @@ gearPhysicalFeatures.getOperations().add(target); } } - nameBuffer.append(source.getGear().getLabel()); + if (source.getGear() != null && source.getGear().getLabel() != null) { + nameBuffer.append(source.getGear().getLabel()); + } // Retrieve entities : Fishing Area FishingArea fishingArea; @@ -585,9 +587,11 @@ // Retrieve multirig number, from Gear physical features int cruiseMultirigCount = 1; // default value - GearPhysicalMeasurement gpmMultirigCount = measurementHelper.getGearPhysicalMeasurement(gearPhysicalFeatures, enumeration.PMFM_ID_MULTIRIG_NUMBER); - if (gpmMultirigCount != null && gpmMultirigCount.getNumericalValue() != null) { - cruiseMultirigCount = gpmMultirigCount.getNumericalValue().intValue(); + if (gearPhysicalFeatures != null) { + GearPhysicalMeasurement gpmMultirigCount = measurementHelper.getGearPhysicalMeasurement(gearPhysicalFeatures, enumeration.PMFM_ID_MULTIRIG_NUMBER); + if (gpmMultirigCount != null && gpmMultirigCount.getNumericalValue() != null) { + cruiseMultirigCount = gpmMultirigCount.getNumericalValue().intValue(); + } } // StationNumber Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-02-07 16:04:51 UTC (rev 359) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-02-07 17:32:30 UTC (rev 360) @@ -170,7 +170,7 @@ guf.gear.label AS gearLabel, o.startDateTime AS startDateTime, (select vum.alphanumericalValue from VesselUseMeasurementImpl vum where vum.vesselUseFeatures.id = vuf.id and vum.pmfm.id=:pmfmIdStationNumber) AS stationNumber, - (select gum.numericalValue from GearUseMeasurementImpl gum where gum.gearUseFeatures.id = guf.id and gum.pmfm.id=:pmfmIdMultirigAggregation) AS trawNetNumber + (select gum.alphanumericalValue from GearUseMeasurementImpl gum where gum.gearUseFeatures.id = guf.id and gum.pmfm.id=:pmfmIdMultirigAggregation) AS multirigAggregation FROM FishingOperationImpl o LEFT OUTER JOIN o.gearUseFeatures guf @@ -189,11 +189,11 @@ <![CDATA[ SELECT o.name AS name, - max(guf.gear.label) AS gearLabel, + max(g.label) AS gearLabel, max(o.startDateTime) AS startDateTime, max(o.endDateTime) AS endDateTime, max(o.comments) AS comments, - max(guf.gear.id) AS gearId, + max(g.id) AS gearId, (select vp_start from VesselPositionImpl vp_start where vp_start.operation.id = o.id and vp_start.dateTime = o.startDateTime) AS startVesselPosition, (select vp_end from VesselPositionImpl vp_end where vp_end.operation.id = o.id and vp_end.dateTime = o.endDateTime) AS endVesselPosition, max(case when (rl.locationLevel.id = :locationLevelIdStrata) then rl.id else null end) AS strataId, @@ -202,6 +202,7 @@ FROM FishingOperationImpl o INNER JOIN o.gearUseFeatures guf + LEFT OUTER JOIN guf.gear g LEFT OUTER JOIN guf.fishingAreas fa LEFT OUTER JOIN fa.regulationLocation fa2rl LEFT OUTER JOIN fa2rl.id.location rl Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-02-07 16:04:51 UTC (rev 359) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-02-07 17:32:30 UTC (rev 360) @@ -97,7 +97,6 @@ } @Test - @Ignore public void createFishingOperation(/*FishingOperation bean*/) { // ----------------------------------------------------------------------------- // Prepare data and other entities