From eee475b0d463f90e59602f4210f09098cb6883e5 Mon Sep 17 00:00:00 2001
From: Jack Brinkman <jack.brinkman@csiro.au>
Date: Wed, 31 Jan 2024 13:43:42 +1000
Subject: [PATCH 1/2] Added new webservice endpoint to get activities
 associated with a project activity

---
 build.gradle                                   |  2 +-
 .../org/ala/ecodata/ActivityController.groovy  | 18 ++++++++++++++++++
 .../au/org/ala/ecodata/UrlMappings.groovy      |  6 ++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0e81c8b25..60f28c2b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id 'jacoco'
 }
 
-version "4.3.1"
+version "4.4-REFASSESS-SNAPSHOT"
 group "au.org.ala"
 description "Ecodata"
 
diff --git a/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy b/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy
index 4e119b638..813cd227b 100644
--- a/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy
+++ b/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy
@@ -185,6 +185,24 @@ class ActivityController {
         }
     }
 
+    /**
+     * Returns a detailed list of all activities associated with a project activity
+     *
+     * @param id of the project activity
+     */
+    def activitiesForProjectActivity(String id) {
+        if (id) {
+            def activityList = []
+
+            activityList.addAll activityService.findAllForProjectActivityId(id, "all")
+
+            asJson([list: activityList])
+        } else {
+            response.status = 404
+            render status:404, text: 'No such id'
+        }
+    }
+
     def listForUser(String id){
 
         def sort = params.sort ?: "lastUpdated"
diff --git a/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy b/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy
index ac42a047c..798afed9e 100644
--- a/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy
+++ b/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy
@@ -46,6 +46,12 @@ class UrlMappings {
             controller = 'activity'
             action = 'activitiesForProject'
         }
+
+        "/ws/activitiesForProjectActivity/$id" {
+            controller = 'activity'
+            action = 'activitiesForProjectActivity'
+        }
+
         "/ws/deleteByProjectActivity/$id" {
             controller = 'activity'
             action = 'deleteByProjectActivity'

From ada9aa4b8d331deab59190ebd4095087c6d88b99 Mon Sep 17 00:00:00 2001
From: Jack Brinkman <jack.brinkman@csiro.au>
Date: Tue, 2 Apr 2024 16:04:03 +1000
Subject: [PATCH 2/2] Fixed snapshot versioning

---
 .gitignore   | 1 +
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3ded67828..3db23c63c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ out
 /grails-app/assets/vendor/
 /node_modules/
 /grails-app/assets/dist/
+~/data/ecodata
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3788706db..1ffcd9fc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id 'jacoco'
 }
 
-version "4.4-REFASSESS-SNAPSHOT"
+version "4.5-SNAPSHOT"
 group "au.org.ala"
 description "Ecodata"