From a2b91df6bc3fdfebc23e290c455c3d7fc995b049 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Thu, 17 Jul 2025 12:00:59 +0300
Subject: [PATCH 1/6] AMP-31003: Create views for superset data import

---
 .../analytics/DataImportEndpoints.java        |  73 +++++
 .../services/analytics/DataImportService.java | 151 +++++++++++
 ...31003-Create-Views-For-Superset-import.xml | 254 ++++++++++++++++++
 3 files changed, 478 insertions(+)
 create mode 100644 amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java
 create mode 100644 amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
 create mode 100644 amp/src/main/resources/xmlpatches/4.0/AMP-31003-Create-Views-For-Superset-import.xml

diff --git a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java
new file mode 100644
index 00000000000..5ba2797c7cd
--- /dev/null
+++ b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java
@@ -0,0 +1,73 @@
+package org.digijava.kernel.ampapi.endpoints.analytics;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.digijava.kernel.ampapi.endpoints.security.AuthRule;
+import org.digijava.kernel.ampapi.endpoints.util.ApiMethod;
+import org.digijava.kernel.services.analytics.DataImportService;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Endpoints for fetching data from views for import into another database
+ */
+@Path("analytics")
+@Api("analytics")
+public class DataImportEndpoints {
+
+    /**
+     * Fetches data from the specified views
+     *
+     * @param viewNames list of view names to fetch data from
+     * @return map of view name to list of records
+     */
+    @POST
+    @Path("/import-data")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @ApiMethod(id = "importViewsData")
+    @ApiOperation(
+            value = "Fetch data from views for import",
+            notes = "Returns data from the specified views in a format suitable for import into another database")
+    @ApiResponses({
+            @ApiResponse(code = HttpServletResponse.SC_OK, message = "Data from views"),
+            @ApiResponse(code = HttpServletResponse.SC_BAD_REQUEST, message = "Invalid request")
+    })
+    public Map<String, Object> importData(
+            @ApiParam(value = "List of view names to fetch data from", required = true)
+            List<String> viewNames) {
+
+        return DataImportService.fetchDataFromViews(viewNames);
+    }
+
+    /**
+     * Gets all available views in the database
+     *
+     * @return list of view names
+     */
+    @GET
+    @Path("/views")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    @ApiMethod(id = "getAllViews")
+    @ApiOperation(
+            value = "Get all available views",
+            notes = "Returns a list of all available views in the database")
+    @ApiResponses({
+            @ApiResponse(code = HttpServletResponse.SC_OK, message = "List of views"),
+            @ApiResponse(code = HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message = "Error fetching views")
+    })
+    public List<String> getAllViews() {
+        return DataImportService.getAllViews();
+    }
+}
diff --git a/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java b/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
new file mode 100644
index 00000000000..e58185ba15a
--- /dev/null
+++ b/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
@@ -0,0 +1,151 @@
+package org.digijava.kernel.services.analytics;
+
+import org.dgfoundation.amp.ar.viewfetcher.DatabaseViewFetcher;
+import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.kernel.request.TLSUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service for fetching data from database views for import into another database
+ */
+public class DataImportService {
+    private static final Logger logger = LoggerFactory.getLogger(DataImportService.class);
+
+    /**
+     * Fetches data from a list of views
+     *
+     * @param viewNames list of view names to fetch data from
+     * @return map of view name to list of records
+     */
+    public static Map<String, Object> fetchDataFromViews(List<String> viewNames) {
+        Map<String, Object> result = new LinkedHashMap<>();
+
+        if (viewNames == null || viewNames.isEmpty()) {
+            result.put("error", "No views specified");
+            return result;
+        }
+
+        for (String viewName : viewNames) {
+            try {
+                List<Map<String, Object>> viewData = fetchViewData(viewName);
+                result.put(viewName, viewData);
+            } catch (Exception e) {
+                logger.error("Error fetching data from view: " + viewName, e);
+                Map<String, Object> errorInfo = new HashMap<>();
+                errorInfo.put("error", e.getMessage());
+                result.put(viewName, errorInfo);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Fetches data from a single view
+     *
+     * @param viewName name of the view to fetch data from
+     * @return list of records from the view
+     */
+    private static List<Map<String, Object>> fetchViewData(String viewName) {
+        List<Map<String, Object>> records = new ArrayList<>();
+
+        // Validate that the view exists
+        if (!viewExists(viewName)) {
+            throw new IllegalArgumentException("View does not exist: " + viewName);
+        }
+
+        // Fetch data from the view
+        PersistenceManager.getSession().doWork(connection -> {
+            List<String> columns = new ArrayList<>(SQLUtils.getTableColumns(viewName, true));
+
+            DatabaseViewFetcher.fetchView(connection, TLSUtils.getEffectiveLangCode(), viewName, null,
+                    columns, rs -> {
+                try {
+                    while (rs.next()) {
+                        records.add(resultSetRowToMap(rs));
+                    }
+                } catch (SQLException e) {
+                    throw new RuntimeException("Error processing result set for view: " + viewName, e);
+                }
+            });
+        });
+
+        return records;
+    }
+
+    /**
+     * Converts a ResultSet row to a Map
+     *
+     * @param rs ResultSet to convert
+     * @return Map representation of the row
+     * @throws SQLException if there's an error accessing the ResultSet
+     */
+    private static Map<String, Object> resultSetRowToMap(ResultSet rs) throws SQLException {
+        Map<String, Object> row = new LinkedHashMap<>();
+        ResultSetMetaData metaData = rs.getMetaData();
+        int columnCount = metaData.getColumnCount();
+
+        for (int i = 1; i <= columnCount; i++) {
+            String columnName = metaData.getColumnName(i);
+            Object value = rs.getObject(i);
+            row.put(columnName, value);
+        }
+
+        return row;
+    }
+
+    /**
+     * Checks if a view exists in the database
+     *
+     * @param viewName name of the view to check
+     * @return true if the view exists, false otherwise
+     */
+    private static boolean viewExists(String viewName) {
+        try {
+            return !SQLUtils.getTableColumns(viewName, true).isEmpty();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Gets all available views in the database
+     *
+     * @return list of view names
+     */
+    public static List<String> getAllViews() {
+        List<String> views = new ArrayList<>();
+
+        PersistenceManager.getSession().doWork(connection -> {
+            try (Statement stmt = connection.createStatement()) {
+                String query = "SELECT table_name FROM information_schema.tables " +
+                        "WHERE table_schema = 'public' AND table_type = 'VIEW' " +
+                        "ORDER BY table_name";
+
+                try (ResultSet rs = stmt.executeQuery(query)) {
+                    while (rs.next()) {
+                        views.add(rs.getString("table_name"));
+                    }
+                }
+            } catch (SQLException e) {
+                logger.error("Error fetching views", e);
+                throw new RuntimeException("Error fetching views", e);
+            }
+        });
+
+        return views;
+    }
+}
diff --git a/amp/src/main/resources/xmlpatches/4.0/AMP-31003-Create-Views-For-Superset-import.xml b/amp/src/main/resources/xmlpatches/4.0/AMP-31003-Create-Views-For-Superset-import.xml
new file mode 100644
index 00000000000..f5e2a448155
--- /dev/null
+++ b/amp/src/main/resources/xmlpatches/4.0/AMP-31003-Create-Views-For-Superset-import.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:patch closeOnSuccess="true" retryOnFail="true"
+           xmlns:tns="http://docs.ampdev.net/schemas/xmlpatcher" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://docs.ampdev.net/schemas/xmlpatcher ../doc/xmlpatcher.xsd ">
+    <jira>AMP-31003</jira>
+    <author>bmokandu</author>
+    <description>Add sample views for superset data import</description>
+    <apply>
+        <script>
+            <lang delimiter=";" type="postgres"><![CDATA[
+				-- Create a view for primary sector classification
+CREATE OR REPLACE VIEW primary_sector_classification AS
+SELECT classification_id
+FROM amp_classification_config
+WHERE name = 'Primary';
+
+-- View 1: Activity Count by Status
+CREATE OR REPLACE VIEW view_activity_count_by_status AS
+SELECT
+    approval_status AS "Activity Status",
+    COUNT(*) AS "Number of Activities"
+FROM
+    amp_activity_version
+GROUP BY
+    approval_status
+ORDER BY
+    COUNT(*) DESC;
+
+-- View 2: Total Funding by Year
+CREATE OR REPLACE VIEW view_total_funding_by_year AS
+SELECT
+    EXTRACT(YEAR FROM fd.transaction_date) AS "Year",
+    SUM(fd.transaction_amount) AS "Total Funding Amount"
+FROM
+    amp_funding f
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+GROUP BY
+    EXTRACT(YEAR FROM fd.transaction_date)
+ORDER BY
+    "Year";
+
+-- View 3: Funding by Donor Organization
+CREATE OR REPLACE VIEW view_funding_by_donor_organization AS
+SELECT
+    o.name AS "Donor Organization",
+    SUM(fd.transaction_amount) AS "Total Funding Amount"
+FROM
+    amp_funding f
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+        JOIN
+    amp_organisation o ON f.amp_donor_org_id = o.amp_org_id
+GROUP BY
+    o.name
+ORDER BY
+    "Total Funding Amount" DESC;
+
+-- View 4: Funding by Primary Sector
+CREATE OR REPLACE VIEW view_funding_by_primary_sector AS
+SELECT
+    s.name AS "Primary Sector",
+    SUM(fd.transaction_amount * (acs.sector_percentage / 100)) AS "Total Funding Amount"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_sector acs ON av.amp_activity_id = acs.amp_activity_id
+        JOIN
+    amp_sector s ON acs.amp_sector_id = s.amp_sector_id
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+        JOIN
+    primary_sector_classification psc ON acs.classification_config_id = psc.classification_id
+GROUP BY
+    s.name
+ORDER BY
+    "Total Funding Amount" DESC;
+
+-- View 5: Funding by Program
+CREATE OR REPLACE VIEW view_funding_by_program AS
+SELECT
+    t.name AS "Program",
+    SUM(fd.transaction_amount * (ap.program_percentage / 100)) AS "Total Funding Amount"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_program ap ON av.amp_activity_id = ap.amp_activity_id
+        JOIN
+    amp_theme t ON ap.amp_program_id = t.amp_theme_id
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+GROUP BY
+    t.name
+ORDER BY
+    "Total Funding Amount" DESC;
+
+-- View 6: Activity Count by Program
+CREATE OR REPLACE VIEW view_activity_count_by_program AS
+SELECT
+    t.name AS "Program",
+    COUNT(DISTINCT av.amp_activity_id) AS "Number of Activities"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_program ap ON av.amp_activity_id = ap.amp_activity_id
+        JOIN
+    amp_theme t ON ap.amp_program_id = t.amp_theme_id
+GROUP BY
+    t.name
+ORDER BY
+    "Number of Activities" DESC;
+
+-- View 7: Funding by Location
+CREATE OR REPLACE VIEW view_funding_by_location AS
+SELECT
+    l.name AS "Location",
+    SUM(fd.transaction_amount * (al.location_percentage / 100)) AS "Total Funding Amount"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_location al ON av.amp_activity_id = al.amp_activity_id
+        JOIN
+    amp_location l ON al.location_id = l.amp_location_id
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+GROUP BY
+    l.name
+ORDER BY
+    "Total Funding Amount" DESC;
+
+-- View 8: Funding Trends by Sector Over Time
+CREATE OR REPLACE VIEW view_funding_trends_by_sector_over_time AS
+SELECT
+    EXTRACT(YEAR FROM fd.transaction_date) AS "Year",
+    s.name AS "Sector",
+    SUM(fd.transaction_amount * (acs.sector_percentage / 100)) AS "Funding Amount"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_sector acs ON av.amp_activity_id = acs.amp_activity_id
+        JOIN
+    amp_sector s ON acs.amp_sector_id = s.amp_sector_id
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+        JOIN
+    primary_sector_classification psc ON acs.classification_config_id = psc.classification_id
+GROUP BY
+    "Year", "Sector"
+ORDER BY
+    "Year", "Funding Amount" DESC;
+
+-- View 9: Funding by Donor and Sector
+CREATE OR REPLACE VIEW view_funding_by_donor_and_sector AS
+SELECT
+    o.name AS "Donor Organization",
+    s.name AS "Sector",
+    SUM(fd.transaction_amount * (acs.sector_percentage / 100)) AS "Funding Amount"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_sector acs ON av.amp_activity_id = acs.amp_activity_id
+        JOIN
+    amp_sector s ON acs.amp_sector_id = s.amp_sector_id
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+        JOIN
+    amp_organisation o ON f.amp_donor_org_id = o.amp_org_id
+        JOIN
+    primary_sector_classification psc ON acs.classification_config_id = psc.classification_id
+GROUP BY
+    "Donor Organization", "Sector"
+ORDER BY
+    "Donor Organization", "Funding Amount" DESC;
+
+-- View 10: Activity Implementation Progress
+CREATE OR REPLACE VIEW view_activity_implementation_progress AS
+SELECT
+    av.name AS "Activity Title",
+    av.actual_completion_date,
+    av.actual_start_date,
+    av.proposed_completion_date,
+    av.proposed_start_date,
+    CASE
+        WHEN av.actual_completion_date IS NOT NULL THEN 100
+        WHEN av.actual_start_date IS NOT NULL AND av.proposed_completion_date IS NOT NULL THEN
+            EXTRACT(EPOCH FROM (CURRENT_DATE - av.actual_start_date)) /
+            EXTRACT(EPOCH FROM (av.proposed_completion_date - av.actual_start_date)) * 100
+        ELSE 0
+        END AS "Implementation Progress (%)"
+FROM
+    amp_activity_version av
+WHERE
+    av.proposed_completion_date IS NOT NULL
+ORDER BY
+    "Implementation Progress (%)" DESC;
+
+-- View 11: Funding Gap Analysis
+CREATE OR REPLACE VIEW view_funding_gap_analysis AS
+SELECT
+    av.name AS "Activity Title",
+    SUM(CASE WHEN fd.transaction_type = 0 THEN fd.transaction_amount ELSE 0 END) AS "Commitments",
+    SUM(CASE WHEN fd.transaction_type = 1 THEN fd.transaction_amount ELSE 0 END) AS "Disbursements",
+    SUM(CASE WHEN fd.transaction_type = 1 THEN fd.transaction_amount ELSE 0 END) -
+    SUM(CASE WHEN fd.transaction_type = 0 THEN fd.transaction_amount ELSE 0 END) AS "Funding Gap"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+GROUP BY
+    av.name
+HAVING
+    SUM(CASE WHEN fd.transaction_type = 0 THEN fd.transaction_amount ELSE 0 END) > 0
+ORDER BY
+    "Funding Gap" DESC;
+
+-- View 12: Cross-Sector Analysis
+CREATE OR REPLACE VIEW view_cross_sector_analysis AS
+SELECT
+    av.name AS "Activity Title",
+    STRING_AGG(DISTINCT s.name, ', ') AS "Sectors",
+    COUNT(DISTINCT s.amp_sector_id) AS "Number of Sectors",
+    SUM(fd.transaction_amount) AS "Total Funding Amount"
+FROM
+    amp_activity_version av
+        JOIN
+    amp_activity_sector acs ON av.amp_activity_id = acs.amp_activity_id
+        JOIN
+    amp_sector s ON acs.amp_sector_id = s.amp_sector_id
+        JOIN
+    amp_funding f ON av.amp_activity_id = f.amp_activity_id
+        JOIN
+    amp_funding_detail fd ON f.amp_funding_id = fd.amp_funding_id
+GROUP BY
+    av.name
+HAVING
+    COUNT(DISTINCT s.amp_sector_id) > 1
+ORDER BY
+    "Number of Sectors" DESC, "Total Funding Amount" DESC;
+			]]></lang>
+        </script>
+    </apply>
+</tns:patch>

From ece9898b3e8d6294f4a8beb5989fac615c676a05 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Thu, 17 Jul 2025 12:23:07 +0300
Subject: [PATCH 2/6] AMP-31003: Create views for superset data import

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

diff --git a/Jenkinsfile b/Jenkinsfile
index de276d66652..353483163cc 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 e7a3ac0b9c3bfa49e27d45cca517798b9e553240 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Thu, 17 Jul 2025 12:25:32 +0300
Subject: [PATCH 3/6] AMP-31003: Create views for superset data import

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 353483163cc..de276d66652 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 d6c42323a57943e54b59b2480c150a4788e0b086 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Thu, 17 Jul 2025 13:17:01 +0300
Subject: [PATCH 4/6] AMP-30989: Reopened to correctly change the foreign key

---
 .../kernel/services/analytics/DataImportService.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java b/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
index e58185ba15a..a7ff155ab03 100644
--- a/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
+++ b/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
@@ -74,9 +74,8 @@ private static List<Map<String, Object>> fetchViewData(String viewName) {
             DatabaseViewFetcher.fetchView(connection, TLSUtils.getEffectiveLangCode(), viewName, null,
                     columns, rs -> {
                 try {
-                    while (rs.next()) {
-                        records.add(resultSetRowToMap(rs));
-                    }
+                    // No need to call rs.next() here as it's already called in RsInfo.forEach
+                    records.add(resultSetRowToMap(rs));
                 } catch (SQLException e) {
                     throw new RuntimeException("Error processing result set for view: " + viewName, e);
                 }

From 38e9980cea2c85a4b65f5694ff9396c82441ae50 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Thu, 17 Jul 2025 13:17:01 +0300
Subject: [PATCH 5/6] AMP-31003: Create views for superset data import

---
 .../kernel/services/analytics/DataImportService.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java b/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
index e58185ba15a..a7ff155ab03 100644
--- a/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
+++ b/amp/src/main/java/org/digijava/kernel/services/analytics/DataImportService.java
@@ -74,9 +74,8 @@ private static List<Map<String, Object>> fetchViewData(String viewName) {
             DatabaseViewFetcher.fetchView(connection, TLSUtils.getEffectiveLangCode(), viewName, null,
                     columns, rs -> {
                 try {
-                    while (rs.next()) {
-                        records.add(resultSetRowToMap(rs));
-                    }
+                    // No need to call rs.next() here as it's already called in RsInfo.forEach
+                    records.add(resultSetRowToMap(rs));
                 } catch (SQLException e) {
                     throw new RuntimeException("Error processing result set for view: " + viewName, e);
                 }

From c08c37bd3d90bbd722fa7f86c45b8ecac1d5b006 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Fri, 18 Jul 2025 16:18:41 +0300
Subject: [PATCH 6/6] AMP-31003: Create views for superset data import

---
 .../kernel/ampapi/endpoints/analytics/DataImportEndpoints.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java
index 5ba2797c7cd..35ae2b24db8 100644
--- a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java
+++ b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/analytics/DataImportEndpoints.java
@@ -33,7 +33,7 @@ public class DataImportEndpoints {
      * @return map of view name to list of records
      */
     @POST
-    @Path("/import-data")
+    @Path("/views-data")
     @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
     @Consumes(MediaType.APPLICATION_JSON)
     @ApiMethod(id = "importViewsData")