From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 16 Oct 2023 10:59:54 +0000 (+0200)
Subject: ref #10397: add check for IndividualsAssociation
X-Git-Tag: 5.41.0^2~35
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/19c32a0cbf926ef4fdcad0b029933fc5baf67d21?ds=sidebyside

ref #10397: add check for IndividualsAssociation
---

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
index 861f52db26..22b0f562c5 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
@@ -567,25 +567,25 @@ public class OccurrenceServiceImpl
                     DerivedUnitDTO derivativeDTO;
                     if (!alreadyCollectedUnits.containsKey(unit.getUuid())){
                         DerivedUnit derivedUnit = (DerivedUnit)unit;
-                        boolean isAssociated = true;
+                        boolean isAssociated = false;
                         for (DeterminationEvent determination:derivedUnit.getDeterminations()) {
                             	if (determination.getTaxonName() != null && determination.getTaxonName().equals(taxon.getName()) || taxon.equals(determination.getTaxon())){
                             		isAssociated = true;
                             		break;
-                            	}else {
-                            	    isAssociated = false;
+//                            	}else {
+//                            	    isAssociated = false;
+                            	}
+                        }
+                        for (TaxonDescription desc: taxon.getDescriptions()) {
+                            for (DescriptionElementBase descElement: desc.getElements()) {
+                                if (descElement instanceof IndividualsAssociation) {
+                                    if (((IndividualsAssociation)descElement).getAssociatedSpecimenOrObservation().getUuid().equals(derivedUnit.getUuid())) {
+                                        isAssociated = true;
+                                        break;
+                                    }
+                                }
                             }
                         }
-//                        for (TaxonDescription desc: taxon.getDescriptions()) {
-//                            for (DescriptionElementBase descElement: desc.getElements()) {
-//                                if (descElement instanceof IndividualsAssociation) {
-//                                    if (((IndividualsAssociation)descElement).getAssociatedSpecimenOrObservation().getUuid().equals(derivedUnit.getUuid())) {
-//                                        isAssociated = true;
-//                                        break;
-//                                    }
-//                                }
-//                            }
-//                        }
 
                         if (!isAssociated) {
                         	continue;