Merge pull request #357 from Ghost141/srm_api_update

Update search srm challenges api

Author: wenhui-wd

actions/srmChallenges.js

@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2013-2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.5
- * @author Sky_, freegod, panoptimum
+ * @version 1.6
+ * @author Sky_, freegod, panoptimum, Ghost_141
  * changes in 1.1:
  * - implement srm API
  * changes in 1.2:
@@ -20,6 +20,8 @@
  *   - load round access api
  * changes in 1.5
  * - added API for retrieving SRM schedule
+ * Changes in 1.6:
+ * - Update search srm challenges api to use informixoltp database.
  */
 /*jslint node: true, nomen: true */
 "use strict";
@@ -177,17 +179,17 @@ exports.searchSRMChallenges = {
     description: "searchSRMChallenges",
     inputs: {
         required: [],
-        optional: ["pageSize", "pageIndex", "sortColumn", "sortOrder"]
+        optional: ["pageSize", "pageIndex", "sortColumn", "sortOrder", "listType"]
     },
     blockedConnectionTypes: [],
     outputExample: {},
     version: 'v2',
     transaction: 'read', // this action is read-only
-    databases: ["topcoder_dw"],
+    databases: ["informixoltp"],
     run: function (api, connection, next) {
         api.log("Execute searchSRMChallenges#run", 'debug');
-        var helper = api.helper, params = connection.params, sqlParams,
-            pageIndex, pageSize, sortColumn, sortOrder, error, result,
+        var helper = api.helper, params = connection.params, sqlParams, listType,
+            pageIndex, pageSize, sortColumn, sortOrder, error, result, status,
             dbConnectionMap = connection.dbConnectionMap;
         if (!dbConnectionMap) {
             helper.handleNoConnection(api, connection, next);
@@ -202,11 +204,18 @@ exports.searchSRMChallenges = {
         }
         pageIndex = Number(params.pageIndex || 1);
         pageSize = Number(params.pageSize || DEFAULT_PAGE_SIZE);
+        listType = (params.listType || 'ACTIVE').toUpperCase();
 
         if (!_.isDefined(params.sortOrder) && sortColumn === "roundid") {
             sortOrder = "desc";
         }
 
+        if (listType === helper.ListType.ACTIVE) {
+            status = 'A';
+        } else {
+            status = 'F';
+        }
+
         async.waterfall([
             function (cb) {
                 var allowedSort = helper.getLowerCaseList(ALLOWABLE_SORT_COLUMN);
@@ -219,6 +228,7 @@ exports.searchSRMChallenges = {
                     helper.checkPageIndex(pageIndex, "pageIndex") ||
                     helper.checkPositiveInteger(pageSize, "pageSize") ||
                     helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
+                    helper.checkContains([helper.ListType.ACTIVE, helper.ListType.UPCOMING], listType, 'listType') ||
                     helper.checkContains(allowedSort, sortColumn, "sortColumn");
                 if (error) {
                     cb(error);
@@ -233,7 +243,8 @@ exports.searchSRMChallenges = {
                     firstRowIndex: (pageIndex - 1) * pageSize,
                     pageSize: pageSize,
                     sortColumn: helper.getSortColumnDBName(sortColumn),
-                    sortOrder: sortOrder
+                    sortOrder: sortOrder,
+                    status: status
                 };
 
                 async.parallel({

apiary.apib

@@ -6341,7 +6341,7 @@ Request
 ### View Algorithm SRM Challenges [GET]
 
 + Parameters
-    + listType (optional, string, `Active`) ... The type of challenges to search. It can only be 'ACTIVE', 'OPEN', 'PAST' or 'UPCOMING'. If it's null, 'Active' will be used.
+    + listType (optional, string, `Active`) ... The type of challenges to search. It can only be 'ACTIVE' or 'UPCOMING'. If it's null, 'Active' will be used.
     + filter (optional, string, `type`) ... Key of the filter key-value pair
     + value (optional, string, `Development`) ... Value of the filter key-value pair
     + pageIndex (optional, number, `1`) ... The paging number, 1-based, -1 if no paging. It can be null.

queries/get_srm_challenges

@@ -1,22 +1,41 @@
-select SKIP @firstRowIndex@ FIRST @pageSize@
-       r.round_id
-      ,r.short_name AS name
-      ,cal.date AS start_date
-      ,NVL(rd1.num_coders, 0) + NVL(rd2.num_coders, 0) AS total_competitors
-      ,rd1.num_coders AS div_i_competitors
-      ,rd2.num_coders AS div_ii_competitors
-      ,rd1.problems_submitted AS div_i_total_solutions_submitted
-      ,rd2.problems_submitted AS div_ii_total_solutions_submitted
-      ,CASE WHEN rd1.num_coders = 0 THEN 0 ELSE rd1.problems_submitted / rd1.num_coders END::DECIMAL(10,2) AS div_i_average_solutions_submitted
-      ,CASE WHEN rd2.num_coders = 0 THEN 0 ELSE rd2.problems_submitted / rd2.num_coders END::DECIMAL(10,2) AS div_ii_average_solutions_submitted
-      ,rd1.challenges_made_successful AS div_i_total_solutions_challenged
-      ,rd2.challenges_made_successful AS div_ii_total_solutions_challenged
-      ,CASE WHEN rd1.num_coders = 0 THEN 0 ELSE rd1.challenges_made_successful / rd1.num_coders END::DECIMAL(10,2) AS div_i_average_solutions_challenged
-      ,CASE WHEN rd2.num_coders = 0 THEN 0 ELSE rd2.challenges_made_successful / rd2.num_coders END::DECIMAL(10,2) AS div_ii_average_solutions_challenged
-  FROM  contest c
-        JOIN round AS r ON r.contest_id = c.contest_id AND r.failed = 0 AND r.status='A'
-        LEFT JOIN round_division AS rd1 ON rd1.division_id = 1 AND rd1.round_id = r.round_id
-        LEFT JOIN round_division AS rd2 ON rd2.division_id = 2 AND rd2.round_id = r.round_id
-        JOIN calendar AS cal ON cal.calendar_id = r.calendar_id
-WHERE  r.round_type_id in (1, 2, 10)
+SELECT SKIP @firstRowIndex@ FIRST @pageSize@
+  r.round_id
+, r.name
+, rs.start_time AS start_date
+, NVL(rd1.div_i_competitors, 0) + NVL(rd2.div_ii_competitors, 0) AS total_competitors
+, rd1.div_i_competitors
+, rd2.div_ii_competitors
+, rd1.div_i_total_solutions_submitted
+, rd2.div_ii_total_solutions_submitted
+, CASE WHEN rd1.div_i_competitors = 0 THEN 0 ELSE rd1.div_i_total_solutions_submitted / rd1.div_i_competitors END::DECIMAL(10, 2) AS div_i_average_solutions_submitted
+, CASE WHEN rd2.div_ii_competitors = 0 THEN 0 ELSE rd2.div_ii_total_solutions_submitted / rd2.div_ii_competitors END::DECIMAL(10, 2) AS div_ii_average_solutions_submitted
+, rd1.div_i_total_solutions_challenged
+, rd2.div_ii_total_solutions_challenged
+, CASE WHEN rd1.div_i_competitors = 0 THEN 0 ELSE rd1.div_i_total_solutions_challenged / rd1.div_i_competitors END::DECIMAL(10, 2) AS div_i_average_solutions_challenged
+, CASE WHEN rd2.div_ii_competitors = 0 THEN 0 ELSE rd2.div_ii_total_solutions_challenged / rd2.div_ii_competitors END::DECIMAL(10, 2) AS div_ii_average_solutions_challenged
+FROM round r
+INNER JOIN round_segment rs ON rs.round_id = r.round_id AND rs.segment_id = 1
+LEFT JOIN (
+    SELECT
+      rr.round_id
+    , COUNT(*) AS div_i_competitors
+    , NVL((SELECT COUNT(*) FROM challenge c WHERE c.status_id <> 92 AND c.round_id = rr.round_id AND c.succeeded = 1), 0) AS div_i_total_solutions_challenged
+    , NVL((SELECT SUM(CASE WHEN cs.status_id >= 130 THEN 1 ELSE 0 END) FROM component_state cs WHERE cs.round_id = rr.round_id), 0) AS div_i_total_solutions_submitted
+    FROM room_result rr
+    INNER JOIN room ON room.room_id = rr.room_id AND room.division_id = 1
+    GROUP BY rr.round_id
+) rd1 ON rd1.round_id = r.round_id
+LEFT JOIN (
+    SELECT
+      rr.round_id
+    , COUNT(*) AS div_ii_competitors
+    , NVL((SELECT COUNT(*) FROM challenge c WHERE c.status_id <> 92 AND c.round_id = rr.round_id AND c.succeeded = 1), 0) AS div_ii_total_solutions_challenged
+    , NVL((SELECT SUM(CASE WHEN cs.status_id >= 130 THEN 1 ELSE 0 END) FROM component_state cs WHERE cs.round_id = rr.round_id), 0) AS div_ii_total_solutions_submitted
+    FROM room_result rr
+    INNER JOIN room ON room.room_id = rr.room_id AND room.division_id = 2
+    GROUP BY rr.round_id
+) rd2 ON rd2.round_id = r.round_id
+WHERE r.status = '@status@'
+AND r.round_type_id IN (1, 2, 10)
+
 ORDER BY @sortColumn@ @sortOrder@, round_id desc

queries/get_srm_challenges.json

@@ -1,5 +1,5 @@
 {
   "name"    : "get_srm_challenges",
-  "db"      : "topcoder_dw",
+  "db"      : "informixoltp",
   "sqlfile" : "get_srm_challenges"
-}
+}

queries/get_srm_challenges_count

@@ -1,5 +1,4 @@
 SELECT COUNT(*) AS total_count
-FROM contest AS c 
-JOIN round r ON c.contest_id = r.contest_id AND r.failed = 0 AND r.status='A'
-JOIN calendar AS cal ON cal.calendar_id = r.calendar_id
-WHERE r.round_type_id IN (1,2,10)
+FROM round r
+WHERE r.status = '@status@'
+AND r.round_type_id IN (1, 2, 10)

queries/get_srm_challenges_count.json

@@ -1,5 +1,5 @@
 {
   "name"    : "get_srm_challenges_count",
-  "db"      : "topcoder_dw",
+  "db"      : "informixoltp",
   "sqlfile" : "get_srm_challenges_count"
-}
+}