Adding Search project by project code

Author: Damian Rychter

amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityEPConstants.java

@@ -70,6 +70,8 @@ public enum RequiredValidation {
     public static final String AMP_ACTIVITY_ID_FIELD_NAME =
             FieldMap.underscorify(ActivityFieldsConstants.AMP_ACTIVITY_ID);
     public static final String AMP_ID_FIELD_NAME = FieldMap.underscorify(ActivityFieldsConstants.AMP_ID);
+
+    public static final String PROJECT_CODE_FIELD_NAME = FieldMap.underscorify(ActivityFieldsConstants.PROJECT_CODE);
     public static final String MODIFIED_BY_FIELD_NAME =
             FieldMap.underscorify(ActivityFieldsConstants.MODIFIED_BY);
     public static final String VERSION_FIELD_NAME = FieldMap.underscorify(ActivityFieldsConstants.VERSION);

amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java

@@ -226,25 +226,32 @@ public static boolean canViewActivityIfCreatedInPrivateWs(ContainerRequest conta
                 getAmpTeamId())));
     }
 
-    /**
-     * Batch export of activities by amp-ids
-     * @param ampIds
-     * @return
-     */
-    public static Collection<Map<String, Object>> getActivitiesByAmpIds(List<String> ampIds) {
+
+    public static Collection<Map<String, Object>> getActivitiesByIds(List<String> ids, ActivityFilterIdEnum discriminator) {
         Map<String, Map<String, Object>> jsonActivities = new HashMap<>();
         ActivityExporter exporter = new ActivityExporter(null);
         // TODO report duplicate/empty amp-ids?
-        Set<String> uniqueAmpIds = new HashSet(ampIds);
+        Set<String> uniqueAmpIds = new HashSet(ids);
         uniqueAmpIds.remove("");
-        ampIds = new ArrayList<>(uniqueAmpIds);
+        ids = new ArrayList<>(uniqueAmpIds);
         // temporary until the root cause for stale cache is fixed
         PersistenceManager.getSession().setCacheMode(CacheMode.REFRESH);
 
-        for (int fromIndex = 0; fromIndex < ampIds.size(); fromIndex += ActivityEPConstants.BATCH_DB_QUERY_SIZE) {
-            int end = Math.min(ampIds.size(), fromIndex + ActivityEPConstants.BATCH_DB_QUERY_SIZE);
-            List<String> currentAmpIds = ampIds.subList(fromIndex, end);
-            List<AmpActivityVersion> activities = ActivityUtil.getActivitiesByAmpIds(currentAmpIds);
+        for (int fromIndex = 0; fromIndex < ids.size(); fromIndex += ActivityEPConstants.BATCH_DB_QUERY_SIZE) {
+            int end = Math.min(ids.size(), fromIndex + ActivityEPConstants.BATCH_DB_QUERY_SIZE);
+            List<String> currentAmpIds = ids.subList(fromIndex, end);
+            List<AmpActivityVersion> activities = new ArrayList<>();
+            switch (discriminator){
+                case AMP_ID: {
+                    activities = ActivityUtil.getActivitiesByAmpIds(currentAmpIds);
+                    break;
+                }
+                case BUDGET_CODE_PROJECT: {
+                    activities = ActivityUtil.getActivitiesByBudgetCodeProject(currentAmpIds);
+                    break;
+                }
+            }
+
             activities.forEach(activity -> {
                 String ampId = activity.getAmpId();
                 Map<String, Object> result = new LinkedHashMap<>();
@@ -271,20 +278,44 @@ public static Collection<Map<String, Object>> getActivitiesByAmpIds(List<String>
             });
             PersistenceManager.getSession().clear();
         }
-        reportActivitiesNotFound(uniqueAmpIds, jsonActivities);
+        reportActivitiesNotFound(uniqueAmpIds, jsonActivities, discriminator);
         // Always succeed on normal exit, no matter if some activities export failed
         EndpointUtils.setResponseStatusMarker(HttpServletResponse.SC_OK);
         return jsonActivities.values();
     }
 
+    /**
+     * Batch export of activities by amp-ids
+     * @param ampIds
+     * @return
+     */
+    public static Collection<Map<String, Object>> getActivitiesByAmpIds(List<String> ampIds) {
+        return getActivitiesByIds(ampIds, ActivityFilterIdEnum.AMP_ID);
+    }
+
+    public static Collection<Map<String, Object>> getActivitiesByBudgetCodeProjectIds(List<String> projectCodeIds) {
+        return getActivitiesByIds(projectCodeIds, ActivityFilterIdEnum.BUDGET_CODE_PROJECT);
+    }
+
     private static void reportActivitiesNotFound(Set<String> ampIds,
-            Map<String, Map<String, Object>> processedActivities) {
+                                                 Map<String, Map<String, Object>> processedActivities,
+                                                 ActivityFilterIdEnum discriminator) {
         if (processedActivities.size() != ampIds.size()) {
             ampIds.removeAll(processedActivities.keySet());
             ampIds.forEach(ampId -> {
                 Map<String, Object> notFoundJson = new LinkedHashMap<>();
                 notFoundJson.put(EPConstants.ERROR, ApiError.toError(ActivityErrors.ACTIVITY_NOT_FOUND).getErrors());
-                notFoundJson.put(ActivityEPConstants.AMP_ID_FIELD_NAME, ampId);
+                switch (discriminator){
+                    case AMP_ID: {
+                        notFoundJson.put(ActivityEPConstants.AMP_ID_FIELD_NAME, ampId);
+                        break;
+                    }
+                    case BUDGET_CODE_PROJECT: {
+                        notFoundJson.put(ActivityEPConstants.PROJECT_CODE_FIELD_NAME, ampId);
+                        break;
+                    }
+                }
+
                 processedActivities.put(ampId, notFoundJson);
             });
         }
@@ -416,4 +447,9 @@ public static Double doPPCCalculations(AmpAnnualProjectBudget apb, String toCurr
 
         return calculatedAmount.doubleValue();
     }
+
+    public enum ActivityFilterIdEnum {
+        AMP_ID, BUDGET_CODE_PROJECT
+    }
+
 }

amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java

@@ -366,6 +366,30 @@ public Collection<Map<String, Object>> getProjectsByAmpIds(@ApiParam(value = "Li
         return ActivityInterchangeUtils.getActivitiesByAmpIds(ampIds);
     }
 
+    @POST
+    @Path("/projects/budget-code-project")
+    @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+    @ApiMethod(authTypes = AuthRule.AUTHENTICATED, id = "getProjectsByAmpIds", ui = false)
+    @ApiOperation("Retrieve activities by Budget code project Ids.")
+    @ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK,
+            message = "A list of projects with full set of configured fields and their values. For each amp_id that is "
+                    + "invalid or its export failed, the entry will provide only the 'amp_id' and the 'error'",
+            examples =
+            @Example(value = {
+                    @ExampleProperty(
+                            mediaType = "application/json;charset=utf-8",
+                            value = "[\n  {\n    \"internal_id\": 912,\n    \"amp_id\": \"872329912\",\n    ...\n  }"
+                                    + ",\n  "
+                                    + "{\n    \"amp_id\": \"invalid\",\n    \"error\": {\n      \"0132\": "
+                                    + "[{ \"Activity not found\": null }]\n    }\n  }\n]\n"
+                    )
+            })
+    ))
+    public Collection<Map<String, Object>> getProjectsByProjectCodeIds(@ApiParam(value = "List of project-code", required = true)
+                                                               List<String> budgetCodeProjectIds) {
+        return ActivityInterchangeUtils.getActivitiesByBudgetCodeProjectIds(budgetCodeProjectIds);
+    }
+
     @POST
     @Path("/")
     @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")

amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/integration/service/DagServiceImpl.java

@@ -6,19 +6,13 @@
 import org.digijava.kernel.ampapi.endpoints.integration.dto.DagRunsResponseDTO;
 import org.digijava.kernel.ampapi.endpoints.util.ObjectMapperUtils;
 import org.digijava.kernel.restclient.RestClient;
-import org.digijava.kernel.user.User;
-import org.digijava.kernel.util.UserUtils;
 import org.digijava.module.aim.helper.GlobalSettingsConstants;
-import org.digijava.module.aim.helper.TeamMember;
 import org.digijava.module.aim.util.FeaturesUtil;
-import org.digijava.module.aim.util.TeamMemberUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
 import java.nio.charset.StandardCharsets;
@@ -54,7 +48,6 @@ public static DagServiceImpl getInstance(){
         return dagService;
     }
 
-    //    @Value("${airflow.api.url}")
     private String endpointUrl =FeaturesUtil.getGlobalSettingValue(GlobalSettingsConstants.INTEGRATION_AIRFLOW_URL);
     private String airflowUsername = FeaturesUtil.getGlobalSettingValue(GlobalSettingsConstants.INTEGRATION_AIRFLOW_USERNAME);
     private String airflowUserPassword = FeaturesUtil.getGlobalSettingValue(GlobalSettingsConstants.INTEGRATION_AIRFLOW_PASSWORD);
@@ -88,7 +81,9 @@ public DagRunsResponseDTO dagRuns(DagRunsRequestDTO dagRunsRequest) {
         HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(payload, headers);
 
         RestClient client = RestClient.getInstance(RestClient.Type.JSON);
-        ClientResponse response = client.requestPOST(endpointUrl + dagRunsUrl.replace("#template", dagRunsRequest.getDagId()), requestEntity);
+        String airflowUrl = endpointUrl + dagRunsUrl.replace("#template", dagRunsRequest.getDagId());
+        LOGGER.info("Airflow url {}", airflowUrl);
+        ClientResponse response = client.requestPOST(airflowUrl, requestEntity);
         if (response.getStatus() == HttpStatus.OK.value()) {
             return ObjectMapperUtils.readValueFromString(response.getEntity(String.class), DagRunsResponseDTO.class);
         } else {

amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java

@@ -537,6 +537,15 @@ public static List<AmpActivityVersion> getActivitiesByAmpIds(List<String> ampIds
                 .list();
     }
 
+    public static List<AmpActivityVersion> getActivitiesByBudgetCodeProject(List<String> projectCodeIds) {
+        String queryString = "select a from "
+                + AmpActivity.class.getName()
+                + " a where a.budgetCodeProjectID in (:budgetCodeProjectIds) ";
+        return PersistenceManager.getSession().createQuery(queryString)
+                .setParameterList("budgetCodeProjectIds", projectCodeIds)
+                .list();
+    }
+
   public static AmpActivityVersion loadAmpActivity(Long id){
      return (AmpActivityVersion) PersistenceManager.getSession().load(AmpActivityVersion.class, id);
   }