Merge pull request #105 from topcoder-platform/dev

Support number of submitters

Author: skyhit

src/main/java/com/appirio/service/challengefeeder/api/challengelisting/ChallengeListingData.java

@@ -113,6 +113,13 @@ public class ChallengeListingData extends IdentifiableData {
     @Setter
     private Integer numberOfSubmissions;
 
+    /**
+     * The numberOfSubmitters field
+     */
+    @Getter
+    @Setter
+    private Integer numberOfSubmitters;
+
     /**
      * The numberOfRegistrants field
      */

src/main/java/com/appirio/service/challengefeeder/manager/ChallengeListingMMFeederManager.java

@@ -145,7 +145,7 @@ public void pushMarathonMatchDataIntoChallenge(MmFeederParam param) throws Suppl
 
         List<Map<String, Object>> submitterIds = this.challengeListingMmFeederDAO.getSubmitterIds(queryParameter);
         ChallengeFeederUtil.associateSubmitterIds(mms, submitterIds);
-        
+
         mms.forEach(c -> {
             if (c.getForumId() != null) {
                 c.setForumLink(forumLinkUrl + c.getForumId());
@@ -161,6 +161,7 @@ public void pushMarathonMatchDataIntoChallenge(MmFeederParam param) throws Suppl
             if (c.getStatus() != null) {
                 c.setStatus(c.getStatus().trim());
             }
+            c.setNumberOfSubmitters(c.getSubmitterIds() != null ? c.getSubmitterIds().size() : 0);
         });
 
         try {

src/main/resources/sql/challenge-feeder/get_challenges_listing.sql

@@ -24,12 +24,16 @@ SELECT
          Nvl(pp2.actual_end_time, pp2.scheduled_end_time) AS submissionEndDate,
          review_type_info.value AS reviewType,
          forum_id_info.value AS forumId,
-    (SELECT Count(unique s1.create_user)
+    (SELECT Count(*)
      FROM submission s1
      INNER JOIN upload u1 ON s1.upload_id = u1.upload_id
      WHERE u1.project_id = p.project_id
-       AND s1.submission_type_id = 1
        AND s1.submission_status_id <> 5) AS numberOfSubmissions,
+    (SELECT Count(unique u2.resource_id)
+     FROM submission s2
+     INNER JOIN upload u2 ON s2.upload_id = u2.upload_id
+     WHERE u2.project_id = p.project_id
+       AND s2.submission_status_id <> 5) AS numberOfSubmitters,
     (SELECT Count(*)
      FROM RESOURCE r
      INNER JOIN resource_info ri1 ON ri1.resource_info_type_id = 1 and r.resource_id = ri1.resource_id