Merge pull request #274 from DestinyItemManager/tag-delete

Fix tag deleting

Author: bhollis

api/routes/update.ts

@@ -185,10 +185,6 @@ function validateUpdates(
   return results;
 }
 
-// TODO: For ease of porting, I made each update a separate transaction. But it
-// would be more efficient to batch them all into one transaction. That said,
-// aside from bulk-tagging, it's most likely that only one update will be sent
-// at a time.
 async function statelyUpdate(
   updates: ProfileUpdate[],
   bungieMembershipId: number,

api/stately/item-annotations-queries.test.ts

@@ -79,6 +79,24 @@ it('can update tags clearing value', async () => {
   });
 });
 
+it('can create tags while passing null notes', async () => {
+  await client.transaction(async (txn) => {
+    await updateItemAnnotation(txn, platformMembershipId, 2, [
+      {
+        id: '123456',
+        tag: 'favorite',
+        notes: null,
+      },
+    ]);
+  });
+
+  const annotations = (await getItemAnnotationsForProfile(platformMembershipId, 2)).tags;
+  expect(annotations[0]).toEqual({
+    id: '123456',
+    tag: 'favorite',
+  });
+});
+
 it('can delete tags', async () => {
   await client.transaction(async (txn) => {
     await updateItemAnnotation(txn, platformMembershipId, 2, [

api/stately/item-annotations-queries.ts

@@ -105,15 +105,6 @@ export async function updateItemAnnotation(
         destinyVersion,
       });
 
-    if (
-      (tagValue === 'clear' && !ia.notes) ||
-      (notesValue === 'clear' && !ia.tag) ||
-      (tagValue === 'clear' && notesValue === 'clear')
-    ) {
-      itemsToDelete.push(keyFor(platformMembershipId, destinyVersion, itemAnnotation.id));
-      continue;
-    }
-
     if (tagValue === 'clear') {
       ia.tag = StatelyTagValue.TagValue_UNSPECIFIED;
     } else if (tagValue !== null) {
@@ -130,7 +121,12 @@ export async function updateItemAnnotation(
       ia.craftedDate = BigInt(itemAnnotation.craftedDate * 1000);
     }
 
-    itemsToPut.push(ia);
+    // If we're updating them both to nothing, delete the annotation
+    if (!ia.notes && !ia.tag) {
+      itemsToDelete.push(keyFor(platformMembershipId, destinyVersion, itemAnnotation.id));
+    } else {
+      itemsToPut.push(ia);
+    }
   }
 
   if (itemsToDelete.length) {