Merge pull request #132 from topcoder-platform/PM-5223-3

PM-5223: route QA challenge stats to Testing

Author: jmgasper

src/common/statsDimensionHelper.js

@@ -10,6 +10,9 @@ const TRACK_NAMES = {
 const TYPE_NAMES = {
   CHALLENGE: 'Challenge',
   CODE: 'CODE',
+  BUG_HUNT: 'BUG_HUNT',
+  TEST_SCENARIOS: 'TEST_SCENARIOS',
+  TEST_SUITES: 'TEST_SUITES',
   FIRST2FINISH: 'First2Finish',
   TASK: 'Task',
   SRM: 'SRM',
@@ -175,6 +178,9 @@ function buildChallengeDimensionLookup (trackRows, typeRows) {
   lookup.typeIds = {
     CHALLENGE: resolveTypeIdFromLookup(lookup, TYPE_NAMES.CHALLENGE) || null,
     CODE: resolveTypeIdFromLookup(lookup, TYPE_NAMES.CODE) || null,
+    BUG_HUNT: resolveTypeIdFromLookup(lookup, TYPE_NAMES.BUG_HUNT) || null,
+    TEST_SCENARIOS: resolveTypeIdFromLookup(lookup, TYPE_NAMES.TEST_SCENARIOS) || null,
+    TEST_SUITES: resolveTypeIdFromLookup(lookup, TYPE_NAMES.TEST_SUITES) || null,
     FIRST2FINISH: resolveTypeIdFromLookup(lookup, TYPE_NAMES.FIRST2FINISH) || null,
     TASK: resolveTypeIdFromLookup(lookup, TYPE_NAMES.TASK) || null,
     SRM: resolveTypeIdFromLookup(lookup, TYPE_NAMES.SRM) || null,

src/scripts/recalculateMemberStats.js

@@ -365,7 +365,8 @@ function isMarathonMatchTypeId (typeId) {
 /**
  * Normalize challenge metadata dimensions into the public stats dimensions.
  * Marathon Match stats/history belong to DATA_SCIENCE even when the source
- * challenge row was imported with a Development track.
+ * challenge row was imported with a Development track. QA Challenge rows belong
+ * to the legacy Testing surface under DEVELOP / BUG_HUNT.
  * @param {*} trackId raw ChallengeTrack id
  * @param {*} typeId raw ChallengeType id
  * @returns {Object} normalized trackId/typeId pair
@@ -379,6 +380,20 @@ function normalizeChallengeStatsDimension (trackId, typeId) {
     }
   }
 
+  const trackName = resolveTrackNameFromLookup(legacyLookupCache, trackId)
+  const typeName = resolveTypeNameFromLookup(legacyLookupCache, normalizedTypeId) || resolveTypeName(normalizedTypeId)
+  const normalizedTrackName = normalizeLookupKey(trackName).replace(/[\s-]+/g, '_')
+  if (legacyLookupCache &&
+    (normalizedTrackName === 'QUALITY_ASSURANCE' || normalizedTrackName === 'QA') &&
+    typeName === TYPE_NAMES.CHALLENGE &&
+    legacyLookupCache.trackIds.DEVELOP &&
+    legacyLookupCache.typeIds.BUG_HUNT) {
+    return {
+      trackId: legacyLookupCache.trackIds.DEVELOP,
+      typeId: legacyLookupCache.typeIds.BUG_HUNT
+    }
+  }
+
   return {
     trackId: String(trackId),
     typeId: normalizedTypeId

src/services/StatisticsService.js

@@ -67,6 +67,7 @@ if (!_.includes(SUPPORTED_STATS_READ_SOURCES, configuredStatsReadSource)) {
 const USE_LEGACY_STATS_READS = configuredStatsReadSource === LEGACY_STATS_READ_SOURCE
 const RATING_SOURCE_DEVELOPMENT = 'DEVELOPMENT_CHALLENGE'
 const RATING_SOURCE_DATA_SCIENCE_CHALLENGE = 'DATA_SCIENCE_CHALLENGE'
+const RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE = 'QUALITY_ASSURANCE_CHALLENGE'
 const RATING_SOURCE_MARATHON_MATCH = 'MARATHON_MATCH'
 const RERATE_MARATHON_ACTOR = 'rerate-mm-stats'
 const CHALLENGE_TRACK_QUALITY_ASSURANCE = 'QUALITY_ASSURANCE'
@@ -379,7 +380,7 @@ function normalizeChallengeSourceTrack (value) {
 
 /**
  * Check whether a challenge source track is Quality Assurance.
- * QA Challenge results are rated in the public Data Science Challenge bucket.
+ * QA Challenge results are surfaced in the legacy Testing bucket.
  * @param {*} value raw challenge track label, enum value, or abbreviation
  * @returns {boolean} true when the source track is QA
  */
@@ -390,11 +391,18 @@ function isQualityAssuranceChallengeSourceTrack (value) {
 
 /**
  * Build the source tracks replayed for Data Science Challenge ratings.
- * QA Challenges share the public Data Science Challenge rating bucket.
  * @returns {Array<string>} challenge source track labels
  */
 function getDataScienceChallengeSourceTrackNames () {
-  return [TRACK_NAMES.DATA_SCIENCE, CHALLENGE_TRACK_QUALITY_ASSURANCE]
+  return [TRACK_NAMES.DATA_SCIENCE]
+}
+
+/**
+ * Build the source tracks replayed for Quality Assurance Challenge ratings.
+ * @returns {Array<string>} challenge source track labels
+ */
+function getQualityAssuranceChallengeSourceTrackNames () {
+  return [CHALLENGE_TRACK_QUALITY_ASSURANCE]
 }
 
 /**
@@ -474,8 +482,11 @@ function resolveChallengeRatingSource (challenge) {
     return RATING_SOURCE_DEVELOPMENT
   }
 
-  if ((trackName === TRACK_NAMES.DATA_SCIENCE || isQualityAssuranceChallengeSourceTrack(rawTrackName)) &&
-    typeName === TYPE_NAMES.CHALLENGE) {
+  if (isQualityAssuranceChallengeSourceTrack(rawTrackName) && typeName === TYPE_NAMES.CHALLENGE) {
+    return RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE
+  }
+
+  if (trackName === TRACK_NAMES.DATA_SCIENCE && typeName === TYPE_NAMES.CHALLENGE) {
     return RATING_SOURCE_DATA_SCIENCE_CHALLENGE
   }
 
@@ -513,6 +524,14 @@ function buildBaseRatingJob (challenge, source) {
     }
   }
 
+  if (source === RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE) {
+    return {
+      source,
+      trackId: TRACK_NAMES.DEVELOP,
+      typeId: TYPE_NAMES.BUG_HUNT
+    }
+  }
+
   if (source === RATING_SOURCE_MARATHON_MATCH) {
     return {
       source,
@@ -650,7 +669,9 @@ async function fetchMarathonMatchParticipantIds (reviewDbClient, challengeId) {
  */
 async function fetchRatingParticipantIds (reviewDbClient, challengeClient, challengeId, source) {
   const challengeResultUserIds = await fetchChallengeResultParticipantIds(reviewDbClient, challengeId)
-  if (source === RATING_SOURCE_DEVELOPMENT || source === RATING_SOURCE_DATA_SCIENCE_CHALLENGE) {
+  if (source === RATING_SOURCE_DEVELOPMENT ||
+    source === RATING_SOURCE_DATA_SCIENCE_CHALLENGE ||
+    source === RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE) {
     return _.uniqBy(
       challengeResultUserIds.concat(await fetchChallengeWinnerParticipantIds(challengeClient, challengeId)),
       stringifyUserId
@@ -726,15 +747,24 @@ async function rerateChallengeRatingJobForMember (challengeClient, reviewDbClien
   }
 
   if (job.source === RATING_SOURCE_DEVELOPMENT ||
-    job.source === RATING_SOURCE_DATA_SCIENCE_CHALLENGE) {
-    const rerateOptions = job.source === RATING_SOURCE_DATA_SCIENCE_CHALLENGE
-      ? {
+    job.source === RATING_SOURCE_DATA_SCIENCE_CHALLENGE ||
+    job.source === RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE) {
+    let rerateOptions
+    if (job.source === RATING_SOURCE_DATA_SCIENCE_CHALLENGE) {
+      rerateOptions = {
         targetTrackName: TRACK_NAMES.DATA_SCIENCE,
         targetTypeName: TYPE_NAMES.CHALLENGE,
         challengeTrackNames: getDataScienceChallengeSourceTrackNames(),
         challengeTypeNames: [TYPE_NAMES.CHALLENGE]
       }
-      : undefined
+    } else if (job.source === RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE) {
+      rerateOptions = {
+        targetTrackName: TRACK_NAMES.DEVELOP,
+        targetTypeName: TYPE_NAMES.BUG_HUNT,
+        challengeTrackNames: getQualityAssuranceChallengeSourceTrackNames(),
+        challengeTypeNames: [TYPE_NAMES.CHALLENGE]
+      }
+    }
 
     return rerateDevTrack(
       prisma,
@@ -963,8 +993,9 @@ function isMarathonMatchType (typeName) {
 
 /**
  * Resolve the public stats dimensions for a challenge-backed row.
- * Marathon Match and QA Challenge rows are part of the public DATA_SCIENCE
- * bucket even when source challenge metadata uses a different track.
+ * Marathon Match rows are part of the public DATA_SCIENCE bucket even when
+ * source challenge metadata uses a different track. QA Challenge rows retain
+ * the legacy Testing surface under DEVELOP / BUG_HUNT.
  * @param {Object} row row containing trackId and typeId
  * @param {Object} dimensionLookup shared challenge dimension lookup
  * @returns {Object} normalized track/type ids and names
@@ -983,12 +1014,16 @@ function resolveStatsDimensionForChallengeRow (row, dimensionLookup) {
 
   const trackName = resolveTrackNameFromLookup(dimensionLookup, row.trackId)
   if (typeName === TYPE_NAMES.CHALLENGE && isQualityAssuranceChallengeSourceTrack(trackName)) {
-    const dataScienceTrackId = resolveTrackIdFromLookup(dimensionLookup, TRACK_NAMES.DATA_SCIENCE)
-    return {
-      trackId: dataScienceTrackId || row.trackId,
-      typeId: row.typeId,
-      trackName: TRACK_NAMES.DATA_SCIENCE,
-      typeName
+    const developTrackId = resolveTrackIdFromLookup(dimensionLookup, TRACK_NAMES.DEVELOP)
+    const bugHuntTypeId = resolveTypeIdFromLookup(dimensionLookup, TYPE_NAMES.BUG_HUNT)
+
+    if (developTrackId && bugHuntTypeId) {
+      return {
+        trackId: developTrackId,
+        typeId: bugHuntTypeId,
+        trackName: TRACK_NAMES.DEVELOP,
+        typeName: TYPE_NAMES.BUG_HUNT
+      }
     }
   }
 
@@ -1236,9 +1271,10 @@ function filterUnifiedHistoryRowsToCompletedChallenges (rows, challengeMetadataB
  * the response payload consumed by the profiles UI.
  * @param {Array<Object>} rows unified history rows loaded from members.memberStatsHistory
  * @param {Map<string, Object>} challengeMetadataById challenge metadata keyed by UUID and legacy ids
+ * @param {Object} dimensionLookup shared challenge dimension lookup
  * @returns {Array<Object>} rows enriched with canonical challenge ids and names when available
  */
-function enrichUnifiedHistoryRowsWithChallengeMetadata (rows, challengeMetadataById) {
+function enrichUnifiedHistoryRowsWithChallengeMetadata (rows, challengeMetadataById, dimensionLookup) {
   return _.map(rows || [], (row) => {
     const challengeId = _.isNil(row.challengeId) ? null : String(row.challengeId).trim()
     if (!challengeId) {
@@ -1257,9 +1293,16 @@ function enrichUnifiedHistoryRowsWithChallengeMetadata (rows, challengeMetadataB
         : _.get(challenge, 'legacyRecord.legacySystemId')
     )
     const preserveLegacyChallengeId = isLegacyNumericMarathonHistoryRow(row)
+    const dimension = challenge.trackId && challenge.typeId
+      ? resolveStatsDimensionForChallengeRow({
+        trackId: String(challenge.trackId),
+        typeId: String(challenge.typeId)
+      }, dimensionLookup)
+      : {}
 
     return {
       ...row,
+      ...dimension,
       challengeId: preserveLegacyChallengeId ? challengeId : canonicalChallengeId,
       canonicalChallengeId,
       legacyChallengeId,
@@ -1532,10 +1575,7 @@ function buildAggregatedStatsFromReviewResults (reviewRows, challengeMetadataByI
       return
     }
 
-    const dimension = resolveStatsDimensionForChallengeRow({
-      trackId: String(challenge.trackId),
-      typeId: String(challenge.typeId)
-    }, dimensionLookup)
+    const dimension = resolveStatsDimensionForChallengeRow(challenge, dimensionLookup)
     const trackId = dimension.trackId
     const typeId = dimension.typeId
     if (!trackId || !typeId) {
@@ -1647,10 +1687,7 @@ function buildFallbackHistoryRowsFromReviewResults (reviewRows, challengeMetadat
       return
     }
 
-    const dimension = resolveStatsDimensionForChallengeRow({
-      trackId: String(challenge.trackId),
-      typeId: String(challenge.typeId)
-    }, dimensionLookup)
+    const dimension = resolveStatsDimensionForChallengeRow(challenge, dimensionLookup)
     const trackId = dimension.trackId
     const typeId = dimension.typeId
     const pairKey = buildStatsTrackTypeKey(trackId, typeId)
@@ -1731,10 +1768,7 @@ function buildFallbackHistoryRowsFromChallengeWinners (winnerRows, dimensionLook
       return
     }
 
-    const dimension = resolveStatsDimensionForChallengeRow({
-      trackId: String(challenge.trackId),
-      typeId: String(challenge.typeId)
-    }, dimensionLookup)
+    const dimension = resolveStatsDimensionForChallengeRow(challenge, dimensionLookup)
     const trackId = dimension.trackId
     const typeId = dimension.typeId
     const pairKey = buildStatsTrackTypeKey(trackId, typeId)
@@ -3425,7 +3459,8 @@ async function getHistoryStats (currentUser, handle, query) {
       let annotatedRows = dedupeUnifiedHistoryRows(filterUnifiedHistoryRowsToCompletedChallenges(
         enrichUnifiedHistoryRowsWithChallengeMetadata(
           annotateUnifiedDimensionRows(historyRows, dimensionLookup),
-          challengeMetadataById
+          challengeMetadataById,
+          dimensionLookup
         ),
         challengeMetadataById
       ))
@@ -4318,7 +4353,7 @@ refreshMemberStats.schema = {
  * rating dimensions. This includes the native challenge track/type rating when
  * supported and any configured named rating paths whose tags/skills match the
  * challenge, such as the default AI path. Quality Assurance Challenge rows are
- * replayed into the public DATA_SCIENCE / Challenge rating bucket.
+ * replayed into the legacy Testing bucket under DEVELOP / BUG_HUNT.
  * @param {Object} currentUser the user who performs operation
  * @param {Object} data rerate payload containing the completed challenge id
  * @returns {Object} summary of participants, rating jobs, updates, and per-member failures
@@ -4481,8 +4516,6 @@ rerateChallengeSubmitterRatings.schema = {
  * Trigger a DEVELOPMENT / Challenge, DATA_SCIENCE / Challenge,
  * DATA_SCIENCE / MARATHON_MATCH, or configured tag- or skill-based rating path
  * re-rating pass beginning with the supplied challenge.
- * DATA_SCIENCE / Challenge rerates also replay Quality Assurance Challenge
- * source rows because QA history is surfaced in that public rating bucket.
  * The relevant review-api results are reprocessed in chronological order and
  * persisted into the existing unified rating tables for the member.
  * @param {Object} currentUser the user who performs operation

test/unit/DevelopRatingEngine.test.js

@@ -19,6 +19,7 @@ const DEVELOP_TRACK_ID = 'track-develop-id'
 const DATA_SCIENCE_TRACK_ID = 'track-data-science-id'
 const CHALLENGE_TYPE_ID = 'type-challenge-id'
 const CODE_TYPE_ID = 'type-code-id'
+const BUG_HUNT_TYPE_ID = 'type-bug-hunt-id'
 const MARATHON_MATCH_TYPE_ID = 'type-marathon-match-id'
 
 function isBigIntValue (value) {
@@ -371,6 +372,7 @@ function createChallengeClient (metadataById, winnerRows = []) {
         return [
           { id: CHALLENGE_TYPE_ID, name: 'Challenge', abbreviation: 'CH', legacyId: null, isTask: false },
           { id: CODE_TYPE_ID, name: 'Code', abbreviation: 'CODE', legacyId: null, isTask: false },
+          { id: BUG_HUNT_TYPE_ID, name: 'BUG_HUNT', abbreviation: 'LBGH', legacyId: 120, isTask: false },
           { id: MARATHON_MATCH_TYPE_ID, name: 'Marathon Match', abbreviation: 'MM', legacyId: null, isTask: false }
         ]
       }
@@ -598,7 +600,7 @@ describe('develop rating engine unit tests', () => {
     members.state.rankRecalculationCalls[0].typeId.should.equal(CHALLENGE_TYPE_ID)
   })
 
-  it('rerateDevTrack should include QA ChallengeWinner placements in Data Science Challenge rerates', async () => {
+  it('rerateDevTrack should include QA ChallengeWinner placements in Testing rerates', async () => {
     const targetUserId = toBigInt(89770374)
     const opponentUserId = toBigInt(100000039)
     const challengeId = 'qa-rating-jun-2'
@@ -648,9 +650,9 @@ describe('develop rating engine unit tests', () => {
       targetUserId,
       challengeId,
       {
-        targetTrackName: 'DATA_SCIENCE',
-        targetTypeName: 'Challenge',
-        challengeTrackNames: ['DATA_SCIENCE', 'QUALITY_ASSURANCE'],
+        targetTrackName: 'DEVELOP',
+        targetTypeName: 'BUG_HUNT',
+        challengeTrackNames: ['QUALITY_ASSURANCE'],
         challengeTypeNames: ['Challenge']
       }
     )
@@ -660,8 +662,8 @@ describe('develop rating engine unit tests', () => {
 
     const statsRow = members.state.statsRows.find((row) =>
       String(row.userId) === String(targetUserId) &&
-      row.trackId === DATA_SCIENCE_TRACK_ID &&
-      row.typeId === CHALLENGE_TYPE_ID
+      row.trackId === DEVELOP_TRACK_ID &&
+      row.typeId === BUG_HUNT_TYPE_ID
     )
     should.exist(statsRow)
     statsRow.rating.should.equal(expectedTarget.rating)
@@ -671,16 +673,16 @@ describe('develop rating engine unit tests', () => {
 
     const historyRow = findHistoryRow(members.state.historyRows, targetUserId, challengeId)
     should.exist(historyRow)
-    historyRow.trackId.should.equal(DATA_SCIENCE_TRACK_ID)
-    historyRow.typeId.should.equal(CHALLENGE_TYPE_ID)
+    historyRow.trackId.should.equal(DEVELOP_TRACK_ID)
+    historyRow.typeId.should.equal(BUG_HUNT_TYPE_ID)
     historyRow.newRating.should.equal(expectedTarget.rating)
     historyRow.mostRecent.should.equal(true)
 
     const maxRatingRow = members.state.maxRatingRows.find((row) => String(row.userId) === String(targetUserId))
     should.exist(maxRatingRow)
     maxRatingRow.rating.should.equal(expectedTarget.rating)
-    maxRatingRow.track.should.equal('DATA_SCIENCE')
-    maxRatingRow.subTrack.should.equal('Challenge')
+    maxRatingRow.track.should.equal('DEVELOP')
+    maxRatingRow.subTrack.should.equal('BUG_HUNT')
     maxRatingRow.ratingColor.should.equal(getRatingColor(expectedTarget.rating))
   })