Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ workflows:
branches:
only:
- develop
- pm-1259_2

# Production builds are exectuted only on tagged commits to the
# master branch.
Expand Down
28 changes: 22 additions & 6 deletions sql/reports/topgear/topgear-registrants-details.sql
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ proj AS (
p."billingAccountId"::bigint AS project_billing_account_id
FROM projects.projects p
),
proj_phase_end AS (
SELECT
pp."projectId"::bigint AS project_id, -- cast to text to match base.project_id
MAX(pp."endDate") AS project_scheduled_end_date
FROM projects."project_phases" pp
WHERE pp.status ILIKE 'planned'
GROUP BY pp."projectId"
),
registrants AS (
SELECT
r."challengeId" AS challenge_id,
Expand All @@ -82,7 +90,7 @@ SELECT
proj.group_customer_name AS "Customer name",
reg.registrant_email AS "Registrant email",
CASE WHEN base.challenge_status = 'ACTIVE'
THEN base.planned_end_at END AS "Project scheduled end date",
THEN ppe.project_scheduled_end_date END AS "Project scheduled end date",
sub.best_final_score AS "Submission score"
FROM base
JOIN registrants reg
Expand All @@ -100,11 +108,19 @@ LEFT JOIN billing b
ON b.challenge_id = base.challenge_id
LEFT JOIN proj
ON proj.project_id = base.project_id
LEFT JOIN proj_phase_end ppe
ON ppe.project_id = base.project_id
WHERE
COALESCE(b.billing_account_id, proj.project_billing_account_id) = 80000062
AND COALESCE(
CASE WHEN base.challenge_status = 'COMPLETED' THEN lp.last_phase_end END,
base.planned_end_at,
base.challenge_created_at
) BETWEEN $1::timestamptz AND $2::timestamptz
AND (
(base.challenge_status = 'COMPLETED'
AND lp.last_phase_end BETWEEN '2025-09-28T00:00:00Z'::timestamptz AND '2025-10-05T23:59:59.999Z'::timestamptz
)
OR
(base.challenge_status = 'ACTIVE' AND (
base.challenge_created_at BETWEEN '2025-09-28T00:00:00Z'::timestamptz AND '2025-10-05T23:59:59.999Z'::timestamptz
OR base.challenge_updated_at BETWEEN '2025-09-28T00:00:00Z'::timestamptz AND '2025-10-05T23:59:59.999Z'::timestamptz
OR base.planned_end_at BETWEEN '2025-09-28T00:00:00Z'::timestamptz AND '2025-10-05T23:59:59.999Z'::timestamptz
))
)
ORDER BY base.challenge_id DESC, reg.registrant_handle;
1 change: 1 addition & 0 deletions src/reports/challenges/dtos/submission-links.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export class SubmissionLinksQueryDto {
})
@IsOptional()
@IsDateString()
@Transform(({ value }) => value || new Date().toISOString())
completionDateTo?: Date;

@ApiProperty({
Expand Down