merge with latest dev

Author: skyhit

LOCAL_SETUP.md

@@ -113,8 +113,17 @@
  * change the other variables.
  * </p>
  *
+ * Version 1.1.4 (TOPCODER DIRECT - FIXES FOR CLOSE PRIVATE CHALLENGE IMMEDIATELY):
+ *     <ol>
+ *         <li>Added {@link #isProjectResultCategory(long)} method</li>
+ *     </ol>
+ * </p>
+ * <p>
+ * Thread safety: the thread safety is completely relied to the managers implementations because it's impossible to
+ * change the other variables.
+ * </p>
  * @author fabrizyo, saarixx, cyberjag, TCSDEVELOPER
- * @version 1.1.3
+ * @version 1.1.4
  */
 public class DefaultUploadServices implements UploadServices {
 
@@ -1627,6 +1636,39 @@ public Resource addPrimaryScreener(long projectId, long userId) throws UploadSer
         }
     }
 
+    /**
+     * Lookup function for project categories that should have a project_result row.  These rows are used
+     * for ratings, reliability, and the Digital Run.
+     *
+     * Copied from online_review: com/cronos/onlinereview/util/ActionsHelper.java#L205
+     *
+     * @param categoryId the category id to look up.
+     * @return whether the provided category id should have a project_result row.
+     * @since 1.1.4
+     */
+    private static boolean isProjectResultCategory(long categoryId) {
+        return (categoryId == 1       // Component Design
+                || categoryId == 2    // Component Development
+                || categoryId == 5    // Component Testing
+                || categoryId == 6    // Application Specification
+                || categoryId == 7    // Application Architecture
+                || categoryId == 9    // Bug Hunt
+                || categoryId == 13   // Test Scenarios
+                || categoryId == 26   // Test Suites
+                || categoryId == 14   // Application Assembly
+                || categoryId == 23   // Application Conceptualization
+                || categoryId == 19   // UI Prototype
+                || categoryId == 24   // RIA Build
+                || categoryId == 25   // RIA Component
+                || categoryId == 29   // Copilot Posting
+                || categoryId == 35   // Content Creation
+                || categoryId == 36   // Reporting
+                || categoryId == 38   // First2Finish
+                || categoryId == 39   // Code
+                || categoryId == 40   // Design F2F (NEW)
+        );
+    }
+
     /**
      * Populate project_result and component_inquiry for new submitters.
      *
@@ -1644,9 +1686,8 @@ private void populateProjectResult(Project project, Collection newSubmitters) th
         PreparedStatement ratingStmt = null;
         PreparedStatement componentInquiryStmt = null;
         long categoryId = project.getProjectCategory().getId();
-        // Only design/development/assembly will modify the project result table.
-        if (categoryId != 1 && categoryId != 2 && categoryId != 14) {
-            // design/development/assembly project need project_result
+
+        if (!isProjectResultCategory(categoryId)) {
             return;
         }
         LOG.log(Level.INFO, "Populating the project result table.");