Prod deploy - April 2026

.circleci/config.yml

@@ -65,7 +65,8 @@ workflows:
             only:
               - develop
               - pm-1127_1
-              - pm-4203_1
+              - PM-4305
+              - PM-4491-fix
 
     # Production builds are exectuted only on tagged commits to the
     # master branch.

README.md

@@ -56,6 +56,13 @@ Create a `.env` file in the root of the project. You can copy the example struct
 # This is used by Prisma to connect to your local PostgreSQL instance.
 DATABASE_URL="postgresql://user:password@localhost:5432/lookups?schema=public"
 
+# Engagements database used by the Engagement Data member report.
+ENGAGEMENTS_DB_URL="postgresql://user:password@localhost:5432/engagements"
+
+# The same report also reads member/profile/project data from the main
+# DATABASE_URL connection, including members.member, members.memberAddress,
+# members.memberPhone, identity.country, and projects.projects.
+
 # Old tc-payments database URL (used by member-tax CSV export script)
 OLD_PAYMENTS_DATABASE_URL="postgresql://user:password@localhost:5432/tc_payments?schema=public"
 

sql/reports/challenges/registered-users.sql

@@ -28,6 +28,14 @@ SELECT
     NULLIF(TRIM(mem.handle), ''),
     rm."memberHandle"
   ) AS "handle",
+  COALESCE(
+    NULLIF(TRIM(u.first_name), ''),
+    NULLIF(TRIM(mem."firstName"), '')
+  ) AS "firstName",
+  COALESCE(
+    NULLIF(TRIM(u.last_name), ''),
+    NULLIF(TRIM(mem."lastName"), '')
+  ) AS "lastName",
   COALESCE(e.address, NULLIF(TRIM(mem.email), '')) AS "email",
   COALESCE(
     comp_code.name,

sql/reports/challenges/registrants-history.sql

@@ -91,9 +91,25 @@ SELECT
     ELSE null
   END AS "challengeCompletedDate",
   r."registrantHandle",
+  COALESCE(
+    NULLIF(TRIM(u.first_name), ''),
+    NULLIF(TRIM(mem."firstName"), '')
+  ) AS "firstName",
+
+  COALESCE(
+    NULLIF(TRIM(u.last_name), ''),
+    NULLIF(TRIM(mem."lastName"), '')
+  ) AS "lastName",
   COALESCE(sub."registrantFinalScore", sum."registrantFinalScore")
     AS "registrantFinalScore"
 FROM registrants r
+LEFT JOIN identity."user" u
+  ON r."memberId" ~ '^[0-9]+$'
+ AND u.user_id = r."memberId"::numeric
+
+LEFT JOIN members."member" mem
+  ON r."memberId" ~ '^[0-9]+$'
+ AND mem."userId" = r."memberId"::bigint
 LEFT JOIN LATERAL (
   SELECT
     MAX(cw.handle) AS "winnerHandle",

sql/reports/challenges/submitters.sql

@@ -18,7 +18,10 @@ submission_metrics AS (
       s."initialScore"::double precision
     ) AS standard_score,
     provisional_review.provisional_score,
-    final_review."aggregateScore" AS final_score_raw
+    COALESCE(
+      final_review."aggregateScore",
+      s."finalScore"::double precision
+    ) AS final_score_raw
   FROM challenge_context AS cc
   JOIN reviews."submission" AS s
     ON s."challengeId" = cc.id
@@ -85,6 +88,10 @@ mm_ranked_scores AS (
       WHEN mlss.provisional_score_raw IS NULL THEN NULL
       ELSE ROUND(mlss.provisional_score_raw::numeric, 2)
     END AS "provisionalScore",
+    CASE
+      WHEN mlss.final_score_raw IS NULL THEN NULL
+      ELSE ROUND(mlss.final_score_raw::numeric, 2)
+    END AS "finalScore",
     CASE
       WHEN mlss.effective_score_raw IS NULL THEN NULL
       ELSE ROW_NUMBER() OVER (
@@ -110,6 +117,14 @@ SELECT
     sm."memberHandle"
   ) AS "handle",
   COALESCE(e.address, NULLIF(TRIM(mem.email), '')) AS "email",
+  COALESCE(
+    NULLIF(TRIM(u.first_name), ''),
+    NULLIF(TRIM(mem."firstName"), '')
+  ) AS "firstName",
+  COALESCE(
+    NULLIF(TRIM(u.last_name), ''),
+    NULLIF(TRIM(mem."lastName"), '')
+  ) AS "lastName",
   COALESCE(
     comp_code.name,
     comp_id.name,
@@ -127,6 +142,10 @@ SELECT
     WHEN sm.is_marathon_match THEN mrs."provisionalScore"
     ELSE NULL
   END AS "provisionalScore",
+  CASE
+    WHEN sm.is_marathon_match THEN mrs."finalScore"
+    ELSE NULL
+  END AS "finalScore",
   CASE
     WHEN sm.is_marathon_match THEN mrs."finalRank"
     ELSE NULL

sql/reports/challenges/valid-submitters.sql

@@ -18,7 +18,10 @@ submission_metrics AS (
       s."initialScore"::double precision
     ) AS standard_score,
     provisional_review.provisional_score,
-    final_review."aggregateScore" AS final_score_raw,
+    COALESCE(
+      final_review."aggregateScore",
+      s."finalScore"::double precision
+    ) AS final_score_raw,
     (
       passing_review.is_passing IS TRUE
       OR COALESCE(s."finalScore"::double precision, 0) > 98
@@ -102,6 +105,10 @@ mm_ranked_scores AS (
       WHEN mlss.provisional_score_raw IS NULL THEN NULL
       ELSE ROUND(mlss.provisional_score_raw::numeric, 2)
     END AS "provisionalScore",
+    CASE
+      WHEN mlss.final_score_raw IS NULL THEN NULL
+      ELSE ROUND(mlss.final_score_raw::numeric, 2)
+    END AS "finalScore",
     CASE
       WHEN mlss.effective_score_raw IS NULL THEN NULL
       ELSE ROW_NUMBER() OVER (
@@ -126,6 +133,14 @@ SELECT
     NULLIF(TRIM(mem.handle), ''),
     vsm."memberHandle"
   ) AS "handle",
+  COALESCE(
+    NULLIF(TRIM(u.first_name), ''),
+    NULLIF(TRIM(mem."firstName"), '')
+  ) AS "firstName",
+  COALESCE(
+    NULLIF(TRIM(u.last_name), ''),
+    NULLIF(TRIM(mem."lastName"), '')
+  ) AS "lastName",
   COALESCE(e.address, NULLIF(TRIM(mem.email), '')) AS "email",
   COALESCE(
     comp_code.name,
@@ -144,6 +159,10 @@ SELECT
     WHEN vsm.is_marathon_match THEN mrs."provisionalScore"
     ELSE NULL
   END AS "provisionalScore",
+  CASE
+    WHEN vsm.is_marathon_match THEN mrs."finalScore"
+    ELSE NULL
+  END AS "finalScore",
   CASE
     WHEN vsm.is_marathon_match THEN mrs."finalRank"
     ELSE NULL

sql/reports/challenges/winners.sql

@@ -16,7 +16,10 @@ submission_metrics AS (
       s."initialScore"::double precision
     ) AS standard_score,
     provisional_review.provisional_score,
-    final_review."aggregateScore" AS final_score_raw
+    COALESCE(
+      final_review."aggregateScore",
+      s."finalScore"::double precision
+    ) AS final_score_raw
   FROM challenge_context AS cc
   JOIN reviews."submission" AS s
     ON s."challengeId" = cc.id
@@ -72,7 +75,11 @@ mm_winner_scores AS (
     CASE
       WHEN mms.provisional_score_raw IS NULL THEN NULL
       ELSE ROUND(mms.provisional_score_raw::numeric, 2)
-    END AS "provisionalScore"
+    END AS "provisionalScore",
+    CASE
+      WHEN mms.final_score_raw IS NULL THEN NULL
+      ELSE ROUND(mms.final_score_raw::numeric, 2)
+    END AS "finalScore"
   FROM mm_member_scores AS mms
 )
 SELECT
@@ -88,6 +95,14 @@ SELECT
     NULLIF(TRIM(mem.handle), ''),
     wm."winnerHandle"
   ) AS "handle",
+  COALESCE(
+    NULLIF(TRIM(u.first_name), ''),
+    NULLIF(TRIM(mem."firstName"), '')
+  ) AS "firstName",
+  COALESCE(
+    NULLIF(TRIM(u.last_name), ''),
+    NULLIF(TRIM(mem."lastName"), '')
+  ) AS "lastName",
   COALESCE(e.address, NULLIF(TRIM(mem.email), '')) AS "email",
   COALESCE(
     comp_code.name,
@@ -106,6 +121,10 @@ SELECT
     WHEN wm.is_marathon_match THEN mrs."provisionalScore"
     ELSE NULL
   END AS "provisionalScore",
+  CASE
+    WHEN wm.is_marathon_match THEN mrs."finalScore"
+    ELSE NULL
+  END AS "finalScore",
   CASE
     WHEN wm.is_marathon_match THEN wm.placement
     ELSE NULL

sql/reports/topcoder/completed-profiles-count.sql

@@ -13,8 +13,6 @@ FROM members.member m
 INNER JOIN member_skills ms ON ms.user_id = m."userId"
 WHERE m.description IS NOT NULL
   AND m.description <> ''
-  AND m."photoURL" IS NOT NULL
-  AND m."photoURL" <> ''
   AND m."homeCountryCode" IS NOT NULL
   AND ($1::text IS NULL OR COALESCE(m."homeCountryCode", m."competitionCountryCode") = $1)
   AND ($3::uuid[] IS NULL OR ms.skill_ids @> $3::uuid[])

sql/reports/topcoder/completed-profiles.sql

@@ -56,8 +56,6 @@ LEFT JOIN LATERAL (
 ) ma ON TRUE
 WHERE m.description IS NOT NULL
   AND m.description <> ''
-  AND m."photoURL" IS NOT NULL
-  AND m."photoURL" <> ''
   AND m."homeCountryCode" IS NOT NULL
   AND ($1::text IS NULL OR COALESCE(m."homeCountryCode", m."competitionCountryCode") = $1)
   AND ($5::uuid[] IS NULL OR ms.skill_ids @> $5::uuid[])

sql/reports/topcoder/engagement-data-members.sql

@@ -0,0 +1,56 @@
+SELECT
+  m."userId"::text AS user_id,
+  NULLIF(BTRIM(m.handle), '') AS handle,
+  NULLIF(BTRIM(m."firstName"), '') AS first_name,
+  NULLIF(BTRIM(m."lastName"), '') AS last_name,
+  NULLIF(BTRIM(m.email), '') AS email,
+  COALESCE(NULLIF(BTRIM(c.country_name), ''), NULLIF(BTRIM(m.country), ''))
+    AS country,
+  preferred_address.street_addr_1,
+  preferred_address.street_addr_2,
+  preferred_address.city,
+  preferred_address.state_code,
+  preferred_address.zip,
+  preferred_phone.phone_number
+FROM members.member m
+LEFT JOIN identity.country c
+  ON c.country_code = m."homeCountryCode"
+LEFT JOIN LATERAL (
+  SELECT
+    NULLIF(BTRIM(a."streetAddr1"), '') AS street_addr_1,
+    NULLIF(BTRIM(a."streetAddr2"), '') AS street_addr_2,
+    NULLIF(BTRIM(a.city), '') AS city,
+    NULLIF(BTRIM(a."stateCode"), '') AS state_code,
+    NULLIF(BTRIM(a.zip), '') AS zip
+  FROM members."memberAddress" a
+  WHERE a."userId" = m."userId"
+  ORDER BY
+    CASE
+      WHEN UPPER(a.type) = 'HOME' THEN 0
+      WHEN UPPER(a.type) = 'BILLING' THEN 1
+      ELSE 2
+    END,
+    a."updatedAt" DESC NULLS LAST,
+    a."createdAt" DESC NULLS LAST,
+    a.id DESC
+  LIMIT 1
+) preferred_address
+  ON TRUE
+LEFT JOIN LATERAL (
+  SELECT NULLIF(BTRIM(p.number), '') AS phone_number
+  FROM members."memberPhone" p
+  WHERE p."userId" = m."userId"
+    AND NULLIF(BTRIM(p.number), '') IS NOT NULL
+  ORDER BY
+    CASE
+      WHEN POSITION('mobile' IN LOWER(p.type)) > 0 THEN 0
+      ELSE 1
+    END,
+    p."updatedAt" DESC NULLS LAST,
+    p."createdAt" DESC NULLS LAST,
+    p.id ASC
+  LIMIT 1
+) preferred_phone
+  ON TRUE
+WHERE m."userId"::text = ANY($1::text[])
+ORDER BY LOWER(m.handle), m."userId";

sql/reports/topcoder/engagement-data-projects.sql

@@ -0,0 +1,7 @@
+SELECT
+  p.id::text AS project_id,
+  NULLIF(BTRIM(p.name), '') AS project_name
+FROM projects.projects p
+WHERE p.id::text = ANY($1::text[])
+  AND p."deletedAt" IS NULL
+ORDER BY LOWER(p.name), p.id;

sql/reports/topcoder/engagement-data.sql

@@ -0,0 +1,74 @@
+WITH assignment_members AS (
+  SELECT
+    NULLIF(BTRIM(a."memberId"), '') AS member_id,
+    NULLIF(BTRIM(a."memberHandle"), '') AS fallback_handle,
+    NULLIF(BTRIM(e."projectId"), '') AS project_id
+  FROM engagements."EngagementAssignment" a
+  JOIN engagements."Engagement" e
+    ON e.id = a."engagementId"
+  WHERE NULLIF(BTRIM(a."memberId"), '') IS NOT NULL
+),
+assigned_summary AS (
+  SELECT
+    member_id, 
+    MAX(fallback_handle) AS fallback_handle,
+    ARRAY_REMOVE(ARRAY_AGG(DISTINCT project_id), NULL) AS assigned_project_ids
+  FROM assignment_members
+  GROUP BY member_id
+),
+ranked_public_applications AS (
+  SELECT
+    NULLIF(BTRIM(app."userId"), '') AS member_id,
+    NULLIF(BTRIM(app.handle), '') AS application_handle,
+    NULLIF(BTRIM(app.email), '') AS application_email,
+    NULLIF(BTRIM(app.address), '') AS application_address,
+    NULLIF(BTRIM(app."mobileNumber"), '') AS application_phone,
+    NULLIF(BTRIM(app.name), '') AS application_name,
+    ROW_NUMBER() OVER (
+      PARTITION BY app."userId"
+      ORDER BY app."updatedAt" DESC, app."createdAt" DESC, app.id DESC
+    ) AS rn
+  FROM engagements."EngagementApplication" app
+  JOIN engagements."Engagement" e
+    ON e.id = app."engagementId"
+  WHERE COALESCE(e."isPrivate", false) = false
+    AND NULLIF(BTRIM(app."userId"), '') IS NOT NULL
+),
+latest_public_application AS (
+  SELECT
+    member_id,
+    application_handle,
+    application_email,
+    application_address,
+    application_phone,
+    application_name
+  FROM ranked_public_applications
+  WHERE rn = 1
+),
+eligible_members AS (
+  SELECT member_id
+  FROM assigned_summary
+  UNION
+  SELECT member_id
+  FROM latest_public_application
+)
+SELECT
+  em.member_id,
+  COALESCE(assigned_summary.fallback_handle, latest_public_application.application_handle)
+    AS fallback_handle,
+  latest_public_application.application_email,
+  latest_public_application.application_address,
+  latest_public_application.application_phone,
+  latest_public_application.application_name,
+  (assigned_summary.member_id IS NOT NULL) AS has_assignment,
+  COALESCE(assigned_summary.assigned_project_ids, ARRAY[]::text[]) AS assigned_project_ids
+FROM eligible_members em
+LEFT JOIN assigned_summary
+  ON assigned_summary.member_id = em.member_id
+LEFT JOIN latest_public_application
+  ON latest_public_application.member_id = em.member_id
+ORDER BY COALESCE(
+  assigned_summary.fallback_handle,
+  latest_public_application.application_handle,
+  em.member_id
+);

src/app-constants.ts

@@ -7,6 +7,7 @@ export const Scopes = {
   AllReports: "reports:all",
   TopcoderReports: "reports:topcoder",
   Member: {
+    EngagementData: "reports:member-engagement-data",
     RecentMemberData: "reports:member-recent-member-data",
   },
   TopgearChallengeTechnology: "reports:topgear-challenge-technology",
@@ -61,6 +62,7 @@ export const ScopeRoleAccess: Record<string, readonly string[]> = {
   [Scopes.Challenge.Submitters]: challengeReportAccessRoles,
   [Scopes.Challenge.ValidSubmitters]: challengeReportAccessRoles,
   [Scopes.Challenge.Winners]: challengeReportAccessRoles,
+  [Scopes.Member.EngagementData]: [UserRoles.TalentManager],
   [Scopes.Member.RecentMemberData]: [UserRoles.TalentManager],
   [Scopes.Identity.UsersByHandles]: [
     UserRoles.TalentManager,