Major cleanup to perfectly match Looker fields so we have to do less in community app.

Author: jmgasper

package.json

@@ -23,6 +23,7 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "date-fns": "^3.6.0",
+    "i18n-iso-countries": "^3.7.1",
     "json-stringify-safe": "^5.0.1",
     "pg": "^8.11.5",
     "reflect-metadata": "^0.1.13",

sql/reports/statistics/design/design-countries-represented.sql

@@ -21,9 +21,14 @@ member_country AS (
 )
 SELECT
   country_code,
-  COUNT(*)::bigint AS members_count
-FROM member_country
-WHERE country_code IS NOT NULL
-GROUP BY country_code
-ORDER BY members_count DESC, country_code ASC;
-
+  members_count AS "user.count",
+  DENSE_RANK() OVER (ORDER BY members_count DESC, country_code ASC)::int AS rank
+FROM (
+  SELECT
+    country_code,
+    COUNT(*)::bigint AS members_count
+  FROM member_country
+  WHERE country_code IS NOT NULL
+  GROUP BY country_code
+) aggregated
+ORDER BY "user.count" DESC, country_code ASC;

sql/reports/statistics/design/design-f2f-wins.sql

@@ -1,19 +1,29 @@
+WITH f2f_wins AS (
+  SELECT
+    s."memberId"::bigint AS user_id,
+    COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) AS handle,
+    COUNT(DISTINCT s."challengeId")::int AS wins_count
+  FROM reviews.submission s
+  JOIN challenges."Challenge" c
+    ON c.id = s."challengeId"
+  JOIN challenges."ChallengeType" ct
+    ON ct.id = c."typeId"
+  JOIN challenges."ChallengeTrack" tr
+    ON tr.id = c."trackId"
+  LEFT JOIN members.member m
+    ON m."userId"::text = s."memberId"::text
+  WHERE s.placement = 1
+    AND tr.abbreviation = 'DS'
+    AND ct.abbreviation = 'F2F'
+    AND COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) IS NOT NULL
+  GROUP BY s."memberId", m.handle
+)
 SELECT
-  m."userId"             AS member_id,
-  m.handle               AS handle,
-  COUNT(DISTINCT s."challengeId")::int AS wins_count,
-  COUNT(DISTINCT s."challengeId")::int AS count
-FROM reviews.submission s
-JOIN challenges."Challenge" c
-  ON c.id = s."challengeId"
-JOIN challenges."ChallengeType" ct
-  ON ct.id = c."typeId"
-JOIN challenges."ChallengeTrack" tr
-  ON tr.id = c."trackId"
-JOIN members.member m
-  ON m."userId"::text = s."memberId"::text
-WHERE s.placement = 1
-  AND tr.abbreviation = 'DS'
-  AND ct.abbreviation = 'F2F'
-GROUP BY m."userId", m.handle
-ORDER BY wins_count DESC, handle ASC;
+  fw.handle AS "challenge_stats.winner_handle",
+  mmr.rating AS "member_profile_advanced.max_rating",
+  fw.wins_count AS "challenge_stats.count",
+  DENSE_RANK() OVER (ORDER BY fw.wins_count DESC, fw.handle ASC)::int AS rank
+FROM f2f_wins fw
+LEFT JOIN members."memberMaxRating" mmr
+  ON mmr."userId" = fw.user_id
+ORDER BY "challenge_stats.count" DESC, "challenge_stats.winner_handle" ASC;

sql/reports/statistics/design/first-place-by-country.sql

@@ -1,28 +1,33 @@
-WITH winners AS (
-  SELECT s."memberId"::text AS member_id
-  FROM reviews.submission s
+WITH raw_winners AS (
+  SELECT
+    cw."userId"::bigint AS user_id,
+    COALESCE(NULLIF(TRIM(cw.handle), ''), m.handle) AS handle
+  FROM challenges."ChallengeWinner" cw
   JOIN challenges."Challenge" c
-    ON c.id = s."challengeId"
+    ON c.id = cw."challengeId"
   JOIN challenges."ChallengeTrack" tr
     ON tr.id = c."trackId"
-  WHERE s.placement = 1
-    AND tr.abbreviation = 'DS'
+  LEFT JOIN members.member m
+    ON m."userId" = cw."userId"::bigint
+  WHERE tr.abbreviation = 'DS'
+    AND c.status = 'COMPLETED'
+    AND cw.placement = 1
 ),
-winners_country AS (
+placements AS (
   SELECT
-    COALESCE(
-      NULLIF(TRIM(m."homeCountryCode"), ''),
-      NULLIF(TRIM(m."competitionCountryCode"), '')
-    ) AS country_code
-  FROM winners w
-  JOIN members.member m
-    ON m."userId"::text = w.member_id
+    user_id,
+    handle,
+    COUNT(*)::int AS wins
+  FROM raw_winners
+  WHERE handle IS NOT NULL
+  GROUP BY user_id, handle
 )
 SELECT
-  country_code,
-  COUNT(*)::bigint AS first_place_count
-FROM winners_country
-WHERE country_code IS NOT NULL
-GROUP BY country_code
-ORDER BY first_place_count DESC, country_code ASC;
-
+  p.handle AS "challenge_stats.registrant_handle",
+  mmr.rating AS "member_profile_advanced.max_rating",
+  p.wins AS "challenge_stats.count",
+  DENSE_RANK() OVER (ORDER BY p.wins DESC, p.handle ASC)::int AS rank
+FROM placements p
+LEFT JOIN members."memberMaxRating" mmr
+  ON mmr."userId" = p.user_id
+ORDER BY "challenge_stats.count" DESC, "challenge_stats.registrant_handle" ASC;

sql/reports/statistics/design/first-time-design-submitters.sql

@@ -11,12 +11,10 @@ WITH design_first_submissions AS (
   GROUP BY s."memberId"
 )
 SELECT
-  m."userId"           AS member_id,
-  m.handle             AS handle,
-  d.first_submission_date
+  m.handle AS handle,
+  d.first_submission_date::date AS first_submission_date
 FROM design_first_submissions d
 JOIN members.member m
   ON m."userId"::text = d.member_id
 WHERE d.first_submission_date >= NOW() - INTERVAL '3 months'
 ORDER BY d.first_submission_date DESC, handle ASC;
-

sql/reports/statistics/design/lux-first-place-wins.sql

@@ -28,12 +28,13 @@ placements AS (
   GROUP BY user_id, handle
 )
 SELECT
-  p.handle,
-  p.placements_count AS wins_count,
+  p.handle AS "challenge_stats.winner_handle",
+  p.handle AS handle,
+  p.placements_count AS "challenge_stats.count",
   p.placements_count AS count,
-  mmr.rating AS max_rating,
+  mmr.rating AS "member_profile_advanced.max_rating",
   DENSE_RANK() OVER (ORDER BY p.placements_count DESC, p.handle ASC)::int AS rank
 FROM placements p
 LEFT JOIN members."memberMaxRating" mmr
   ON mmr."userId" = p.user_id
-ORDER BY wins_count DESC, handle ASC;
+ORDER BY "challenge_stats.count" DESC, "challenge_stats.winner_handle" ASC;

sql/reports/statistics/design/lux-placements.sql

@@ -1,30 +1,31 @@
-WITH member_placements AS (
+WITH placements AS (
   SELECT
-    m."userId" AS member_id,
-    m.handle AS handle,
+    s."memberId"::bigint AS user_id,
+    COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) AS handle,
     COUNT(DISTINCT s."challengeId")::int AS placements_count
   FROM reviews.submission s
   JOIN challenges."Challenge" c
     ON c.id = s."challengeId"
   JOIN challenges."ChallengeTrack" tr
     ON tr.id = c."trackId"
-  JOIN members.member m
+  LEFT JOIN members.member m
     ON m."userId"::text = s."memberId"::text
   WHERE s.placement IS NOT NULL
     AND s.placement > 0
     AND tr.abbreviation = 'DS'
     AND (
-      c.name ILIKE 'RUX%'
-      OR c.name ILIKE 'TCO RUX%'
+      c.name ILIKE 'LUX%'
+      OR c.name ILIKE 'TCO LUX%'
     )
-  GROUP BY m."userId", m.handle
+    AND COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) IS NOT NULL
+  GROUP BY s."memberId", m.handle
 )
 SELECT
-  member_id,
-  handle,
-  NULL::int AS max_rating,
-  placements_count,
-  placements_count AS count,
-  RANK() OVER (ORDER BY placements_count DESC, handle ASC) AS rank
-FROM member_placements
-ORDER BY placements_count DESC, handle ASC;
+  p.handle AS "submitter.handle",
+  mmr.rating AS "submitter_profile.max_rating",
+  p.placements_count AS "challenge.count",
+  DENSE_RANK() OVER (ORDER BY p.placements_count DESC, p.handle ASC)::int AS rank
+FROM placements p
+LEFT JOIN members."memberMaxRating" mmr
+  ON mmr."userId" = p.user_id
+ORDER BY "challenge.count" DESC, "submitter.handle" ASC;

sql/reports/statistics/design/rux-first-place-wins.sql

@@ -1,29 +1,32 @@
-WITH member_wins AS (
+WITH rux_wins AS (
   SELECT
-    m."userId" AS member_id,
-    m.handle AS handle,
+    s."memberId"::bigint AS user_id,
+    COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) AS handle,
     COUNT(DISTINCT s."challengeId")::int AS wins_count
   FROM reviews.submission s
   JOIN challenges."Challenge" c
     ON c.id = s."challengeId"
   JOIN challenges."ChallengeTrack" tr
     ON tr.id = c."trackId"
-  JOIN members.member m
+  LEFT JOIN members.member m
     ON m."userId"::text = s."memberId"::text
   WHERE s.placement = 1
     AND tr.abbreviation = 'DS'
     AND (
       c.name ILIKE 'RUX%'
       OR c.name ILIKE 'TCO RUX%'
     )
-  GROUP BY m."userId", m.handle
+    AND COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) IS NOT NULL
+  GROUP BY s."memberId", m.handle
 )
 SELECT
-  member_id,
-  handle,
-  NULL::int AS max_rating,
-  wins_count,
-  wins_count AS count,
-  RANK() OVER (ORDER BY wins_count DESC, handle ASC) AS rank
-FROM member_wins
-ORDER BY wins_count DESC, handle ASC;
+  rw.handle AS "challenge_stats.winner_handle",
+  rw.handle AS handle,
+  rw.wins_count AS "challenge_stats.count",
+  rw.wins_count AS count,
+  mmr.rating AS "member_profile_advanced.max_rating",
+  DENSE_RANK() OVER (ORDER BY rw.wins_count DESC, rw.handle ASC)::int AS rank
+FROM rux_wins rw
+LEFT JOIN members."memberMaxRating" mmr
+  ON mmr."userId" = rw.user_id
+ORDER BY "challenge_stats.count" DESC, "challenge_stats.winner_handle" ASC;

sql/reports/statistics/design/rux-placements.sql

@@ -1,14 +1,14 @@
-WITH member_placements AS (
+WITH placements AS (
   SELECT
-    m."userId" AS member_id,
-    m.handle AS handle,
+    s."memberId"::bigint AS user_id,
+    COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) AS handle,
     COUNT(DISTINCT s."challengeId")::int AS placements_count
   FROM reviews.submission s
   JOIN challenges."Challenge" c
     ON c.id = s."challengeId"
   JOIN challenges."ChallengeTrack" tr
     ON tr.id = c."trackId"
-  JOIN members.member m
+  LEFT JOIN members.member m
     ON m."userId"::text = s."memberId"::text
   WHERE s.placement IS NOT NULL
     AND s.placement > 0
@@ -17,14 +17,15 @@ WITH member_placements AS (
       c.name ILIKE 'RUX%'
       OR c.name ILIKE 'TCO RUX%'
     )
-  GROUP BY m."userId", m.handle
+    AND COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) IS NOT NULL
+  GROUP BY s."memberId", m.handle
 )
 SELECT
-  member_id,
-  handle,
-  NULL::int AS max_rating,
-  placements_count,
-  placements_count AS count,
-  RANK() OVER (ORDER BY placements_count DESC, handle ASC) AS rank
-FROM member_placements
-ORDER BY placements_count DESC, handle ASC;
+  p.handle AS "submitter.handle",
+  mmr.rating AS "submitter_profile.max_rating",
+  p.placements_count AS "challenge.count",
+  DENSE_RANK() OVER (ORDER BY p.placements_count DESC, p.handle ASC)::int AS rank
+FROM placements p
+LEFT JOIN members."memberMaxRating" mmr
+  ON mmr."userId" = p.user_id
+ORDER BY "challenge.count" DESC, "submitter.handle" ASC;

sql/reports/statistics/design/ui-design-wins.sql

@@ -1,19 +1,29 @@
+WITH design_wins AS (
+  SELECT
+    s."memberId"::bigint AS user_id,
+    COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) AS handle,
+    COUNT(DISTINCT s."challengeId")::int AS wins_count
+  FROM reviews.submission s
+  JOIN challenges."Challenge" c
+    ON c.id = s."challengeId"
+  JOIN challenges."ChallengeType" ct
+    ON ct.id = c."typeId"
+  JOIN challenges."ChallengeTrack" tr
+    ON tr.id = c."trackId"
+  LEFT JOIN members.member m
+    ON m."userId"::text = s."memberId"::text
+  WHERE s.placement = 1
+    AND tr.abbreviation = 'DS'
+    AND ct.abbreviation = 'CH'
+    AND COALESCE(NULLIF(TRIM(m.handle), ''), m.handle) IS NOT NULL
+  GROUP BY s."memberId", m.handle
+)
 SELECT
-  m."userId"             AS member_id,
-  m.handle               AS handle,
-  COUNT(DISTINCT s."challengeId")::int AS wins_count,
-  COUNT(DISTINCT s."challengeId")::int AS count
-FROM reviews.submission s
-JOIN challenges."Challenge" c
-  ON c.id = s."challengeId"
-JOIN challenges."ChallengeType" ct
-  ON ct.id = c."typeId"
-JOIN challenges."ChallengeTrack" tr
-  ON tr.id = c."trackId"
-JOIN members.member m
-  ON m."userId"::text = s."memberId"::text
-WHERE s.placement = 1
-  AND tr.abbreviation = 'DS'
-  AND ct.abbreviation = 'CH'
-GROUP BY m."userId", m.handle
-ORDER BY wins_count DESC, handle ASC;
+  dw.handle AS "challenge_stats.winner_handle",
+  mmr.rating AS "member_profile_advanced.max_rating",
+  dw.wins_count AS "challenge_stats.count",
+  DENSE_RANK() OVER (ORDER BY dw.wins_count DESC, dw.handle ASC)::int AS rank
+FROM design_wins dw
+LEFT JOIN members."memberMaxRating" mmr
+  ON mmr."userId" = dw.user_id
+ORDER BY "challenge_stats.count" DESC, "challenge_stats.winner_handle" ASC;