Merge pull request #259 from DestinyItemManager/preserve-time

Preserve timestamps

Author: bhollis

api/routes/import.ts

@@ -231,16 +231,22 @@ export async function statelyImport(
   triumphs: ExportResponse['triumphs'],
   searches: ExportResponse['searches'],
   itemHashTags: ItemHashTag[],
+  deleteExisting = true,
 ): Promise<number> {
   // TODO: what we should do, is map all these to items, and then we can just do
   // batch puts, 25 at a time.
 
   let numTriumphs = 0;
-  await deleteAllDataForUser(bungieMembershipId, platformMembershipIds);
+  if (deleteExisting) {
+    await deleteAllDataForUser(bungieMembershipId, platformMembershipIds);
+  }
+
+  const settingsItem = convertToStatelyItem(
+    { ...defaultSettings, ...settings },
+    bungieMembershipId,
+  );
 
-  const items: AnyItem[] = [
-    convertToStatelyItem({ ...defaultSettings, ...settings }, bungieMembershipId),
-  ];
+  const items: AnyItem[] = [];
   items.push(...importLoadouts(loadouts));
   items.push(...importTags(itemAnnotations));
   for (const platformMembershipId of platformMembershipIds) {
@@ -262,9 +268,17 @@ export async function statelyImport(
     items.push(...importSearches(platformMembershipId, searches));
   }
 
+  // Put the settings in first since it's in a different group
+  await client.put({
+    item: settingsItem,
+    mustNotExist: true,
+  });
   // OK now put them in as fast as we can
   for (const batch of batches(items)) {
-    await client.putBatch(...batch);
+    // We shouldn't have any existing items...
+    await client.putBatch(
+      ...batch.map((item) => ({ item, mustNotExist: true, overwriteMetadataTimestamps: true })),
+    );
     await delay(100); // give it some time to flush
   }
 

api/routes/loadout-share.ts

@@ -54,7 +54,7 @@ export const loadoutShareHandler = asyncHandler(async (req, res) => {
     });
   }
 
-  const validationResult = validateLoadout('loadout_share', loadout, appId);
+  const validationResult = validateLoadout('loadout_share', loadout);
   if (validationResult) {
     res.status(400).send(validationResult);
     return;

api/routes/update.ts

@@ -154,6 +154,7 @@ export const updateHandler = asyncHandler(async (req, res) => {
       triumphs,
       searches,
       itemHashTags,
+      !migrationState.lastError,
     );
   };
 
@@ -232,7 +233,7 @@ function validateUpdates(
         break;
 
       case 'loadout':
-        result = validateUpdateLoadout(update.payload, appId);
+        result = validateUpdateLoadout(update.payload);
         break;
 
       case 'tag':
@@ -514,11 +515,11 @@ async function updateLoadout(
   metrics.timing('update.loadout', start);
 }
 
-function validateUpdateLoadout(loadout: Loadout, appId: string): ProfileUpdateResult {
-  return validateLoadout('update', loadout, appId) ?? { status: 'Success' };
+function validateUpdateLoadout(loadout: Loadout): ProfileUpdateResult {
+  return validateLoadout('update', loadout) ?? { status: 'Success' };
 }
 
-export function validateLoadout(metricPrefix: string, loadout: Loadout, appId: string) {
+export function validateLoadout(metricPrefix: string, loadout: Loadout) {
   if (!loadout.name) {
     metrics.increment(`${metricPrefix}.validation.loadoutNameMissing.count`);
     return {