From fa055645f3f170bb3cc02085915fb20e6134ba61 Mon Sep 17 00:00:00 2001 From: flytoj2ee Date: Tue, 6 Jan 2015 16:26:43 +0800 Subject: [PATCH] filter the round id is 0 record --- actions/rounds.js | 2 +- .../expected_pagination_parameters.json | 80 ++++++++++++------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/actions/rounds.js b/actions/rounds.js index 141d38d54..990be40cc 100644 --- a/actions/rounds.js +++ b/actions/rounds.js @@ -271,7 +271,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) { pageSize = helper.MAX_INT; } - filterCondition = ' 1=1 '; + filterCondition = ' r.round_id > 0 '; if (_.isDefined(params.name)) { // set name filter filterCondition = filterCondition + ' AND LOWER(name) LIKE LOWER("%' + decodeURIComponent(params.name) + '%")'; diff --git a/test/test_files/rounds/expected_pagination_parameters.json b/test/test_files/rounds/expected_pagination_parameters.json index 6871a5cf1..270a12a73 100644 --- a/test/test_files/rounds/expected_pagination_parameters.json +++ b/test/test_files/rounds/expected_pagination_parameters.json @@ -1,13 +1,13 @@ { - "total": 13, + "total": 12, "pageIndex": 2, "pageSize": 2, "data": [ { - "id": 12005, - "name": "test round 12005", - "shortName": "short name 12005", - "type": "Marathon Match", + "id": 12004, + "name": "test round 12004", + "shortName": "short name 12004", + "type": "Screening Tool Problem Sets", "status": "Active", "registrationLimit": 1000, "invitationalType": "Not", @@ -15,35 +15,53 @@ "roundSchedule": [ { "phaseName": "Registration Phase", - "startTime": "2011-11-02T05:50:51.000+05:00", - "endTime": "2011-12-02T05:50:51.000+05:00", + "startTime": "2013-01-02T05:50:51.000+05:00", + "endTime": "2013-02-02T05:50:51.000+05:00", "status": "Past" }, { "phaseName": "Coding Phase", - "startTime": "2011-12-02T05:50:52.000+05:00", - "endTime": "2011-12-05T05:50:51.000+05:00", + "startTime": "2013-02-02T05:50:52.000+05:00", + "endTime": "2013-02-05T05:50:51.000+05:00", + "status": "Past" + }, + { + "phaseName": "Intermission Phase", + "startTime": "2013-02-06T05:50:51.000+05:00", + "endTime": "2013-02-07T05:50:51.000+05:00", + "status": "Past" + }, + { + "phaseName": "Challenge Phase", + "startTime": "2013-02-08T05:50:51.000+05:00", + "endTime": "2013-02-09T05:50:51.000+05:00", "status": "Past" }, { "phaseName": "System Test Phase", - "startTime": "2011-12-10T05:50:51.000+05:00", - "endTime": "2011-12-11T05:50:51.000+05:00", + "startTime": "2013-02-10T05:50:51.000+05:00", + "endTime": "2013-02-11T05:50:51.000+05:00", "status": "Active" }, + { + "phaseName": "Moderated Chat Phase", + "startTime": "2013-02-12T05:50:51.000+05:00", + "endTime": "2013-02-13T05:50:51.000+05:00", + "status": "Draft" + }, { "phaseName": "Room Assignment Phase", - "startTime": "2011-12-14T05:50:51.000+05:00", - "endTime": "2011-12-15T05:50:51.000+05:00", + "startTime": "2013-02-14T05:50:51.000+05:00", + "endTime": "2013-02-15T05:50:51.000+05:00", "status": "Draft" } ] }, { - "id": 12004, - "name": "test round 12004", - "shortName": "short name 12004", - "type": "Screening Tool Problem Sets", + "id": 12003, + "name": "test round 12003", + "shortName": "short name 12003", + "type": "Practice Round", "status": "Active", "registrationLimit": 1000, "invitationalType": "Not", @@ -51,44 +69,44 @@ "roundSchedule": [ { "phaseName": "Registration Phase", - "startTime": "2013-01-02T05:50:51.000+05:00", - "endTime": "2013-02-02T05:50:51.000+05:00", + "startTime": "2013-08-02T04:50:51.000+05:00", + "endTime": "2013-09-02T04:50:51.000+05:00", "status": "Past" }, { "phaseName": "Coding Phase", - "startTime": "2013-02-02T05:50:52.000+05:00", - "endTime": "2013-02-05T05:50:51.000+05:00", + "startTime": "2013-09-02T04:50:52.000+05:00", + "endTime": "2013-09-05T04:50:51.000+05:00", "status": "Past" }, { "phaseName": "Intermission Phase", - "startTime": "2013-02-06T05:50:51.000+05:00", - "endTime": "2013-02-07T05:50:51.000+05:00", + "startTime": "2013-09-06T04:50:51.000+05:00", + "endTime": "2013-09-07T04:50:51.000+05:00", "status": "Past" }, { "phaseName": "Challenge Phase", - "startTime": "2013-02-08T05:50:51.000+05:00", - "endTime": "2013-02-09T05:50:51.000+05:00", + "startTime": "2013-09-08T04:50:51.000+05:00", + "endTime": "2013-09-09T04:50:51.000+05:00", "status": "Past" }, { "phaseName": "System Test Phase", - "startTime": "2013-02-10T05:50:51.000+05:00", - "endTime": "2013-02-11T05:50:51.000+05:00", + "startTime": "2013-09-10T04:50:51.000+05:00", + "endTime": "2013-09-11T04:50:51.000+05:00", "status": "Active" }, { "phaseName": "Moderated Chat Phase", - "startTime": "2013-02-12T05:50:51.000+05:00", - "endTime": "2013-02-13T05:50:51.000+05:00", + "startTime": "2013-09-12T04:50:51.000+05:00", + "endTime": "2013-09-13T04:50:51.000+05:00", "status": "Draft" }, { "phaseName": "Room Assignment Phase", - "startTime": "2013-02-14T05:50:51.000+05:00", - "endTime": "2013-02-15T05:50:51.000+05:00", + "startTime": "2013-09-14T04:50:51.000+05:00", + "endTime": "2013-09-15T04:50:51.000+05:00", "status": "Draft" } ]