Author: tchemit Date: 2013-05-06 09:12:10 +0200 (Mon, 06 May 2013) New Revision: 918 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/918 Log: attach individual batches to the catch batch Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-03 15:49:20 UTC (rev 917) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-06 07:12:10 UTC (rev 918) @@ -29,8 +29,8 @@ import fr.ifremer.adagio.core.dao.administration.programStrategy.Program; import fr.ifremer.adagio.core.dao.administration.user.DepartmentImpl; import fr.ifremer.adagio.core.dao.administration.user.PersonImpl; +import fr.ifremer.adagio.core.dao.data.batch.Batch; import fr.ifremer.adagio.core.dao.data.batch.CatchBatch; -import fr.ifremer.adagio.core.dao.data.batch.SortingBatch; import fr.ifremer.adagio.core.dao.data.operation.FishingOperationImpl; import fr.ifremer.adagio.core.dao.data.sample.Sample; import fr.ifremer.adagio.core.dao.data.sample.SampleDao; @@ -93,13 +93,13 @@ Integer operationId = Integer.valueOf(fishingOperationId); - // Get Vrac / Species Batch - SortingBatch vracSpeciesBatch = getBatch(operationId); + // Get catch Batch + Batch catchBatch = getBatch(operationId); Iterator<Object[]> list = queryList( "allFishingOperationSamplesWithBatch", "fishingOperationId", IntegerType.INSTANCE, operationId, - "batchId", IntegerType.INSTANCE, vracSpeciesBatch.getId() + "batchId", IntegerType.INSTANCE, catchBatch.getId() ); List<IndividualObservationBatch> result = Lists.newArrayList(); @@ -146,12 +146,11 @@ Preconditions.checkNotNull(fishingOperation); Preconditions.checkState(!TuttiEntities.isNew(fishingOperation)); - // Get Vrac / Species Batch - SortingBatch vracSpeciesBatch = getBatch( - fishingOperation.getIdAsInt()); + // Get catch Batch + Batch catchBatch = getBatch(fishingOperation.getIdAsInt()); Sample sample = Sample.Factory.newInstance(); - beanToEntity(bean, sample, vracSpeciesBatch); + beanToEntity(bean, sample, catchBatch); sampleDao.create(sample); bean.setId(String.valueOf(sample.getId())); return bean; @@ -169,15 +168,15 @@ Preconditions.checkNotNull(fishingOperation); Preconditions.checkState(!TuttiEntities.isNew(fishingOperation)); - // Get Vrac / Species Batch - SortingBatch vracSpeciesBatch = getBatch(fishingOperation.getIdAsInt()); + // Get catch Batch + Batch catchBatch = getBatch(fishingOperation.getIdAsInt()); Sample sample = sampleDao.load(bean.getIdAsInt()); if (sample == null) { throw new DataRetrievalFailureException( "Could not retrieve sample id: " + bean.getId()); } - beanToEntity(bean, sample, vracSpeciesBatch); + beanToEntity(bean, sample, catchBatch); sampleDao.update(sample); return bean; } @@ -207,7 +206,9 @@ // -- Internal methods --// // ------------------------------------------------------------------------// - protected void beanToEntity(IndividualObservationBatch source, Sample target, SortingBatch vracSpeciesBatch) { + protected void beanToEntity(IndividualObservationBatch source, + Sample target, + Batch vracSpeciesBatch) { if (TuttiEntities.isNew(source)) { @@ -317,21 +318,21 @@ } - protected SortingBatch getBatch(Integer operationId) { + protected Batch getBatch(Integer operationId) { Preconditions.checkNotNull(operationId); CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(operationId.toString(), false); - - // Vrac / Species - SortingBatch vracSpeciesBatch = batchHelper.getSortingBatch( - catchBatch, - "Vrac > Species > Alive Itemized", - enumeration.PMFM_ID_SORTED_UNSORTED, enumeration.QUALITATIVE_VRAC_ID, - enumeration.PMFM_ID_SORTING_TYPE, enumeration.QUALITATIVE_ID_SORTING_TYPE_SPECIES, - enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED - ); - Preconditions.checkNotNull(vracSpeciesBatch); - return vracSpeciesBatch; + return catchBatch; +// // Vrac / Species +// SortingBatch vracSpeciesBatch = batchHelper.getSortingBatch( +// catchBatch, +// "Vrac > Species > Alive Itemized", +// enumeration.PMFM_ID_SORTED_UNSORTED, enumeration.QUALITATIVE_VRAC_ID, +// enumeration.PMFM_ID_SORTING_TYPE, enumeration.QUALITATIVE_ID_SORTING_TYPE_SPECIES, +// enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED +// ); +// Preconditions.checkNotNull(vracSpeciesBatch); +// return vracSpeciesBatch; } protected void fillSampleMeasurements(IndividualObservationBatch batch) {