task/AMP-31088/Update-importer

.github/workflows/deploy.yml

@@ -65,15 +65,12 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60  # Add timeout to prevent hanging jobs
     steps:
-      - name: Setup SSH agent for Docker build
+      - name: Setup SSH agent with build and deploy keys
         uses: webfactory/ssh-agent@v0.9.0
         with:
-          ssh-private-key: ${{ secrets.DOCKER_BUILD_SSH_KEY || '' }}
-
-      - name: Add deployment SSH key to agent
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
+          ssh-private-key: |
+            ${{ secrets.DOCKER_BUILD_SSH_KEY }}
+            ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
 
       - name: Configure git to use SSH for submodules
         run: |
@@ -520,6 +517,13 @@ jobs:
             echo "IMAGE=$IMAGE_BY_TAG" >> $GITHUB_ENV
           fi
 
+      - name: Debug SSH agent
+        if: steps.check_image.outputs.SKIP_BUILD == 'false'
+        run: |
+          echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
+          ssh-add -l || echo "No keys in agent"
+          ssh -o StrictHostKeyChecking=no -T git@github.com 2>&1 || true
+
       - name: Build Docker image
         if: steps.check_image.outputs.SKIP_BUILD == 'false'
         env:
@@ -533,7 +537,7 @@ jobs:
           # Build SSH args - only add if SSH_AUTH_SOCK is available (from ssh-agent)
           SSH_ARGS=""
           if [ -n "$SSH_AUTH_SOCK" ]; then
-            SSH_ARGS="--ssh default"
+            SSH_ARGS="--ssh default=$SSH_AUTH_SOCK"
           fi
 
           # Collect cache sources for better layer reuse

amp/Dockerfile

@@ -178,6 +178,10 @@ COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-fi
 COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../ampTemplate/node_modules/amp-settings
 # Copy package files for dependency installation
 COPY TEMPLATE/reampv2/package*.json ./
+COPY TEMPLATE/reampv2/packages/ampoffline/package.json ./packages/ampoffline/package.json
+COPY TEMPLATE/reampv2/packages/container/package.json ./packages/container/package.json
+COPY TEMPLATE/reampv2/packages/reampv2-app/package.json ./packages/reampv2-app/package.json
+COPY TEMPLATE/reampv2/packages/user-manager/package.json ./packages/user-manager/package.json
 RUN --mount=type=cache,target=/root/.npm \
     --mount=type=ssh \
     npm-install-with-retry.sh
@@ -252,4 +256,4 @@ LABEL "branch"=$AMP_BRANCH
 ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY
 
 RUN rm -fr /usr/local/tomcat/webapps/ROOT
-COPY --from=compile-mvn /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/
+COPY --from=compile-mvn /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/

amp/src/main/java/org/dgfoundation/amp/ar/ArConstants.java

@@ -387,8 +387,7 @@ public final class ArConstants {
 //  public final static String EXECUTING_AGENCY_PERCENTAGE="Eexecuting Agency Percentage";
 
 
-    //burkina
-//  public final static String PROGRAM_PERCENTAGE="Program Percentage";
+ public final static String PROGRAM_PERCENTAGE="Program Percentage";
 
 
 

amp/src/main/java/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java

@@ -79,6 +79,7 @@ public static JsonApiResponse<ActivitySummary> importActivity(Map<String, Object
                 .getResult();
     }
 
+
     private static Long getFMTemplateId(Map<String, Object> newJson) {
         if (AmpClientModeHolder.isOfflineClient()) {
             Workspace team = TeamUtil.getWorkspace(Long.parseLong(newJson.get("team").toString()));

amp/src/main/java/org/digijava/kernel/ampapi/endpoints/dashboards/services/SectorSchemeDTO.java

@@ -26,12 +26,12 @@ public class SectorSchemeDTO {
     private final SectorDTO[] children;
 
     public SectorSchemeDTO(AmpSectorScheme scheme, SectorDTO[] children) {
-        this.ampSecSchemeId = scheme.getAmpSecSchemeId();
-        this.secSchemeCode = scheme.getSecSchemeCode();
-        this.secSchemeName = scheme.getSecSchemeName();
-        this.showInRMFilters = scheme.getShowInRMFilters();
-        this.used = scheme.isUsed();
-        this.children = children;
+        this.ampSecSchemeId = scheme != null ? scheme.getAmpSecSchemeId() : null;
+        this.secSchemeCode = scheme != null ? scheme.getSecSchemeCode() : null;
+        this.secSchemeName = scheme != null ? scheme.getSecSchemeName() : null;
+        this.showInRMFilters = Boolean.TRUE.equals(scheme != null ? scheme.getShowInRMFilters() : null);
+        this.used = scheme != null && scheme.isUsed();
+        this.children = children != null ? children : new SectorDTO[0];
     }
 
     public Long getAmpSecSchemeId() {

amp/src/main/java/org/digijava/kernel/ampapi/endpoints/indicator/manager/IndicatorManagerService.java

@@ -79,6 +79,88 @@ public MEIndicatorDTO getMEIndicatorById(final Long indicatorId) {
         throw new ApiRuntimeException(BAD_REQUEST,
                 ApiError.toError("Indicator with id " + indicatorId + " not found"));
     }
+    public MEIndicatorDTO getMeIndicatorByNameAndProgramName(String name, String programName) {
+        Session session = PersistenceManager.getSession();
+        AmpIndicator indicator;
+        if (programName==null){
+             indicator = (AmpIndicator) session.createCriteria(AmpIndicator.class)
+                    .add(Restrictions.eq("name", name))
+                    .setMaxResults(1)
+                    .uniqueResult();
+        }
+        else {
+            indicator = (AmpIndicator) session.createCriteria(AmpIndicator.class)
+                    .add(Restrictions.eq("name", name))
+                    .createAlias("program", "p")
+                    .add(Restrictions.eq("p.name", programName))
+                    .setMaxResults(1)
+                    .uniqueResult();
+        }
+
+
+
+        if (indicator != null) {
+            return new MEIndicatorDTO(indicator);
+        }
+
+        throw new ApiRuntimeException(BAD_REQUEST,
+                ApiError.toError("Indicator with name " + name + " and program name " + programName + " not found"));
+    }
+
+    /**
+     * Returns the indicator by name and optional program name, or null if not found.
+     * Use this when you need to look up an indicator without throwing (e.g. data import).
+     * Tries exact name match first; if not found, looks for an indicator whose name contains
+     * the given name (e.g. DB "1.2.1 - Number of ... - 1.2.1" matches file "Number of ...").
+     */
+    public MEIndicatorDTO getMeIndicatorByNameAndProgramNameOptional(String name, String programName) {
+        if (name == null || name.trim().isEmpty()) {
+            return null;
+        }
+        String trimmedName = name.trim();
+        String trimmedProgram = programName != null && !programName.trim().isEmpty() ? programName.trim() : null;
+        try {
+            return getMeIndicatorByNameAndProgramName(trimmedName, trimmedProgram);
+        } catch (ApiRuntimeException e) {
+            logger.info("getMeIndicatorByNameAndProgramNameOptional: exact match not found, trying substring match for name='" + trimmedName + "' programName='" + trimmedProgram + "'");
+
+            // exact match not found, try substring match (e.g. DB "1.2.1 - X - 1.2.1" vs file "X")
+        }
+        return getMeIndicatorByNameSubstringOptional(trimmedName, trimmedProgram);
+    }
+
+    /**
+     * Finds an indicator whose stored name contains the given name (e.g. "1.2.1 - X - 1.2.1" contains "X").
+     * Returns null if none or multiple matches (when program not specified), or the match when program is specified.
+     */
+    private MEIndicatorDTO getMeIndicatorByNameSubstringOptional(String name, String programName) {
+        Session session = PersistenceManager.getSession();
+        String escaped = escapeForLike(name);
+        String pattern = "%" + escaped + "%";
+        String hql = "from " + AmpIndicator.class.getName() + " i where i.name like :name escape '\\'";
+        if (programName != null) {
+            hql += " and i.program is not null and i.program.name = :programName";
+        }
+        org.hibernate.query.Query<?> query = session.createQuery(hql);
+        query.setParameter("name", pattern);
+        if (programName != null) {
+            query.setParameter("programName", programName);
+        }
+        @SuppressWarnings("unchecked")
+        List<AmpIndicator> list = (List<AmpIndicator>) query.list();
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+        if (list.size() > 1 && programName == null) {
+            logger.warn("getMeIndicatorByNameSubstringOptional: multiple indicators contain name substring '" + name + "', returning first");
+        }
+        return new MEIndicatorDTO(list.get(0));
+    }
+
+    private static String escapeForLike(String s) {
+        if (s == null) return null;
+        return s.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_");
+    }
 
     public MEIndicatorDTO createMEIndicator(final MEIndicatorDTO indicatorRequest) {
         Session session = PersistenceManager.getSession();
@@ -167,6 +249,12 @@ private void validateYear(MEIndicatorDTO value) {
     }
 
     private void validateYearRange(String startYear, String endYear, AmpIndicatorGlobalValue value, String error){
+        if (value == null) {
+            return;
+        }
+        if (startYear == null || endYear == null) {
+            return;
+        }
         String startInString = "01/01/" + startYear;
         DateTime dateTime = DateTime.parse(startInString, formatter);
 

amp/src/main/java/org/digijava/kernel/persistence/PersistenceManager.java

@@ -881,4 +881,4 @@ public static <R> R doInTransaction(Function<Session, R> fn) {
             PersistenceManager.closeSession(session);
         }
     }
-}
+}