AMP-30891-Filter indicators by program

devgateway · Jun 12, 2024 · 11687b6 · 11687b6
1 parent 5e0213a
commit 11687b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AmpPossibleValuesDAO.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AmpPossibleValuesDAO.java
@@ -303,7 +303,7 @@ public static void processThemeWithChildren(AmpTheme theme, Set<AmpTheme> allThe
     }
 
 
-    private List<BigInteger> getProgramIds(Long indicatorId) {
+    public static List<BigInteger> getProgramIds(Long indicatorId) {
         Session session = PersistenceManager.getRequestDBSession();
         String sql = "SELECT theme_id FROM AMP_INDICATOR_CONNECTION " +
                 "WHERE indicator_id = :indicatorId AND sub_clazz='p'";

diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/IndicatorExtraInfo.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/IndicatorExtraInfo.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.math.BigInteger;
 import java.util.List;
 import java.util.Set;
 
@@ -16,14 +17,14 @@ public class IndicatorExtraInfo {
     private final List<Long> sectorIds;
 
 
-    public List<Long> getProgramIds() {
+    public List<BigInteger> getProgramIds() {
         return programIds;
     }
 
     @JsonProperty("program-ids")
-    private final List<Long> programIds;
+    private final List<BigInteger> programIds;
 
-    public IndicatorExtraInfo(String code, List<Long> sectorIds, List<Long> programIds) {
+    public IndicatorExtraInfo(String code, List<Long> sectorIds, List<BigInteger> programIds) {
         this.code = code;
         this.sectorIds = sectorIds;
         this.programIds = programIds;

diff --git a/.../digijava/kernel/ampapi/endpoints/activity/values/AmpIndicatorPossibleValuesProvider.java b/.../digijava/kernel/ampapi/endpoints/activity/values/AmpIndicatorPossibleValuesProvider.java
@@ -1,6 +1,7 @@
 package org.digijava.kernel.ampapi.endpoints.activity.values;
 
 import com.google.common.collect.ImmutableMap;
+import org.digijava.kernel.ampapi.endpoints.activity.AmpPossibleValuesDAO;
 import org.digijava.kernel.ampapi.endpoints.activity.IndicatorExtraInfo;
 import org.digijava.kernel.ampapi.endpoints.activity.PossibleValue;
 import org.digijava.kernel.ampapi.endpoints.common.TranslatorService;
@@ -15,6 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -33,7 +35,7 @@ public List<PossibleValue> getPossibleValues(TranslatorService translatorService
         for (AmpIndicator indicator : indicators) {
             logger.info("Indicator: "+indicator);
             List<Long> sectorIds = getSectorIds(indicator.getSectors());
-            List<Long> programIds = getProgramIds(indicator.getIndicatorId());
+            List<BigInteger> programIds = AmpPossibleValuesDAO.getProgramIds(indicator.getIndicatorId());
             IndicatorExtraInfo extraInfo = new IndicatorExtraInfo(indicator.getCode(), sectorIds, programIds);
             pvs.add(new PossibleValue(indicator.getIndicatorId(), indicator.getName(), ImmutableMap.of(), extraInfo));
         }