fix list projects endpoints

Author: xxcxy

tc-online-review-api/src/main/java/com/topcoder/onlinereview/component/or/dataaccess/BaseDataAccess.java

@@ -37,10 +37,13 @@ public class BaseDataAccess {
   /** A <code>long</code> providing the ID of project status <code>Draft</code>. */
   protected static final long PROJECT_STATUS_DRAFT_ID = 2;
 
-  @Value("{data-access.entity-manager-name}")
+  @Value("${data-access.entity-manager-name}")
   private String entityManagerName;
 
-  @Autowired @Qualifier("entityManagerMap")private Map<String, EntityManager> entityManagerMap;
+  @Autowired
+  @Qualifier("entityManagerMap")
+  private Map<String, EntityManager> entityManagerMap;
+
   private EntityManager entityManager;
 
   @PostConstruct

tc-online-review-api/src/main/java/com/topcoder/onlinereview/component/shared/dataaccess/DataAccess.java

@@ -1,8 +1,5 @@
 package com.topcoder.onlinereview.component.shared.dataaccess;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +12,6 @@
  * @see RequestInt
  */
 public class DataAccess {
-  private static Logger log = LoggerFactory.getLogger(DataAccess.class);
   private EntityManager entityManager;
 
   /**

tc-online-review-api/src/main/java/com/topcoder/onlinereview/component/shared/dataaccess/DataRetriever.java

@@ -381,7 +381,7 @@ public Map<String, List<Map<String, Object>>> executeCommand(Map inputMap) throw
         String input = (String) inputs.get(inputCode);
 
         if (input == null) {
-          if (!optional.equals("Y")) {
+          if (!"Y".equals(optional)) {
             throw new Exception("Missing required query input: " + inputCode);
           }
 

tc-online-review-api/src/main/java/com/topcoder/onlinereview/controller/ProjectController.java

@@ -1,21 +1,20 @@
 package com.topcoder.onlinereview.controller;
 
-import com.topcoder.onlinereview.dto.ProjectDto;
-import com.topcoder.onlinereview.service.ProjectService;
+import com.topcoder.onlinereview.component.exception.BaseException;
+import com.topcoder.onlinereview.dto.ListProjectResponse;
+import com.topcoder.onlinereview.service.ListProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 public class ProjectController {
-  @Autowired private ProjectService projectService;
+  @Autowired private ListProjectService listProjectService;
 
   @GetMapping("projects")
-  public List<ProjectDto> listProjects(
-      @RequestParam(required = false, defaultValue = "1") String stid) {
-    return projectService.getProjects(stid);
+  public ListProjectResponse listProjects(
+      @RequestParam(required = false, defaultValue = "1") String stid) throws BaseException {
+    return listProjectService.listProjects(1, "my", 132456L, "Global Manager");
   }
 }

tc-online-review-api/src/main/java/com/topcoder/onlinereview/service/ListProjectService.java

@@ -47,6 +47,9 @@ public class ListProjectService {
   @Autowired private PhaseManager phaseManager;
   @Autowired private ContestEligibilityService contestEligibilityService;
   @Autowired private LookupHelper lookupHelper;
+  @Autowired private ProjectDataAccess projectDataAccess;
+  @Autowired private ProjectPhaseDataAccess phasesDataAccess;
+  @Autowired private DeliverableDataAccess deliverableDataAccess;
 
   public ListProjectResponse listProjects(Integer activeTab, String scope, long userId, String role)
       throws BaseException {
@@ -86,7 +89,6 @@ public ListProjectResponse listProjects(Integer activeTab, String scope, long us
     ProjectStatus draftStatus = lookupHelper.getProjectStatus("Draft");
     ProjectStatus activeStatus = lookupHelper.getProjectStatus("Active");
     Project[] ungroupedProjects;
-    ProjectDataAccess projectDataAccess = new ProjectDataAccess();
     ProjectStatus[] projectStatuses = projectManager.getAllProjectStatuses();
 
     if (activeTab != 1) {
@@ -142,7 +144,6 @@ public ListProjectResponse listProjects(Integer activeTab, String scope, long us
 
     PhaseType[] phaseTypes = phaseManager.getAllPhaseTypes();
 
-    ProjectPhaseDataAccess phasesDataAccess = new ProjectPhaseDataAccess();
     Map<Long, com.topcoder.onlinereview.component.project.phase.Project> phProjects;
 
     if (activeTab != 1) {
@@ -338,7 +339,7 @@ private Project[] filterUsingEligibilityConstraints(
   private Deliverable[] getDeliverables(
       Project[][] projects, Phase[][][] phases, Resource[][][] resources)
       throws DeliverablePersistenceException, DeliverableCheckingException, SearchBuilderException {
-    DeliverableDataAccess deliverableDataAccess = new DeliverableDataAccess();
+
     Map<Long, Map<Long, Long>> deliverableTypes = deliverableDataAccess.getDeliverablesList();
 
     // Validate parameters

tc-online-review-api/src/main/java/com/topcoder/onlinereview/util/CommonUtils.java

@@ -8,39 +8,47 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 public class CommonUtils {
   public static <T, R> R copyProperties(T t, R r) {
     BeanUtils.copyProperties(t, r);
     return r;
   }
 
+  private static <T> T getT(Map<String, Object> map, String key, Function<Object, T> function) {
+    if (map.get(key) == null) {
+      return null;
+    }
+    return function.apply(map.get(key));
+  }
+
   public static Long getLong(Map<String, Object> map, String key) {
-    return Long.parseLong(map.get(key).toString());
+    return getT(map, key, v -> Long.parseLong(v.toString()));
   }
 
   public static Integer getInt(Map<String, Object> map, String key) {
-    return Integer.parseInt(map.get(key).toString());
+    return getT(map, key, v -> Integer.parseInt(v.toString()));
   }
 
   public static Double getDouble(Map<String, Object> map, String key) {
-    return Double.parseDouble(map.get(key).toString());
+    return getT(map, key, v -> Double.parseDouble(v.toString()));
   }
 
   public static Float getFloat(Map<String, Object> map, String key) {
-    return Float.parseFloat(map.get(key).toString());
+    return getT(map, key, v -> Float.parseFloat(v.toString()));
   }
 
   public static Boolean getBoolean(Map<String, Object> map, String key) {
-    return (Boolean) map.get(key);
+    return getT(map, key, v -> (Boolean) v);
   }
 
   public static String getString(Map<String, Object> map, String key) {
-    return map.get(key).toString();
+    return getT(map, key, v -> v.toString());
   }
 
   public static Date getDate(Map<String, Object> map, String key) {
-    return (Date) map.get(key);
+    return getT(map, key, v -> (Date) v);
   }
 
   public static List<Map<String, Object>> executeSql(EntityManager entityManager, String sql) {

tc-online-review-api/src/main/resources/application.properties

@@ -21,6 +21,7 @@ spring.jpa.hibernate.ddl-auto=update
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
+data-access.entity-manager-name=idsEntityManager
 resource.persistence.entity-manager-name=idsEntityManager
 phase.persistence.entity-manager-name=idsEntityManager
 project.persistence.entity-manager-name=idsEntityManager