fixed bug in task exclusion

Author: ajefts

queries/get_past_challenges_count

@@ -1,76 +1,35 @@
-SELECT is_studio
-, challenge_type
-, challenge_name
-, challenge_id
-, (SELECT value FROM project_info WHERE project_id = challenge_id AND project_info_type_id = 4) AS forum_id
-, num_submissions
-, num_registrants
-, number_of_checkpoints_prizes
-, first_place_prize
-, total_prize
-, checkpoint_total_prizes
-, registration_start_date
-, registration_end_date
-, checkpoint_submission_end_date
-, submission_end_date
-, status
-, digital_run_points
-, nvl((SELECT MAX(event_id) FROM contest_project_xref x, contest c WHERE project_id = challenge_id AND c.contest_id = x.contest_id), 0) AS event_id
-, (SELECT event_short_desc FROM event e WHERE e.event_id = nvl((SELECT MAX(event_id) FROM contest_project_xref x, contest c WHERE project_id = challenge_id AND c.contest_id = x.contest_id), 0)) AS event_name
-, technology_list(value_for_technology) AS technologies
-, platform_list(id_for_platform) AS platforms
-, registration_open
-, NVL((SELECT CAST('t' AS boolean) FROM contest_eligibility WHERE contest_id = challenge_id), CAST('f' AS boolean)) AS is_private
-, (SELECT value FROM project_info pi53 WHERE project_id = challenge_id AND project_info_type_id = 53) AS submissions_viewable
-FROM (
-SELECT
-SKIP @first_row_index@
-FIRST @page_size@
-  CASE WHEN (p.project_studio_spec_id IS NOT NULL) THEN 1 ELSE 0 END AS is_studio
-, pcl.description AS challenge_type
-, pn.value AS challenge_name
-, p.project_id AS challenge_id
-, (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 num_submissions
-, (SELECT COUNT(*) FROM resource r WHERE r.project_id = p.project_id AND r.resource_role_id = 1) AS num_registrants
-, NVL((SELECT SUM(pr.number_of_submissions) FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 14), 0) AS number_of_checkpoints_prizes
-, (SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1) AS first_place_prize
-, (SELECT SUM(prize_amount) FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15) AS total_prize
-, (SELECT SUM(prize_amount * number_of_submissions) FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 14) AS checkpoint_total_prizes
-, NVL(pp1.actual_start_time, pp1.scheduled_start_time) AS registration_start_date
-, NVL(pp1.actual_end_time, pp1.scheduled_end_time) AS registration_end_date
-, NVL(pp15.actual_end_time, pp15.scheduled_end_time) AS checkpoint_submission_end_date
-, NVL(pp2.actual_end_time, pp2.scheduled_end_time) AS submission_end_date
-, pstatus.name AS status
-, CASE WHEN pidr.value = 'On' THEN
-  NVL((SELECT value::decimal FROM project_info pi_dr WHERE pi_dr.project_info_type_id = 30 AND pi_dr.project_id = p.project_id), (SELECT round(NVL(pi16.value::decimal, 0)) FROM project_info pi16 WHERE pi16.project_info_type_id = 16 AND pi16.project_id = p.project_id))
-  ELSE NULL END AS digital_run_points
-, pi1.value AS value_for_technology
-, p.project_id AS id_for_platform
-, CASE WHEN (pp1.phase_status_id = 2) THEN 'Yes' ELSE 'No' END AS registration_open
+SELECT COUNT(*) AS total
 FROM project p
-INNER JOIN project_status_lu pstatus ON pstatus.project_status_id = p.project_status_id 
-INNER JOIN project_category_lu pcl ON pcl.project_category_id = p.project_category_id 
-INNER JOIN project_phase pp1 ON pp1.project_id = p.project_id AND pp1.phase_type_id = 1 
-INNER JOIN project_phase pp2 ON pp2.project_id = p.project_id AND pp2.phase_type_id = 2 
-INNER JOIN project_info pn ON pn.project_id = p.project_id AND pn.project_info_type_id = 6 
-INNER JOIN project_info pi1 ON pi1.project_id = p.project_id AND pi1.project_info_type_id = 1
-LEFT JOIN project_phase pp15 ON pp15.project_id = p.project_id AND pp15.phase_type_id = 15
-LEFT JOIN project_info pidr ON pidr.project_id = p.project_id AND pidr.project_info_type_id = 26
-WHERE
-p.project_status_id IN (4, 5, 6, 7, 8, 9, 10, 11)
-AND pcl.project_category_id NOT IN (27, 37) AND pcl.project_type_id IN (@track@)
-and NVL(pp2.actual_end_time, pp2.scheduled_end_time) > '2012-01-01 00:00:00'
-AND NVL(pp2.actual_end_time, pp2.scheduled_end_time) BETWEEN TO_DATE('@submission_end_from@ 00:00:00', '%Y-%m-%d %H:%M:%S') AND TO_DATE('@submission_end_to@ 23:59:59', '%Y-%m-%d %H:%M:%S')
--- Filter out the challenge that user is not belong to.
+, project_phase pp1 --registration phase
+, project_phase pp2 --submission phase
+, project_info pn
+, project_info pi1
+, project_category_lu pcl
+WHERE p.project_id = pn.project_id
+AND pn.project_info_type_id = 6
+AND pp1.project_id = p.project_id
+AND pp1.phase_type_id = 1  --registration phase
+AND pp2.project_id = p.project_id
+AND pp2.phase_type_id = 2  --submission phase
+AND p.project_category_id = pcl.project_category_id
+AND p.project_status_id IN (4, 5, 6, 7, 8, 9, 10, 11)
+AND pcl.project_type_id IN (@track@)
 AND pp1.phase_status_id in (2,3)
-AND LOWER(pn.value) LIKE('@challenge_name@')
+AND pi1.project_id = p.project_id
+AND pi1.project_info_type_id = 1
+and NVL(pp2.actual_end_time, pp2.scheduled_end_time) > '2012-01-01 00:00:00'
+AND pcl.project_category_id NOT IN (27, 37) --exclude when spec review was a 'contest.' Also exclude MM, which is in there as a 'software' contest.
 -- start of parameters
+
+AND NVL(pp2.actual_end_time, pp2.scheduled_end_time) BETWEEN TO_DATE('@submission_end_from@ 00:00:00', '%Y-%m-%d %H:%M:%S') AND TO_DATE('@submission_end_to@ 23:59:59', '%Y-%m-%d %H:%M:%S')
+
+AND LOWER(pn.value) LIKE ('@challenge_name@')
 AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) >= @prize_lower_bound@
 AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) <= @prize_upper_bound@
 AND p.tc_direct_project_id = DECODE(@project_id@, 0, p.tc_direct_project_id, @project_id@)
-AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82) -- exclude assigned tasks
-ORDER BY @sort_column@ @sort_order@
-)
+-- Filter out the challenge that user is not belong to.
+AND (not exists (select contest_id from contest_eligibility where contest_id = p.project_id)
+      or exists(select contest_id from contest_eligibility ce, group_contest_eligibility gce, user_group_xref x
+                   where x.login_id = @user_id@ AND x.group_id = gce.group_id AND gce.contest_eligibility_id = ce.contest_eligibility_id
+                         AND ce.contest_id = p.project_id))
+AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks