Merge pull request #133 from topcoder-platform/PM-5223-4

PM-5223: route QA challenge ratings to QA

Author: jmgasper

src/common/prismaHelper.js

@@ -49,6 +49,10 @@ const marathonRankFields = [
   'minimumRating', 'maximumRating', 'countryRank', 'schoolRank', 'defaultLanguage'
 ]
 
+const groupedSubTrackStatsTrackNames = ['DEVELOP', 'DESIGN', 'QA']
+const supportedUnifiedStatsTrackNames = ['DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'QA', 'COPILOT']
+const supportedUnifiedHistoryTrackNames = ['DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'QA']
+
 const auditFields = [
   'createdAt', 'createdBy', 'updatedAt', 'updatedBy'
 ]
@@ -331,8 +335,10 @@ function applyMaxRatingRankFallback (item) {
     return
   }
 
-  if (trackName === 'DEVELOP' && item.DEVELOP && _.isArray(item.DEVELOP.subTracks)) {
-    const statsItem = _.find(item.DEVELOP.subTracks, subTrack =>
+  if ((trackName === 'DEVELOP' || trackName === 'QA') &&
+    item[trackName] &&
+    _.isArray(item[trackName].subTracks)) {
+    const statsItem = _.find(item[trackName].subTracks, subTrack =>
       getUnifiedTypeName(subTrack.id || subTrack.name) === typeName
     )
     if (statsItem) {
@@ -616,7 +622,7 @@ function buildUnifiedStatsResponse (member, statsData, fields) {
       resolvedTrackName: getUnifiedTrackName(row.trackName || row.trackId),
       resolvedTypeName: getUnifiedTypeName(row.typeName || row.typeId)
     }))
-    .filter(row => _.includes(['DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'COPILOT'], row.resolvedTrackName))
+    .filter(row => _.includes(supportedUnifiedStatsTrackNames, row.resolvedTrackName))
     .value()
   const first = _.head(validRows) || {}
   const item = {
@@ -635,18 +641,18 @@ function buildUnifiedStatsResponse (member, statsData, fields) {
   _.forEach(validRows, (row) => {
     const trackName = row.resolvedTrackName
     const typeName = row.resolvedTypeName
-    if (trackName === 'DEVELOP') {
+    if (trackName === 'DEVELOP' || trackName === 'QA') {
       const challengeCount = toNumber(row.challenges)
-      if (!item.DEVELOP) {
-        item.DEVELOP = {
+      if (!item[trackName]) {
+        item[trackName] = {
           challenges: 0,
           wins: 0,
           mostRecentSubmission: null,
           mostRecentEventDate: null,
           subTracks: []
         }
       }
-      mergeTrackCounters(item.DEVELOP, row)
+      mergeTrackCounters(item[trackName], row)
       const subTrackItem = {
         id: typeName,
         name: typeName,
@@ -683,7 +689,7 @@ function buildUnifiedStatsResponse (member, statsData, fields) {
         rank.minRating = row.minRating
       }
       subTrackItem.rank = rank
-      item.DEVELOP.subTracks.push(subTrackItem)
+      item[trackName].subTracks.push(subTrackItem)
     } else if (trackName === 'DESIGN') {
       if (!item.DESIGN) {
         item.DESIGN = {
@@ -806,7 +812,7 @@ function buildUnifiedStatsHistoryResponse (member, historyStats, fields) {
       resolvedTrackName: getUnifiedTrackName(row.trackName || row.trackId),
       resolvedTypeName: getUnifiedTypeName(row.typeName || row.typeId)
     }))
-    .filter(row => _.includes(['DEVELOP', 'DESIGN', 'DATA_SCIENCE'], row.resolvedTrackName))
+    .filter(row => _.includes(supportedUnifiedHistoryTrackNames, row.resolvedTrackName))
     .value()
   const first = _.head(validRows) || {}
   const item = {
@@ -819,8 +825,8 @@ function buildUnifiedStatsHistoryResponse (member, historyStats, fields) {
   const groupedByTrackType = _.groupBy(validRows, row => `${row.resolvedTrackName}::${row.resolvedTypeName}`)
   _.forEach(groupedByTrackType, (trackHistory, key) => {
     const [trackName, typeName] = key.split('::')
-    if (trackName === 'DEVELOP' || trackName === 'DESIGN') {
-      const historyTrackName = trackName === 'DESIGN' ? 'DESIGN' : 'DEVELOP'
+    if (_.includes(groupedSubTrackStatsTrackNames, trackName)) {
+      const historyTrackName = trackName
       if (!item[historyTrackName]) {
         item[historyTrackName] = { subTracks: [] }
       }

src/common/statsDimensionHelper.js

@@ -4,6 +4,7 @@ const TRACK_NAMES = {
   DEVELOP: 'DEVELOP',
   DESIGN: 'DESIGN',
   DATA_SCIENCE: 'DATA_SCIENCE',
+  QA: 'QA',
   COPILOT: 'COPILOT'
 }
 
@@ -51,6 +52,10 @@ function getCanonicalTrackName (value) {
     return TRACK_NAMES.DATA_SCIENCE
   }
 
+  if (normalized === 'QA' || (normalized.includes('QUALITY') && normalized.includes('ASSURANCE'))) {
+    return TRACK_NAMES.QA
+  }
+
   if (normalized.includes('DEVELOP') || normalized === 'DEV') {
     return TRACK_NAMES.DEVELOP
   }
@@ -143,6 +148,9 @@ function buildChallengeDimensionLookup (trackRows, typeRows) {
     addLookupEntry(trackIdsByLookup, row.abbreviation, id)
     addLookupEntry(trackIdsByLookup, row.legacyId, id)
     addLookupEntry(trackIdsByLookup, canonicalTrackName, id)
+    if (canonicalTrackName === TRACK_NAMES.QA) {
+      addLookupEntry(trackIdsByLookup, 'QUALITY_ASSURANCE', id)
+    }
   })
 
   typeRows.forEach((row) => {
@@ -173,6 +181,7 @@ function buildChallengeDimensionLookup (trackRows, typeRows) {
     DEVELOP: resolveTrackIdFromLookup(lookup, TRACK_NAMES.DEVELOP) || null,
     DESIGN: resolveTrackIdFromLookup(lookup, TRACK_NAMES.DESIGN) || null,
     DATA_SCIENCE: resolveTrackIdFromLookup(lookup, TRACK_NAMES.DATA_SCIENCE) || null,
+    QA: resolveTrackIdFromLookup(lookup, TRACK_NAMES.QA) || null,
     COPILOT: resolveTrackIdFromLookup(lookup, TRACK_NAMES.COPILOT) || null
   }
   lookup.typeIds = {

src/scripts/recalculateMemberStats.js

@@ -366,7 +366,7 @@ 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. QA Challenge rows belong
- * to the legacy Testing surface under DEVELOP / BUG_HUNT.
+ * to the first-class QA / Challenge dimension.
  * @param {*} trackId raw ChallengeTrack id
  * @param {*} typeId raw ChallengeType id
  * @returns {Object} normalized trackId/typeId pair
@@ -386,11 +386,11 @@ function normalizeChallengeStatsDimension (trackId, typeId) {
   if (legacyLookupCache &&
     (normalizedTrackName === 'QUALITY_ASSURANCE' || normalizedTrackName === 'QA') &&
     typeName === TYPE_NAMES.CHALLENGE &&
-    legacyLookupCache.trackIds.DEVELOP &&
-    legacyLookupCache.typeIds.BUG_HUNT) {
+    legacyLookupCache.trackIds.QA &&
+    legacyLookupCache.typeIds.CHALLENGE) {
     return {
-      trackId: legacyLookupCache.trackIds.DEVELOP,
-      typeId: legacyLookupCache.typeIds.BUG_HUNT
+      trackId: legacyLookupCache.trackIds.QA,
+      typeId: legacyLookupCache.typeIds.CHALLENGE
     }
   }
 

src/services/SearchService.js

@@ -49,7 +49,7 @@ const MEMBER_AUTOCOMPLETE_FIELDS = ['userId', 'handle', 'handleLower',
 
 var MEMBER_STATS_FIELDS = ['userId', 'handle', 'handleLower', 'maxRating',
   'numberOfChallengesWon', 'numberOfChallengesPlaced',
-  'challenges', 'wins', 'DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'COPILOT']
+  'challenges', 'wins', 'DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'QA', 'COPILOT']
 
 const SKILL_LEVEL_WEIGHTS = {
   verified: 1.0,

src/services/StatisticsService.js

@@ -48,11 +48,11 @@ const DISTRIBUTION_FIELDS = ['track', 'subTrack', 'distribution', 'createdAt', '
   'createdBy', 'updatedBy']
 const DISTRIBUTION_FIELDS_NO_DATE = ['track', 'subTrack', 'distribution']
 
-const HISTORY_STATS_FIELDS = ['userId', 'groupId', 'handle', 'handleLower', 'DEVELOP', 'DESIGN', 'DATA_SCIENCE',
+const HISTORY_STATS_FIELDS = ['userId', 'groupId', 'handle', 'handleLower', 'DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'QA',
   'createdAt', 'updatedAt', 'createdBy', 'updatedBy']
 
 const MEMBER_STATS_FIELDS = ['userId', 'groupId', 'handle', 'handleLower', 'maxRating',
-  'challenges', 'wins', 'DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'COPILOT', 'createdAt',
+  'challenges', 'wins', 'DEVELOP', 'DESIGN', 'DATA_SCIENCE', 'QA', 'COPILOT', 'createdAt',
   'updatedAt', 'createdBy', 'updatedBy']
 
 const LEGACY_STATS_READ_SOURCE = 'legacy'
@@ -380,7 +380,6 @@ function normalizeChallengeSourceTrack (value) {
 
 /**
  * Check whether a challenge source track is Quality Assurance.
- * 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
  */
@@ -527,8 +526,8 @@ function buildBaseRatingJob (challenge, source) {
   if (source === RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE) {
     return {
       source,
-      trackId: TRACK_NAMES.DEVELOP,
-      typeId: TYPE_NAMES.BUG_HUNT
+      trackId: TRACK_NAMES.QA,
+      typeId: TYPE_NAMES.CHALLENGE
     }
   }
 
@@ -609,7 +608,7 @@ async function fetchChallengeResultParticipantIds (reviewDbClient, challengeId)
 
 /**
  * Fetch placement winner participants from challenge-api for completed
- * Development/Data Science rating rerates. This covers challenges where winners
+ * Development/Data Science/QA rating rerates. This covers challenges where winners
  * can be assigned without a review-api challengeResult row for the same member.
  * @param {Object} challengeClient challenge Prisma client
  * @param {string|number} challengeId challenge identifier
@@ -759,8 +758,8 @@ async function rerateChallengeRatingJobForMember (challengeClient, reviewDbClien
       }
     } else if (job.source === RATING_SOURCE_QUALITY_ASSURANCE_CHALLENGE) {
       rerateOptions = {
-        targetTrackName: TRACK_NAMES.DEVELOP,
-        targetTypeName: TYPE_NAMES.BUG_HUNT,
+        targetTrackName: TRACK_NAMES.QA,
+        targetTypeName: TYPE_NAMES.CHALLENGE,
         challengeTrackNames: getQualityAssuranceChallengeSourceTrackNames(),
         challengeTypeNames: [TYPE_NAMES.CHALLENGE]
       }
@@ -994,8 +993,8 @@ function isMarathonMatchType (typeName) {
 /**
  * Resolve the public stats dimensions for a challenge-backed row.
  * 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.
+ * source challenge metadata uses a different track. QA Challenge rows remain
+ * under the first-class QA / Challenge dimension.
  * @param {Object} row row containing trackId and typeId
  * @param {Object} dimensionLookup shared challenge dimension lookup
  * @returns {Object} normalized track/type ids and names
@@ -1014,15 +1013,15 @@ function resolveStatsDimensionForChallengeRow (row, dimensionLookup) {
 
   const trackName = resolveTrackNameFromLookup(dimensionLookup, row.trackId)
   if (typeName === TYPE_NAMES.CHALLENGE && isQualityAssuranceChallengeSourceTrack(trackName)) {
-    const developTrackId = resolveTrackIdFromLookup(dimensionLookup, TRACK_NAMES.DEVELOP)
-    const bugHuntTypeId = resolveTypeIdFromLookup(dimensionLookup, TYPE_NAMES.BUG_HUNT)
+    const qaTrackId = resolveTrackIdFromLookup(dimensionLookup, TRACK_NAMES.QA)
+    const challengeTypeId = resolveTypeIdFromLookup(dimensionLookup, TYPE_NAMES.CHALLENGE)
 
-    if (developTrackId && bugHuntTypeId) {
+    if (qaTrackId && challengeTypeId) {
       return {
-        trackId: developTrackId,
-        typeId: bugHuntTypeId,
-        trackName: TRACK_NAMES.DEVELOP,
-        typeName: TYPE_NAMES.BUG_HUNT
+        trackId: qaTrackId,
+        typeId: challengeTypeId,
+        trackName: TRACK_NAMES.QA,
+        typeName: TYPE_NAMES.CHALLENGE
       }
     }
   }
@@ -1618,12 +1617,12 @@ function buildAggregatedStatsFromReviewResults (reviewRows, challengeMetadataByI
 
 /**
  * Check whether the unified history response should surface the supplied track.
- * The public history contract currently exposes DEVELOPMENT, DESIGN, and DATA_SCIENCE groups.
+ * The public history contract currently exposes DEVELOPMENT, DESIGN, DATA_SCIENCE, and QA groups.
  * @param {string|undefined} trackName canonical track label
  * @returns {boolean} true when the track should be included in history responses
  */
 function isSupportedUnifiedHistoryTrack (trackName) {
-  return _.includes([TRACK_NAMES.DEVELOP, TRACK_NAMES.DESIGN, TRACK_NAMES.DATA_SCIENCE], trackName)
+  return _.includes([TRACK_NAMES.DEVELOP, TRACK_NAMES.DESIGN, TRACK_NAMES.DATA_SCIENCE, TRACK_NAMES.QA], trackName)
 }
 
 /**
@@ -4353,7 +4352,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 legacy Testing bucket under DEVELOP / BUG_HUNT.
+ * replayed into the first-class QA / Challenge stats dimension.
  * @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
@@ -4514,7 +4513,7 @@ rerateChallengeSubmitterRatings.schema = {
 
 /**
  * Trigger a DEVELOPMENT / Challenge, DATA_SCIENCE / Challenge,
- * DATA_SCIENCE / MARATHON_MATCH, or configured tag- or skill-based rating path
+ * QA / Challenge, DATA_SCIENCE / MARATHON_MATCH, or configured tag- or skill-based rating path
  * re-rating pass beginning with the supplied challenge.
  * The relevant review-api results are reprocessed in chronological order and
  * persisted into the existing unified rating tables for the member.
@@ -4572,6 +4571,20 @@ async function rerateMemberStats (currentUser, handle, data) {
         challengeTypeNames: [TYPE_NAMES.CHALLENGE]
       }
     )
+  } else if (trackId === TRACK_NAMES.QA && typeId === TYPE_NAMES.CHALLENGE) {
+    result = await rerateDevTrack(
+      prisma,
+      challengeClient,
+      reviewDbClient,
+      member.userId,
+      payload.challengeId,
+      {
+        targetTrackName: TRACK_NAMES.QA,
+        targetTypeName: TYPE_NAMES.CHALLENGE,
+        challengeTrackNames: getQualityAssuranceChallengeSourceTrackNames(),
+        challengeTypeNames: [TYPE_NAMES.CHALLENGE]
+      }
+    )
   } else if (trackId === TRACK_NAMES.DATA_SCIENCE && typeId === TYPE_NAMES.MARATHON_MATCH) {
     result = await rerateMmTrack(
       prisma,
@@ -4582,7 +4595,7 @@ async function rerateMemberStats (currentUser, handle, data) {
       payload.challengeId
     )
   } else {
-    throw new errors.BadRequestError('Only DEVELOP / Challenge, DATA_SCIENCE / Challenge, and DATA_SCIENCE / MARATHON_MATCH rerates are currently supported.')
+    throw new errors.BadRequestError('Only DEVELOP / Challenge, DATA_SCIENCE / Challenge, QA / Challenge, and DATA_SCIENCE / MARATHON_MATCH rerates are currently supported.')
   }
 
   return {
@@ -4607,7 +4620,7 @@ rerateMemberStats.schema = {
   data: Joi.object().keys({
     challengeId: Joi.alternatives().try(Joi.string().uuid(), Joi.number().integer().strict()).required(),
     ratingName: Joi.string(),
-    trackId: Joi.string().valid(TRACK_NAMES.DEVELOP, TRACK_NAMES.DATA_SCIENCE).insensitive(),
+    trackId: Joi.string().valid(TRACK_NAMES.DEVELOP, TRACK_NAMES.DATA_SCIENCE, TRACK_NAMES.QA).insensitive(),
     typeId: Joi.string().valid(TYPE_NAMES.CHALLENGE, TYPE_NAMES.MARATHON_MATCH).insensitive()
   }).required()
 }

test/unit/DevelopRatingEngine.test.js

@@ -17,6 +17,7 @@ const {
 const should = chai.should()
 const DEVELOP_TRACK_ID = 'track-develop-id'
 const DATA_SCIENCE_TRACK_ID = 'track-data-science-id'
+const QA_TRACK_ID = 'track-qa-id'
 const CHALLENGE_TYPE_ID = 'type-challenge-id'
 const CODE_TYPE_ID = 'type-code-id'
 const BUG_HUNT_TYPE_ID = 'type-bug-hunt-id'
@@ -364,7 +365,8 @@ function createChallengeClient (metadataById, winnerRows = []) {
       if (sql.includes('FROM "ChallengeTrack"')) {
         return [
           { id: DEVELOP_TRACK_ID, name: 'Development', abbreviation: 'DEV', legacyId: null },
-          { id: DATA_SCIENCE_TRACK_ID, name: 'Data Science', abbreviation: 'DS', legacyId: null }
+          { id: DATA_SCIENCE_TRACK_ID, name: 'Data Science', abbreviation: 'DS', legacyId: null },
+          { id: QA_TRACK_ID, name: 'Quality Assurance', abbreviation: 'QA', legacyId: null }
         ]
       }
 
@@ -600,7 +602,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 Testing rerates', async () => {
+  it('rerateDevTrack should include QA ChallengeWinner placements in QA rerates', async () => {
     const targetUserId = toBigInt(89770374)
     const opponentUserId = toBigInt(100000039)
     const challengeId = 'qa-rating-jun-2'
@@ -650,8 +652,8 @@ describe('develop rating engine unit tests', () => {
       targetUserId,
       challengeId,
       {
-        targetTrackName: 'DEVELOP',
-        targetTypeName: 'BUG_HUNT',
+        targetTrackName: 'QA',
+        targetTypeName: 'Challenge',
         challengeTrackNames: ['QUALITY_ASSURANCE'],
         challengeTypeNames: ['Challenge']
       }
@@ -662,8 +664,8 @@ describe('develop rating engine unit tests', () => {
 
     const statsRow = members.state.statsRows.find((row) =>
       String(row.userId) === String(targetUserId) &&
-      row.trackId === DEVELOP_TRACK_ID &&
-      row.typeId === BUG_HUNT_TYPE_ID
+      row.trackId === QA_TRACK_ID &&
+      row.typeId === CHALLENGE_TYPE_ID
     )
     should.exist(statsRow)
     statsRow.rating.should.equal(expectedTarget.rating)
@@ -673,16 +675,16 @@ describe('develop rating engine unit tests', () => {
 
     const historyRow = findHistoryRow(members.state.historyRows, targetUserId, challengeId)
     should.exist(historyRow)
-    historyRow.trackId.should.equal(DEVELOP_TRACK_ID)
-    historyRow.typeId.should.equal(BUG_HUNT_TYPE_ID)
+    historyRow.trackId.should.equal(QA_TRACK_ID)
+    historyRow.typeId.should.equal(CHALLENGE_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('DEVELOP')
-    maxRatingRow.subTrack.should.equal('BUG_HUNT')
+    maxRatingRow.track.should.equal('QA')
+    maxRatingRow.subTrack.should.equal('Challenge')
     maxRatingRow.ratingColor.should.equal(getRatingColor(expectedTarget.rating))
   })