More cleanup

Author: paulvanwamelen

api/abstractplay.ts

@@ -636,12 +636,8 @@ module.exports.authQuery = async (event: { body: { query: any; pars: any; }; cog
       return await updateGameSettings(event.cognitoPoolClaims.sub, pars);
     case "update_user_settings":
       return await updateUserSettings(event.cognitoPoolClaims.sub, pars);
-    case "update_meta_game_counts":
-      return await updateMetaGameCounts(event.cognitoPoolClaims.sub);
     case "mark_published":
       return await markAsPublished(event.cognitoPoolClaims.sub, pars);
-    case "update_meta_game_ratings":
-      return await updateMetaGameRatings(event.cognitoPoolClaims.sub);
     case "new_tournament":
       return await newTournament(event.cognitoPoolClaims.sub, pars);
     case "join_tournament":
@@ -7181,221 +7177,6 @@ async function sendPush(opts: PushOptions) {
     }
 }
 
-async function updateMetaGameCounts(userId: string) {
-  // Make sure people aren't getting clever
-  try {
-    const user = await ddbDocClient.send(
-      new GetCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        Key: {
-          "pk": "USER",
-          "sk": userId
-        },
-      }));
-    if (user.Item === undefined || user.Item.admin !== true) {
-      return {
-        statusCode: 200,
-        body: JSON.stringify({}),
-        headers
-      };
-    }
-
-    const metaGamesDataWork = ddbDocClient.send(
-      new GetCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        Key: {
-          "pk": "METAGAMES", "sk": "COUNTS"
-        },
-      }));
-
-    const games: string[] = [];
-    gameinfo.forEach((game) => games.push(game.uid));
-    const currentgames = games.map(game => ddbDocClient.send(
-      new QueryCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        KeyConditionExpression: "#pk = :pk and begins_with(#sk, :sk)",
-        ExpressionAttributeValues: { ":pk": "GAME", ":sk": game + '#0#' },
-        ExpressionAttributeNames: { "#pk": "pk", "#sk": "sk" },
-        ProjectionExpression: "#pk, #sk"
-      })));
-    const completedgames = games.map(game => ddbDocClient.send(
-      new QueryCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        KeyConditionExpression: "#pk = :pk",
-        ExpressionAttributeValues: { ":pk": "COMPLETEDGAMES#" + game },
-        ExpressionAttributeNames: { "#pk": "pk", "#sk": "sk" },
-        ProjectionExpression: "#pk, #sk"
-      })));
-    const standingchallenges = games.map(game => ddbDocClient.send(
-      new QueryCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        KeyConditionExpression: "#pk = :pk",
-        ExpressionAttributeValues: { ":pk": "STANDINGCHALLENGE#" + game },
-        ExpressionAttributeNames: { "#pk": "pk", "#sk": "sk" },
-        ProjectionExpression: "#pk, #sk"
-      })));
-
-    const metaGamesData = await metaGamesDataWork;
-    let metaGameCounts: MetaGameCounts;
-    if (metaGamesData.Item === undefined)
-      metaGameCounts = {};
-    else
-      metaGameCounts = metaGamesData.Item as MetaGameCounts;
-
-    const work = await Promise.all([Promise.all(currentgames), Promise.all(completedgames), Promise.all(standingchallenges)]);
-    console.log("work", work);
-
-    // process stars
-    const players = await getAllUsers();
-    console.log("All players");
-    console.log(JSON.stringify(players.map(p => p.name)));
-    const starCounts = new Map<string, number>();
-    for (const p of players) {
-        if (p.stars !== undefined) {
-            for (const star of p.stars) {
-                if (starCounts.has(star)) {
-                    const val = starCounts.get(star)!;
-                    starCounts.set(star, val + 1);
-                } else {
-                    starCounts.set(star, 1);
-                }
-            }
-        }
-    }
-
-    games.forEach((game, ind) => {
-      if (metaGameCounts[game] === undefined) {
-        metaGameCounts[game] = {
-          "currentgames": work[0][ind].Items ? work[0][ind].Items!.length : 0,
-          "completedgames": work[1][ind].Items ? work[1][ind].Items!.length : 0,
-          "standingchallenges": work[2][ind].Items ? work[2][ind].Items!.length : 0,
-          "stars": starCounts.has(game) ? starCounts.get(game)! : 0,
-        };
-      } else {
-        metaGameCounts[game].currentgames = work[0][ind].Items ? work[0][ind].Items!.length : 0;
-        metaGameCounts[game].completedgames = work[1][ind].Items ? work[1][ind].Items!.length : 0;
-        metaGameCounts[game].standingchallenges = work[2][ind].Items ? work[2][ind].Items!.length : 0;
-        metaGameCounts[game].stars = starCounts.has(game) ? starCounts.get(game)! : 0;
-      }
-    });
-
-    console.log(metaGameCounts);
-    await ddbDocClient.send(
-      new PutCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-          Item: {
-            "pk": "METAGAMES",
-            "sk": "COUNTS",
-            ...metaGameCounts
-          }
-        })
-    );
-  } catch (err) {
-    logGetItemError(err);
-    return formatReturnError(`Unable to update meta game counts ${userId}`);
-  }
-}
-
-async function updateMetaGameRatings(userId: string) {
-  // Make sure people aren't getting clever
-  try {
-    const user = await ddbDocClient.send(
-      new GetCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        Key: {
-          "pk": "USER",
-          "sk": userId
-        },
-      }));
-    if (user.Item === undefined || user.Item.admin !== true) {
-      return {
-        statusCode: 200,
-        body: JSON.stringify({}),
-        headers
-      };
-    }
-
-    const metaGamesDataWork = ddbDocClient.send(
-      new GetCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-        Key: {
-          "pk": "METAGAMES", "sk": "COUNTS"
-        },
-      }));
-
-    const data = await ddbDocClient.send(
-        new QueryCommand({
-          TableName: process.env.ABSTRACT_PLAY_TABLE,
-          KeyConditionExpression: "#pk = :pk",
-          ExpressionAttributeValues: { ":pk": "USER" },
-          ExpressionAttributeNames: { "#pk": "pk" }
-        }));
-    if (data.Items === undefined) {
-      return;
-    }
-    const ratings: {
-      [metaGame: string]: {player: string, name: string, rating: Rating}[];
-    } = {};
-    const users = data.Items as FullUser[];
-    users.forEach(player => {
-      if (player.ratings) {
-        Object.keys(player.ratings).forEach(metaGame => {
-          if (ratings[metaGame] === undefined)
-            ratings[metaGame] = [];
-          ratings[metaGame].push({player: player.id, name: player.name, rating: player.ratings![metaGame]});
-        });
-      }
-    });
-
-    const work: Promise<any>[] = [];
-    const metaGamesData = await metaGamesDataWork;
-    const metaGameCounts = metaGamesData.Item as MetaGameCounts;
-    Object.keys(ratings).forEach(metaGame => {
-      if (metaGameCounts[metaGame] === undefined)
-        metaGameCounts[metaGame] = {currentgames: 0, completedgames: 0, standingchallenges: 0};
-      
-      // Use new flattened ratings structure
-      const flattenedKey = `${metaGame}_ratings`;
-      const ratingsArray: string[] = [];
-      
-      ratings[metaGame].forEach(rating => {
-        if (!ratingsArray.includes(rating.player)) {
-          ratingsArray.push(rating.player);
-        }
-        work.push(sendCommandWithRetry(
-          new PutCommand({
-            TableName: process.env.ABSTRACT_PLAY_TABLE,
-              Item: {
-                "pk": "RATINGS#" + metaGame,
-                "sk": rating.player,
-                "id": rating.player,
-                "name": rating.name,
-                "rating": rating.rating
-              }
-            })
-        ));
-      });
-      
-      // Set flattened ratings
-      (metaGameCounts as any)[flattenedKey] = ratingsArray;
-    });
-
-    work.push(sendCommandWithRetry(
-      new PutCommand({
-        TableName: process.env.ABSTRACT_PLAY_TABLE,
-          Item: {
-            "pk": "METAGAMES",
-            "sk": "COUNTS",
-            ...metaGameCounts
-          }
-        })
-    ));
-    await Promise.all(work);
-  } catch (err) {
-    logGetItemError(err);
-    return formatReturnError(`Unable to update meta game counts ${userId}`);
-  }
-}
 
 async function invokePie(userid: string, pars: {id: string, metaGame: string, cbit: number}) {
     if (pars.cbit !== 0) {