Merge pull request #258 from DestinyItemManager/loadout-share-migrate

Migrate loadout shares

api/routes/loadout-share.ts

@@ -1,8 +1,6 @@
 import crypto from 'crypto';
 import asyncHandler from 'express-async-handler';
 import base32 from 'hi-base32';
-import { transaction } from '../db/index.js';
-import { getLoadoutShare, recordAccess } from '../db/loadout-share-queries.js';
 import { metrics } from '../metrics/index.js';
 import { ApiApp } from '../shapes/app.js';
 import {
@@ -117,25 +115,10 @@ export const getLoadoutShareHandler = asyncHandler(async (req, res) => {
 });
 
 export async function loadLoadoutShare(shareId: string) {
-  // First look in Stately
-  try {
-    const loadout = await getLoadoutShareStately(shareId);
-    if (loadout) {
-      // Record when this was viewed and increment the view counter. Not using it much for now but I'd like to know.
-      await recordAccessStately(shareId);
-      return loadout;
-    }
-  } catch (e) {
-    console.error('Failed to load loadout share from Stately', e);
-  }
-
-  // Fall back to Postgres
-  return transaction(async (client) => {
-    const loadout = await getLoadoutShare(client, shareId);
-    if (loadout) {
-      // Record when this was viewed and increment the view counter. Not using it much for now but I'd like to know.
-      await recordAccess(client, shareId);
-    }
+  const loadout = await getLoadoutShareStately(shareId);
+  if (loadout) {
+    // Record when this was viewed and increment the view counter. Not using it much for now but I'd like to know.
+    await recordAccessStately(shareId);
     return loadout;
-  });
+  }
 }

api/shapes/profile.ts

@@ -13,6 +13,10 @@ export interface ProfileResponse {
   /** Hashes of tracked triumphs */
   triumphs?: number[];
   searches?: Search[];
+
+  syncTokens?: {
+    [key: string]: string;
+  };
 }
 
 /**

api/stately/init/migrate-loadout-shares.ts

@@ -0,0 +1,6 @@
+// import { migrateLoadoutShareChunk } from '../migrator/loadout-shares.js';
+
+// while (true) {
+//   await migrateLoadoutShareChunk();
+//   console.log('Migrated loadout shares');
+// }

api/stately/loadout-share-queries.ts

@@ -1,4 +1,4 @@
-import { keyPath, StatelyError } from '@stately-cloud/client';
+import { keyPath, StatelyError, WithPutOptions } from '@stately-cloud/client';
 import { Loadout } from '../shapes/loadouts.js';
 import { client } from './client.js';
 import { LoadoutShare as StatelyLoadoutShare } from './generated/index.js';
@@ -56,6 +56,28 @@ export async function addLoadoutShare(
   }
 }
 
+/**
+ * Put loadout shares - this is meant for migrations.
+ */
+export async function addLoadoutSharesForMigration(
+  shares: {
+    platformMembershipId: string;
+    shareId: string;
+    loadout: Loadout;
+  }[],
+): Promise<void> {
+  const statelyShares = shares.map(
+    ({ platformMembershipId, shareId, loadout }): WithPutOptions<StatelyLoadoutShare> => ({
+      item: convertLoadoutShareToStately(loadout, platformMembershipId, shareId),
+      // Preserve the original timestamps
+      overwriteMetadataTimestamps: true,
+    }),
+  );
+
+  // We overwrite here - shares are immutable, so this is fine.
+  await client.putBatch(...statelyShares);
+}
+
 /**
  * Touch the last_accessed_at and visits fields to keep track of access.
  */

api/stately/loadouts-queries.ts

@@ -273,6 +273,8 @@ export function convertLoadoutCommonFieldsToStately(
     unequipped: (loadout.unequipped || []).map(convertLoadoutItemToStately),
     notes: loadout.notes,
     parameters: convertLoadoutParametersToStately(loadout.parameters),
+    createdAt: BigInt(loadout.createdAt ?? 0n),
+    lastUpdatedAt: BigInt(loadout.lastUpdatedAt ?? 0n),
   };
 }
 

api/stately/migrator/loadout-shares.ts

@@ -0,0 +1,15 @@
+// import { transaction } from '../../db/index.js';
+// import { deleteLoadoutShares, getLoadoutShares } from '../../db/loadout-share-queries.js';
+// import { addLoadoutSharesForMigration } from '../loadout-share-queries.js';
+
+// export async function migrateLoadoutShareChunk() {
+//   await transaction(async (db) => {
+//     const loadouts = await getLoadoutShares(db, 50);
+//     await Promise.all(loadouts.map((loadout) => addLoadoutSharesForMigration([loadout])));
+//     console.log('Added to stately');
+//     await deleteLoadoutShares(
+//       db,
+//       loadouts.map((loadout) => loadout.shareId),
+//     );
+//   });
+// }

package.json

@@ -70,7 +70,7 @@
     "@google-cloud/profiler": "^6.0.2",
     "@sentry/node": "^7.119.2",
     "@sentry/tracing": "^7.114.0",
-    "@stately-cloud/client": "^0.17.1",
+    "@stately-cloud/client": "^0.19.0",
     "bungie-api-ts": "^5.1.0",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",