Merge

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 submissionStats = _.omitBy({
         ..._.pick(row, developSubmissionFields),
         ..._.mapValues(_.pick(row, developSubmissionBigIntFields), v => toNumber(v))
@@ -686,7 +692,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 = {
@@ -815,7 +821,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 = {
@@ -828,8 +834,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,12 +4,16 @@ const TRACK_NAMES = {
   DEVELOP: 'DEVELOP',
   DESIGN: 'DESIGN',
   DATA_SCIENCE: 'DATA_SCIENCE',
+  QA: 'QA',
   COPILOT: 'COPILOT'
 }
 
 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',
@@ -48,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
   }
@@ -140,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) => {
@@ -170,11 +181,15 @@ 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 = {
     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 first-class QA / Challenge dimension.
  * @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.QA &&
+    legacyLookupCache.typeIds.CHALLENGE) {
+    return {
+      trackId: legacyLookupCache.trackIds.QA,
+      typeId: legacyLookupCache.typeIds.CHALLENGE
+    }
+  }
+
   return {
     trackId: String(trackId),
     typeId: normalizedTypeId

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,