From c01835f355e6a0e5c5859fd53d0893aa11e58cd1 Mon Sep 17 00:00:00 2001
From: chrisala <chris.godwin.ala@gmail.com>
Date: Wed, 20 Mar 2024 12:09:35 +1100
Subject: [PATCH] Trying different matching approach #823

---
 .../au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy b/src/main/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy
index 71c32d4ef..558bf6c80 100644
--- a/src/main/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy
+++ b/src/main/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy
@@ -103,7 +103,10 @@ class ParatooProtocolConfig {
             log.debug(surveyData.toString())
             return false
         }
-        tmpSurveyId?.orgMintedUUID == surveyId.survey_metadata?.orgMintedUUID
+
+        tmpSurveyId?.survey_details?.survey_model == surveyId.survey_metadata?.survey_details.survey_model &&
+                tmpSurveyId?.survey_details?.time == surveyId.survey_metadata?.survey_details.time &&
+                tmpSurveyId?.survey_details?.uuid == surveyId.survey_metadata?.survey_details.uuid
     }
 
     private Map extractSiteDataFromPlotVisit(Map survey) {