From 3a333ff126119096fb1c99e1198dac8a3db5cd1b Mon Sep 17 00:00:00 2001
From: sal153 <joseph.salomon@csiro.au>
Date: Mon, 20 Jan 2025 12:42:05 +1100
Subject: [PATCH] commit progress update #1659

---
 .../ala/biocollect/BioActivityController.groovy    | 14 ++++++++++++--
 .../swagger/model/BioCollectModels.groovy          |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/grails-app/controllers/au/org/ala/biocollect/BioActivityController.groovy b/grails-app/controllers/au/org/ala/biocollect/BioActivityController.groovy
index 718c9ebc7..615f91eab 100644
--- a/grails-app/controllers/au/org/ala/biocollect/BioActivityController.groovy
+++ b/grails-app/controllers/au/org/ala/biocollect/BioActivityController.groovy
@@ -1820,6 +1820,12 @@ class BioActivityController {
                             in = ParameterIn.PATH,
                             required = true,
                             description = "Activity id"
+                    ),
+                    @Parameter(
+                            name = "includeSiteData",
+                            in = ParameterIn.PATH,
+                            description = "Include site data",
+                            schema = @Schema(type = "boolean", defaultValue = "false")
                     )
             ],
             responses = [
@@ -1854,8 +1860,8 @@ class BioActivityController {
             ],
             security = @SecurityRequirement(name="auth")
     )
-    @Path("ws/bioactivity/data/simplified/{id}")
-    def getOutputForActivitySimplified(String id){
+    @Path("ws/bioactivity/data/simplified/{id}/{includeSiteData}")
+    def getOutputForActivitySimplified(String id, boolean includeSiteData){
         String userId = userService.getCurrentUserId()
         def activity = activityService.get(id)
         String projectId = activity?.projectId
@@ -1872,6 +1878,10 @@ class BioActivityController {
             model.error = "No project associated with the activity"
         } else if (projectService.isUserAdminForProject(userId, projectId) || activityService.isUserOwnerForActivity(userId, activity?.activityId)) {
             model = [activity: activity]
+            if (includeSiteData) {
+                model = activityAndOutputModel(activity, activity.projectId)
+            }
+            
         } else {
             response.status = 401
             model.error = "Access denied: User is not an owner of this activity ${activity?.activityId}"
diff --git a/src/main/groovy/au/org/ala/biocollect/swagger/model/BioCollectModels.groovy b/src/main/groovy/au/org/ala/biocollect/swagger/model/BioCollectModels.groovy
index a057a2e2f..e087d9f16 100644
--- a/src/main/groovy/au/org/ala/biocollect/swagger/model/BioCollectModels.groovy
+++ b/src/main/groovy/au/org/ala/biocollect/swagger/model/BioCollectModels.groovy
@@ -310,7 +310,7 @@ class ProjectSearchResponse {
     List<Facet> facets
 }
 
-// classes for "ws/bioactivity/data/simplified/{id}
+// classes for "ws/bioactivity/data/simplified/{id}/{includeSiteData}
 @JsonIgnoreProperties('metaClass')
 class GetOutputForActivitySimplifiedResponse {
     Map activity