Skip to content

Add new recent members report as requested by sales team. Optimise TG hourly report #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmgasper merged 6 commits into from
Jan 12, 2026
Merged

Add new recent members report as requested by sales team. Optimise TG hourly report #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7eecfb
Enhanced Topgear hourly report by adding registration and submission …
rishabhtc Jan 6, 2026
d861c26
Merge pull request #39 from topcoder-platform/PS-505-dates-issues
jmgasper Jan 6, 2026
3ca48ea
Refactor SQL aliases in Topgear hourly report
rishabhtc Jan 7, 2026
9aabee9
Merge pull request #40 from topcoder-platform/PS-505-fixed-name
rishabhtc Jan 7, 2026
2a6ea8f
New recent members report for sales
jmgasper Jan 8, 2026
042f4a1
Don't return Topgear members
jmgasper Jan 9, 2026
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
270 changes: 270 additions & 0 deletions sql/reports/topcoder/recent-member-data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
WITH params AS (
SELECT COALESCE(NULLIF($1, '')::timestamptz, TIMESTAMPTZ '2024-01-01') AS start_date
Copy link

@github-actions github-actions bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ maintainability]
The use of a hardcoded date TIMESTAMPTZ '2024-01-01' as a default value for start_date might lead to unexpected results if the query is used beyond this date. Consider using a more dynamic default, such as the current date or a configurable parameter.

),
registrants AS (
SELECT DISTINCT r."memberId" AS member_id
FROM resources."Resource" r
JOIN resources."ResourceRole" rr
ON rr.id = r."roleId"
JOIN params p
ON r."createdAt" >= p.start_date
WHERE rr."nameLower" IN ('submitter', 'registrant')
),
latest_payment AS (
SELECT
p.winnings_id,
MAX(p.version) AS max_version
FROM finance.payment p
GROUP BY p.winnings_id
),
paid_members AS (
SELECT DISTINCT w.winner_id AS member_id
FROM finance.payment p
JOIN latest_payment lp
ON lp.winnings_id = p.winnings_id
AND lp.max_version = p.version
JOIN finance.winnings w
ON w.winning_id = p.winnings_id
JOIN params pr
ON COALESCE(p.date_paid, p.created_at) >= pr.start_date
Copy link

@github-actions github-actions bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[❗❗ correctness]
The use of COALESCE(p.date_paid, p.created_at) to determine the date for filtering payments might lead to incorrect results if date_paid is null but created_at is not. Ensure that this logic aligns with the business requirements for determining recent payments.

WHERE p.payment_status = 'PAID'
AND w.type = 'PAYMENT'
),
eligible_members AS (
SELECT DISTINCT r.member_id
FROM registrants r
JOIN paid_members p
ON p.member_id = r.member_id
),
role_counts AS (
SELECT
s."memberId" AS member_id,
c."trackId" AS track_id,
COUNT(DISTINCT s."challengeId") AS submission_count
FROM reviews.submission s
JOIN challenges."Challenge" c
ON c.id = s."challengeId"
JOIN eligible_members em
ON em.member_id = s."memberId"
GROUP BY s."memberId", c."trackId"
),
ranked_roles AS (
SELECT
rc.*,
ROW_NUMBER() OVER (
PARTITION BY rc.member_id
ORDER BY rc.submission_count DESC
) AS rn
FROM role_counts rc
),
member_roles AS (
SELECT
rr.member_id,
CASE ct.track
WHEN 'DESIGN' THEN 'Design'
WHEN 'DEVELOPMENT' THEN 'Development'
WHEN 'QUALITY_ASSURANCE' THEN 'QA'
WHEN 'DATA_SCIENCE' THEN 'Data Science'
ELSE ct.name
END AS role
FROM ranked_roles rr
JOIN challenges."ChallengeTrack" ct
ON ct.id = rr.track_id
WHERE rr.rn = 1
),
skills_agg AS (
SELECT
skill_rows.user_id,
jsonb_agg(
jsonb_build_object(
'name', skill_rows.skill_name,
'status', skill_rows.status
)
ORDER BY skill_rows.skill_name
) AS skills
FROM (
SELECT
us.user_id::bigint AS user_id,
sk.name AS skill_name,
CASE
WHEN lower(usl.name) = 'verified' THEN 'verified'
ELSE 'self-assigned'
END AS status,
ROW_NUMBER() OVER (
PARTITION BY us.user_id, sk.name
ORDER BY CASE
WHEN lower(usl.name) = 'verified' THEN 0
ELSE 1
END
) AS rn
FROM skills.user_skill us
JOIN eligible_members em
ON em.member_id = us.user_id::text
JOIN skills.skill sk
ON sk.id = us.skill_id
AND sk.deleted_at IS NULL
JOIN skills.user_skill_level usl
ON usl.id = us.user_skill_level_id
) skill_rows
WHERE skill_rows.rn = 1
GROUP BY skill_rows.user_id
),
work_history AS (
SELECT
mt."userId" AS user_id,
jsonb_agg(
jsonb_build_object(
'industry', mw.industry,
'companyName', mw."companyName",
'position', mw."position",
'startDate', mw."startDate",
'endDate', mw."endDate",
'working', mw.working
)
ORDER BY mw."startDate" DESC NULLS LAST
) AS work_history
FROM members."memberTraits" mt
JOIN members."memberTraitWork" mw
ON mw."memberTraitId" = mt.id
GROUP BY mt."userId"
),
education_history AS (
SELECT
mt."userId" AS user_id,
jsonb_agg(
jsonb_build_object(
'collegeName', me."collegeName",
'degree', me.degree,
'endYear', me."endYear"
)
ORDER BY me."endYear" DESC NULLS LAST
) AS education
FROM members."memberTraits" mt
JOIN members."memberTraitEducation" me
ON me."memberTraitId" = mt.id
GROUP BY mt."userId"
),
trolley_verified AS (
SELECT DISTINCT uiva.user_id AS member_id, true AS verified
FROM finance.user_identity_verification_associations uiva
),
challenge_wins AS (
SELECT
cw."userId"::text AS member_id,
COUNT(DISTINCT cw."challengeId") AS challenge_wins
FROM challenges."ChallengeWinner" cw
JOIN challenges."Challenge" c
ON c.id = cw."challengeId"
JOIN challenges."ChallengeType" ct
ON ct.id = c."typeId"
JOIN eligible_members em
ON em.member_id = cw."userId"::text
WHERE cw.placement = 1
AND COALESCE(ct."isTask", false) = false
GROUP BY cw."userId"
),
task_wins AS (
SELECT
cw."userId"::text AS member_id,
COUNT(DISTINCT cw."challengeId") AS task_wins
FROM challenges."ChallengeWinner" cw
JOIN challenges."Challenge" c
ON c.id = cw."challengeId"
JOIN challenges."ChallengeType" ct
ON ct.id = c."typeId"
JOIN eligible_members em
ON em.member_id = cw."userId"::text
WHERE cw.placement = 1
AND COALESCE(ct."isTask", false) = true
GROUP BY cw."userId"
),
registration_counts AS (
SELECT
r."memberId" AS member_id,
COUNT(DISTINCT r."challengeId") AS registration_count
FROM resources."Resource" r
JOIN resources."ResourceRole" rr
ON rr.id = r."roleId"
JOIN eligible_members em
ON em.member_id = r."memberId"
WHERE rr."nameLower" IN ('submitter', 'registrant')
GROUP BY r."memberId"
),
submissions_over_75 AS (
SELECT
s."memberId" AS member_id,
COUNT(DISTINCT s.id) AS submissions_over_75
FROM reviews.submission s
LEFT JOIN reviews.review r
ON r."submissionId" = s.id
JOIN eligible_members em
ON em.member_id = s."memberId"
WHERE s."memberId" IS NOT NULL
AND (s."finalScore" > 75 OR r."finalScore" > 75)
Copy link

@github-actions github-actions bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[❗❗ correctness]
The condition (s."finalScore" > 75 OR r."finalScore" > 75) might include submissions with null finalScore values if r."finalScore" is null. Consider explicitly handling null values to avoid unintended inclusions.

GROUP BY s."memberId"
),
max_rating AS (
SELECT DISTINCT ON ("userId")
"userId",
rating,
track,
"subTrack",
"ratingColor",
id
FROM members."memberMaxRating"
ORDER BY "userId", rating DESC
)
SELECT
m.handle,
m.email,
COALESCE(
NULLIF(m."homeCountryCode", ''),
NULLIF(m."competitionCountryCode", '')
) AS country_code,
mr.role,
COALESCE(sk.skills, '[]'::jsonb) AS skills,
CASE
WHEN mmr.id IS NULL THEN NULL
ELSE jsonb_build_object(
'rating', mmr.rating,
'track', mmr.track,
'subTrack', mmr."subTrack",
'ratingColor', mmr."ratingColor"
)
END AS ratings,
u.create_date AS member_since,
m."availableForGigs" AS open_to_work,
COALESCE(wh.work_history, '[]'::jsonb) AS work_history,
COALESCE(eh.education, '[]'::jsonb) AS education,
COALESCE(tv.verified, false) AS trolley_id_verified,
COALESCE(cw.challenge_wins, 0) AS challenge_wins,
COALESCE(rc.registration_count, 0) AS registration_count,
COALESCE(so.submissions_over_75, 0) AS submissions_over_75,
COALESCE(tw.task_wins, 0) AS task_wins
FROM eligible_members em
JOIN members.member m
ON m."userId"::text = em.member_id
LEFT JOIN identity."user" u
ON u.user_id::text = em.member_id
LEFT JOIN member_roles mr
ON mr.member_id = em.member_id
LEFT JOIN skills_agg sk
ON sk.user_id = m."userId"
LEFT JOIN max_rating mmr
ON mmr."userId" = m."userId"
LEFT JOIN work_history wh
ON wh.user_id = m."userId"
LEFT JOIN education_history eh
ON eh.user_id = m."userId"
LEFT JOIN trolley_verified tv
ON tv.member_id = em.member_id
LEFT JOIN challenge_wins cw
ON cw.member_id = em.member_id
LEFT JOIN task_wins tw
ON tw.member_id = em.member_id
LEFT JOIN registration_counts rc
ON rc.member_id = em.member_id
LEFT JOIN submissions_over_75 so
ON so.member_id = em.member_id
WHERE COALESCE(m.email, '') NOT ILIKE '%@wipro.com%'
Copy link

@github-actions github-actions bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
The filter COALESCE(m.email, '') NOT ILIKE '%@wipro.com%' could potentially exclude valid entries if m.email is null. Consider revisiting this condition to ensure it aligns with the intended filtering logic.

ORDER BY m.handle;
26 changes: 24 additions & 2 deletions sql/reports/topgear/hourly.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,24 @@ submitter_roles AS (
SELECT id
FROM resources."ResourceRole"
WHERE COALESCE("nameLower", LOWER(name)) = 'submitter'
),
registration_end AS (
SELECT
cp."challengeId" AS challenge_id,
MAX(COALESCE(cp."actualEndDate", cp."scheduledEndDate")) AS registration_end_date
Copy link

@github-actions github-actions bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
Using MAX(COALESCE(cp."actualEndDate", cp."scheduledEndDate")) assumes that actualEndDate and scheduledEndDate are comparable and that actualEndDate is always preferred over scheduledEndDate. Ensure that this logic aligns with business requirements, as it may lead to unexpected results if actualEndDate is null but scheduledEndDate is not.

FROM challenges."ChallengePhase" cp
JOIN challenges."Phase" p ON p.id = cp."phaseId"
WHERE p.name = 'Registration'
GROUP BY cp."challengeId"
),
submission_end AS (
SELECT
cp."challengeId" AS challenge_id,
MAX(COALESCE(cp."actualEndDate", cp."scheduledEndDate")) AS submission_end_date
Copy link

@github-actions github-actions bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
The use of MAX(COALESCE(cp."actualEndDate", cp."scheduledEndDate")) here also assumes that actualEndDate should take precedence over scheduledEndDate. Verify that this logic is consistent with the intended business logic, as discrepancies could lead to incorrect reporting of submission end dates.

FROM challenges."ChallengePhase" cp
JOIN challenges."Phase" p ON p.id = cp."phaseId"
WHERE p.name IN ('Topcoder Submission', 'Submission')
GROUP BY cp."challengeId"
)
SELECT
bc."updatedAt" AS modify_date,
Expand All @@ -99,8 +117,8 @@ SELECT
bc.name AS challenge_name,
bc.status AS challenge_status,
ct.name AS challenge_type,
bc."registrationEndDate" AS registration_end_date,
bc."submissionEndDate" AS submission_end_date,
reg.registration_end_date AS registration_end_date,
se.submission_end_date AS submission_end_date,
pd.latest_actual_end_date AS completed_date,
mt.onsite_efforts AS onsite_efforts,
mt.offsite_efforts AS offsite_efforts,
Expand Down Expand Up @@ -194,6 +212,10 @@ LEFT JOIN tag_list tl
ON tl.challenge_id = bc.id
LEFT JOIN group_list gl
ON gl.challenge_id = bc.id
LEFT JOIN registration_end reg
ON reg.challenge_id = bc.id
LEFT JOIN submission_end se
ON se.challenge_id = bc.id
LEFT JOIN LATERAL (
SELECT
MAX(cp."actualEndDate") AS latest_actual_end_date
Expand Down
6 changes: 6 additions & 0 deletions src/reports/report-directory.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,12 @@ export const REPORTS_DIRECTORY: ReportsDirectory = {
"Member payment accruals for the provided date range (defaults to last 3 months)",
[paymentsStartDateParam, paymentsEndDateParam],
),
report(
"Recent Member Data",
"/topcoder/recent-member-data",
"Members who registered and were paid since the start date (defaults to Jan 1, 2024)",
[paymentsStartDateParam],
),
report(
"90 Day Member Spend",
"/topcoder/90-day-member-spend",
Expand Down
13 changes: 13 additions & 0 deletions src/reports/topcoder/dto/recent-member-data.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsDateString, IsOptional } from "class-validator";

export class RecentMemberDataQueryDto {
@ApiPropertyOptional({
description:
"Start date (inclusive) for registration/payment filtering in ISO 8601 format",
example: "2024-01-01T00:00:00.000Z",
})
@IsOptional()
@IsDateString()
startDate?: string;
}
11 changes: 11 additions & 0 deletions src/reports/topcoder/topcoder-reports.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
import { TopcoderReportsService } from "./topcoder-reports.service";
import { RegistrantCountriesQueryDto } from "./dto/registrant-countries.dto";
import { MemberPaymentAccrualQueryDto } from "./dto/member-payment-accrual.dto";
import { RecentMemberDataQueryDto } from "./dto/recent-member-data.dto";
import { TopcoderReportsGuard } from "../../auth/guards/topcoder-reports.guard";
import { CsvResponseInterceptor } from "../../common/interceptors/csv-response.interceptor";

Expand Down Expand Up @@ -78,6 +79,16 @@ export class TopcoderReportsController {
return this.reports.getMemberPaymentAccrual(startDate, endDate);
}

@Get("/recent-member-data")
@ApiOperation({
summary:
"Members who registered and were paid since the start date (defaults to Jan 1, 2024)",
})
getRecentMemberData(@Query() query: RecentMemberDataQueryDto) {
const { startDate } = query;
return this.reports.getRecentMemberData(startDate);
}

@Get("/90-day-member-spend")
@ApiOperation({
summary: "Total gross amount paid to members in the last 90 days",
Expand Down
Loading
Loading