Add dotaplus xp

processors/createParsedDataBlob.js

@@ -21,6 +21,7 @@ function getParseSchema() {
     radiant_gold_adv: [],
     radiant_xp_adv: [],
     cosmetics: {},
+    dotaplus: {},
     players: Array(...new Array(10)).map(() => ({
       player_slot: 0,
       obs_placed: 0,

processors/populate.js

@@ -14,6 +14,9 @@ function populate(e, container) {
     case 'cosmetics':
       container.cosmetics = JSON.parse(e.key);
       break;
+    case 'dotaplus':
+      container.dotaplus = JSON.parse(e.key);
+      break;
     case 'CHAT_MESSAGE_FIRSTBLOOD':
     case 'CHAT_MESSAGE_COURIER_LOST':
     case 'CHAT_MESSAGE_AEGIS':

processors/processExpand.js

@@ -612,6 +612,9 @@ function processExpand(entries, meta) {
     cosmetics(e) {
       expand(e);
     },
+    dotaplus(e) {
+      expand(e);
+    },
   };
   for (let i = 0; i < entries.length; i += 1) {
     const e = entries[i];

routes/spec.js

@@ -472,6 +472,10 @@ You can find data that can be used to convert hero and ability IDs and other inf
                         description: 'The ID value of the hero played',
                         type: 'integer',
                       },
+                      hero_dotaplus_xp: {
+                        description: 'Dota Plus hero xp',
+                        type: 'integer',
+                      },
                       item_0: {
                         description: 'Item in the player\'s first slot',
                         type: 'integer',
@@ -1441,7 +1445,13 @@ You can find data that can be used to convert hero and ability IDs and other inf
         summary: 'GET /players/{account_id}/heroes',
         description: 'Heroes played',
         tags: ['players'],
-        parameters: playerParams,
+        parameters: [...playerParams, {
+          name: 'hero_dotaplus_xp',
+          in: 'query',
+          description: 'Hero dotaplus level progress',
+          required: false,
+          type: 'boolean',
+        }],
         responses: {
           200: {
             description: 'Success',
@@ -1483,6 +1493,10 @@ You can find data that can be used to convert hero and ability IDs and other inf
                     description: 'against_win',
                     type: 'integer',
                   },
+                  hero_dotaplus_xp: {
+                    description: 'Appears if the parameter is set',
+                    type: 'integer',
+                  },
                 },
               },
             },
@@ -1505,7 +1519,7 @@ You can find data that can be used to convert hero and ability IDs and other inf
             };
             heroes[heroId] = hero;
           });
-          req.queryObj.project = req.queryObj.project.concat('heroes', 'account_id', 'start_time', 'player_slot', 'radiant_win');
+          req.queryObj.project = req.queryObj.project.concat('heroes', 'account_id', 'start_time', 'player_slot', 'radiant_win', 'hero_dotaplus_xp');
           queries.getPlayerMatches(req.params.account_id, req.queryObj, (err, cache) => {
             if (err) {
               return cb(err);
@@ -1534,6 +1548,10 @@ You can find data that can be used to convert hero and ability IDs and other inf
                     heroes[tmHero].against_games += 1;
                     heroes[tmHero].against_win += playerWin ? 1 : 0;
                   }
+                  if (req.query.hero_dotaplus_xp) {
+                    // Use the highest xp value
+                    heroes[tmHero].hero_dotaplus_xp = Math.max(m.hero_dotaplus_xp, heroes[tmHero].hero_dotaplus_xp || 0);
+                  }
                 }
               });
             });

sql/create_tables.cql

@@ -28,6 +28,7 @@ CREATE TABLE IF NOT EXISTS matches (
   teamfights text,
   version int,
   cosmetics text,
+  dotaplus text,
   skill int,
   radiant_team_id int,
   dire_team_id int,
@@ -150,6 +151,7 @@ CREATE TABLE IF NOT EXISTS player_caches (
   gold_per_min text,
   xp_per_min text,
   hero_id text,
+  hero_dotaplus_xp text,
   leaver_status text,
   version text,
   courier_kills text,

sql/create_tables.sql

@@ -39,6 +39,7 @@ CREATE TABLE IF NOT EXISTS matches (
   draft_timings json[],
   version integer,
   cosmetics json,
+  dotaplus json,
   series_id integer,
   series_type integer
 );

sql/migrations.cql

@@ -1,2 +1,4 @@
 ALTER TABLE player_matches ADD damage_targets text;
 ALTER TABLE player_matches ADD connection_log text;
+ALTER TABLE player_caches ADD hero_dotaplus_xp text;
+ALTER TABLE matches ADD dotaplus text;

sql/migrations.sql

@@ -8,3 +8,4 @@ CREATE TABLE IF NOT EXISTS webhooks (
 CREATE INDEX IF NOT EXISTS webhooks_account_id_idx on webhooks(account_id);
 
 ALTER TABLE player_matches ADD connection_log json[];
+ALTER TABLE matches ADD dotaplus json;

store/buildMatch.js

@@ -12,7 +12,9 @@ const redis = require('../store/redis');
 const db = require('../store/db');
 
 const { computeMatchData } = compute;
-const { deserialize, buildReplayUrl, isContributor } = utility;
+const {
+  deserialize, buildReplayUrl, isContributor,
+} = utility;
 const getRedisAsync = promisify(redis.get).bind(redis);
 
 async function getMatchData(matchId) {
@@ -51,6 +53,7 @@ async function extendPlayerData(player, match) {
     cluster: match.cluster,
     lobby_type: match.lobby_type,
     game_mode: match.game_mode,
+    hero_dotaplus_xp: (match.dotaplus || {})[player.player_slot] || 0,
     is_contributor: isContributor(player.account_id),
   };
   computeMatchData(p);

store/queries.js

@@ -650,6 +650,8 @@ function insertPlayerCache(match, cb) {
         p.account_id = match.pgroup[p.player_slot].account_id;
         // add hero_id to each player so we update records with hero played
         p.hero_id = match.pgroup[p.player_slot].hero_id;
+        // add dotaplusxp
+        p.hero_dotaplus_xp = (match.dotaplus || {})[p.player_slot] || 0;
       }
     });
   }