From 5d7cecf91335395b09370daf6a86bf8f1667c6bd Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Thu, 2 Oct 2025 21:03:19 +0300
Subject: [PATCH 1/3] Some small Jenkins ssh issue

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bf083c52a1e..44641385320 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,9 +69,9 @@ stage('Build') {
         println "AMP Version: ${codeVersion}"
         //Used in the initial generation of keys when working with a new jenkins instance
         //****************************************************************
-//        sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
+       sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
         sh "ssh-keyscan -H ${environment} >> ~/.ssh/known_hosts"
-//        sh "cat /root/.ssh/id_rsa.pub"
+       sh "cat /root/.ssh/id_rsa.pub"
         //******************************************************
         countries = sh(returnStdout: true,
                 script: "ssh ${env.jenkinsUser}@${environment} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'")

From 4b26588ed03a275d174d58a5c08ad2b875de85d3 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Fri, 3 Oct 2025 05:34:18 +0300
Subject: [PATCH 2/3] AMP-31054: Senegal CDPI - Create a import process to
 upload the data

---
 Jenkinsfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 44641385320..7a47f84e3bd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,15 +63,14 @@ stage('Build') {
     println "Using environment: ${environment}"
     node('ansible') {
         checkout scm
-
         // Find AMP version
         codeVersion = readMavenPom(file: 'amp/pom.xml').version
         println "AMP Version: ${codeVersion}"
         //Used in the initial generation of keys when working with a new jenkins instance
         //****************************************************************
-       sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
+//        sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
         sh "ssh-keyscan -H ${environment} >> ~/.ssh/known_hosts"
-       sh "cat /root/.ssh/id_rsa.pub"
+//        sh "cat /root/.ssh/id_rsa.pub"
         //******************************************************
         countries = sh(returnStdout: true,
                 script: "ssh ${env.jenkinsUser}@${environment} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'")

From 273d0665f1a2da3c920beba4b0c6ab5b40e5f636 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Fri, 3 Oct 2025 06:15:37 +0300
Subject: [PATCH 3/3] AMP-31054: Senegal CDPI - Create a import process to
 upload the data

---
 .../xmlpatches/general/views/amp_activity.xml     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/amp/src/main/resources/xmlpatches/general/views/amp_activity.xml b/amp/src/main/resources/xmlpatches/general/views/amp_activity.xml
index 74a5b56fc18..58011266a15 100644
--- a/amp/src/main/resources/xmlpatches/general/views/amp_activity.xml
+++ b/amp/src/main/resources/xmlpatches/general/views/amp_activity.xml
@@ -19,11 +19,16 @@
 	<apply>
 		<script>
 			<lang delimiter=";" type="postgres">
-			    DROP VIEW IF EXISTS amp_activity CASCADE;
-			    CREATE OR REPLACE VIEW amp_activity AS
-					SELECT amp_activity_version.*
-					FROM amp_activity_version JOIN amp_activity_group ON 
-						amp_activity_version.amp_activity_id = amp_activity_group.amp_activity_last_version_id AND (amp_activity_version.deleted is null or amp_activity_version.deleted=false);
+				DROP VIEW IF EXISTS amp_activity CASCADE;
+
+				CREATE OR REPLACE VIEW amp_activity AS
+				SELECT DISTINCT ON (a.amp_activity_id)
+				a.*
+				FROM amp_activity_version a
+				JOIN amp_activity_group g
+				ON a.amp_activity_id = g.amp_activity_last_version_id
+				WHERE a.deleted IS NULL OR a.deleted = FALSE
+				ORDER BY a.amp_activity_id, a.amp_activity_id DESC;
        		</lang>
 		</script>
 	</apply>