From 3e9cb2910100ad80e0c87799af96a88507ea7684 Mon Sep 17 00:00:00 2001
From: chrisala <chris.godwin.ala@gmail.com>
Date: Mon, 9 Dec 2024 13:57:57 +1100
Subject: [PATCH] Updated tests #3369

---
 .../org/ala/merit/command/EditOrViewReportCommand.groovy   | 4 +++-
 .../au/org/ala/merit/ManagementUnitControllerSpec.groovy   | 1 +
 .../au/org/ala/merit/OrganisationControllerSpec.groovy     | 1 +
 .../ala/merit/reports/ReportLifecycleListenerSpec.groovy   | 7 +++++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/groovy/au/org/ala/merit/command/EditOrViewReportCommand.groovy b/src/main/groovy/au/org/ala/merit/command/EditOrViewReportCommand.groovy
index 4efd62cca..62c719baf 100644
--- a/src/main/groovy/au/org/ala/merit/command/EditOrViewReportCommand.groovy
+++ b/src/main/groovy/au/org/ala/merit/command/EditOrViewReportCommand.groovy
@@ -43,7 +43,9 @@ abstract class EditOrViewReportCommand implements Validateable {
             model.documentOwner[getEntityIdField()] = id
 
             ReportLifecycleListener listener = reportService.reportLifeCycleListener(model.report)
-            model.putAll(listener.getContextData(entity, model.report))
+            if (listener) {
+                model.putAll(listener.getContextData(entity, model.report))
+            }
         }
     }
 
diff --git a/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy
index 2092ce925..778fe38fa 100644
--- a/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy
@@ -17,6 +17,7 @@ class ManagementUnitControllerSpec extends Specification implements ControllerUn
     ProjectService projectService = Mock(ProjectService)
     MetadataService metadataService = Mock(MetadataService)
 
+
     String adminUserId = 'admin'
     String editorUserId = 'editor'
     String grantManagerUserId = 'grantManager'
diff --git a/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy
index 5256c00df..fb25b07f4 100644
--- a/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy
@@ -46,6 +46,7 @@ class OrganisationControllerSpec extends Specification implements ControllerUnit
         controller.projectService = projectService
         controller.reportService = reportService
         controller.settingService = settingService
+        controller.metadataService = metadataService
 
         grails.converters.JSON.registerObjectMarshaller(new MapMarshaller())
         grails.converters.JSON.registerObjectMarshaller(new CollectionMarshaller())
diff --git a/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy b/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy
index 0529d0819..1baeb3ea6 100644
--- a/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy
@@ -1,6 +1,7 @@
 package au.org.ala.merit.reports
 
 import au.org.ala.ecodata.forms.ActivityFormService
+import au.org.ala.merit.MetadataService
 import groovy.json.JsonSlurper
 import spock.lang.Specification
 
@@ -8,9 +9,11 @@ class ReportLifecycleListenerSpec extends Specification {
 
     ReportLifecycleListener reportData = new ReportLifecycleListener()
     ActivityFormService activityFormService = Mock(ActivityFormService)
+    MetadataService metadataService = Mock(MetadataService)
 
     def setup() {
         reportData.activityFormService = activityFormService
+        reportData.metadataService = metadataService
     }
 
 
@@ -76,10 +79,10 @@ class ReportLifecycleListenerSpec extends Specification {
         ]
 
         when:
-        def result = ReportLifecycleListener.getTargetForReportPeriod(report, scoreId, values)
+        def result = reportData.getTargetsForReportPeriod(report, values)
 
         then:
-        result == [period: '2023-12-31', target: 20]
+        result == [score1:20, score2: 15]
     }
 
     private static Map nhtActivityForm() {