/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 55e09b37

Added by Patrick Plitzner over 8 years ago

ID 55e09b378b83d9fb5f4e7306e9e8a3e48d79897d
Parent 47a71285
Child 3087df1b

Allow null for parent when moving derivatives

         @Override
         @Transactional(readOnly = false)
         public boolean moveDerivate(SpecimenOrObservationBase<?> from, SpecimenOrObservationBase<?> to, DerivedUnit derivate) {
             return moveDerivate(from.getUuid(), to.getUuid(), derivate.getUuid()).isOk();
             return moveDerivate(from!=null?from.getUuid():null, to.getUuid(), derivate.getUuid()).isOk();
+        }
         @Override
         @Transactional(readOnly = false)
         public UpdateResult moveDerivate(UUID specimenFromUuid, UUID specimenToUuid, UUID derivateUuid) {
             // reload specimens to avoid session conflicts
             SpecimenOrObservationBase<?> from = load(specimenFromUuid);
             SpecimenOrObservationBase<?> from = null;
             if(specimenFromUuid!=null){
                 from = load(specimenFromUuid);
+            }
             SpecimenOrObservationBase<?> to = load(specimenToUuid);
             DerivedUnit derivate = (DerivedUnit) load(derivateUuid);
             if (from == null || to == null || derivate == null) {
             if ((specimenFromUuid!=null && from == null) || to == null || derivate == null) {
                 throw new TransientObjectException("One of the CDM entities has not been saved to the data base yet. Moving only works for persisted/saved CDM entities.\n" +
                 		"Operation was move "+derivate+ " from "+from+" to "+to);
+            }
-...
             if(toType==SpecimenOrObservationType.FieldUnit //moving to FieldUnit always works
                     || derivateType==SpecimenOrObservationType.Media //moving media always works
                     || (derivateType.isKindOf(toType) && toType!=derivateType)){ //moving only to parent derivate type
                 // remove derivation event from parent specimen of dragged object
                 DerivationEvent eventToRemove = null;
                 for (DerivationEvent event : from.getDerivationEvents()) {
                     if (event.getDerivatives().contains(derivate)) {
                         eventToRemove = event;
                         break;
                 if(from!=null){
                     // remove derivation event from parent specimen of dragged object
                     DerivationEvent eventToRemove = null;
                     for (DerivationEvent event : from.getDerivationEvents()) {
                         if (event.getDerivatives().contains(derivate)) {
                             eventToRemove = event;
                             break;
+                        }
+                    }
                     from.removeDerivationEvent(eventToRemove);
                     if(eventToRemove!=null){
                         // add new derivation event to target and copy the event parameters of the old one
                         DerivationEvent derivedFromNewOriginalEvent = DerivationEvent.NewSimpleInstance(to, derivate, null);
                         derivedFromNewOriginalEvent.setActor(eventToRemove.getActor());
                         derivedFromNewOriginalEvent.setDescription(eventToRemove.getDescription());
                         derivedFromNewOriginalEvent.setInstitution(eventToRemove.getInstitution());
                         derivedFromNewOriginalEvent.setTimeperiod(eventToRemove.getTimeperiod());
                         derivedFromNewOriginalEvent.setType(eventToRemove.getType());
                         to.addDerivationEvent(derivedFromNewOriginalEvent);
                         derivate.setDerivedFrom(derivedFromNewOriginalEvent);
+                    }
+                }
                 from.removeDerivationEvent(eventToRemove);
                 if(eventToRemove!=null){
                     // add new derivation event to target and copy the event parameters of the old one
                 else{
                     //derivative had no parent before so we use empty derivation event
                     DerivationEvent derivedFromNewOriginalEvent = DerivationEvent.NewSimpleInstance(to, derivate, null);
                     derivedFromNewOriginalEvent.setActor(eventToRemove.getActor());
                     derivedFromNewOriginalEvent.setDescription(eventToRemove.getDescription());
                     derivedFromNewOriginalEvent.setInstitution(eventToRemove.getInstitution());
                     derivedFromNewOriginalEvent.setTimeperiod(eventToRemove.getTimeperiod());
                     derivedFromNewOriginalEvent.setType(eventToRemove.getType());
                     to.addDerivationEvent(derivedFromNewOriginalEvent);
                     derivate.setDerivedFrom(derivedFromNewOriginalEvent);
+                }

             assertEquals("Wrong number of derivation originals!", 1, derivationEvent.getOriginals().size());
             SpecimenOrObservationBase<?> newOriginal = derivationEvent.getOriginals().iterator().next();
             assertEquals("Origin of moved object not correct", specimenB, newOriginal);
             assertEquals("Target of moved object not correct", specimenB, newOriginal);
             assertEquals("Wrong number of derivatives!", 1, derivationEvent.getDerivatives().size());
             DerivedUnit movedDerivate = derivationEvent.getDerivatives().iterator().next();
-...
+        }
         @Test
         public void testMoveDerivateNoParent(){
             DerivedUnit derivedUnit = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
             FieldUnit fieldUnit = FieldUnit.NewInstance();
             occurrenceService.saveOrUpdate(fieldUnit);
             occurrenceService.saveOrUpdate(derivedUnit);
             assertEquals("DerivationEvent not moved to source!", 0, fieldUnit.getDerivationEvents().size());
             occurrenceService.moveDerivate(null, fieldUnit, derivedUnit);
             assertEquals("DerivationEvent not moved to source!", 1, fieldUnit.getDerivationEvents().size());
             DerivationEvent derivationEvent = fieldUnit.getDerivationEvents().iterator().next();
             assertNull(derivationEvent.getType());
             assertEquals("Wrong number of derivation originals!", 1, derivationEvent.getOriginals().size());
             SpecimenOrObservationBase<?> newOriginal = derivationEvent.getOriginals().iterator().next();
             assertEquals("Target of moved object not correct", fieldUnit, newOriginal);
             assertEquals("Wrong number of derivatives!", 1, derivationEvent.getDerivatives().size());
+        }
         @Test
         @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="OccurenceServiceTest.move.xml")
         public void testMoveSequence(){

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 55e09b37

Added by Patrick Plitzner over 8 years ago