@remit/account-worker 0.0.35 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/account-worker",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/cascade-enumerate.test.ts

@@ -17,11 +17,10 @@ const messageWithChildren = {
 	bodyPart: [{ bodyPartId: "bp-1" }],
 	bodyPartParameter: [{ bodyPartParameterId: "bpp-1" }],
 	rawMessageStorage: [{ rawStorageId: "rms-1" }],
-	bodyPartStorage: [{ bodyPartStorageId: "bps-1" }],
 } as unknown as MessageDescription;
 
 describe("collectMessageChildEntities", () => {
-	it("expands the eight child entities of one message", () => {
+	it("expands the seven child entities of one message", () => {
 		const entities: CascadeEntity[] = [];
 		collectMessageChildEntities(entities, messageWithChildren);
 
@@ -34,7 +33,6 @@ describe("collectMessageChildEntities", () => {
 			"BodyPart",
 			"BodyPartParameter",
 			"RawMessageStorage",
-			"BodyPartStorage",
 		]);
 	});
 
@@ -48,7 +46,6 @@ describe("collectMessageChildEntities", () => {
 			bodyPart: [],
 			bodyPartParameter: [],
 			rawMessageStorage: [],
-			bodyPartStorage: [],
 		} as unknown as MessageDescription);
 		assert.equal(entities.length, 0);
 	});

package/src/cascade.ts

@@ -94,13 +94,6 @@ export interface CascadeResult {
 	messageIds: string[];
 }
 
-/**
- * Expand one message's 9 child entities (flags, envelope, addresses, body
- * parts, references, raw/body storage) into the cascade plan. The Message row
- * itself is pushed by the caller — this only collects the children that a
- * `describe()` reveals. Shared by the tenant cascade enumerator and the
- * per-account purge worker.
- */
 export const collectMessageChildEntities = (
 	entities: CascadeEntity[],
 	messageData: MessageDescription,
@@ -147,12 +140,6 @@ export const collectMessageChildEntities = (
 			key: { rawStorageId: rms.rawStorageId },
 		});
 	}
-	for (const bps of messageData.bodyPartStorage) {
-		entities.push({
-			entityType: "BodyPartStorage",
-			key: { bodyPartStorageId: bps.bodyPartStorageId },
-		});
-	}
 };
 
 export const enumerateCascadeEntities = async (
@@ -203,63 +190,10 @@ export const enumerateCascadeEntities = async (
 					key: { messageId: message.messageId },
 				});
 
-				const messageData = await messageService.describe(message.messageId);
-
-				for (const flag of messageData.messageFlag) {
-					entities.push({
-						entityType: "MessageFlag",
-						key: { messageFlagId: flag.messageFlagId },
-					});
-				}
-
-				for (const envelope of messageData.envelope) {
-					entities.push({
-						entityType: "Envelope",
-						key: { envelopeId: envelope.envelopeId },
-					});
-				}
-
-				for (const ref of messageData.messageReference) {
-					entities.push({
-						entityType: "MessageReference",
-						key: { messageReferenceId: ref.messageReferenceId },
-					});
-				}
-
-				for (const addr of messageData.envelopeAddress) {
-					entities.push({
-						entityType: "EnvelopeAddress",
-						key: { envelopeAddressId: addr.envelopeAddressId },
-					});
-				}
-
-				for (const bp of messageData.bodyPart) {
-					entities.push({
-						entityType: "BodyPart",
-						key: { bodyPartId: bp.bodyPartId },
-					});
-				}
-
-				for (const bpp of messageData.bodyPartParameter) {
-					entities.push({
-						entityType: "BodyPartParameter",
-						key: { bodyPartParameterId: bpp.bodyPartParameterId },
-					});
-				}
-
-				for (const rms of messageData.rawMessageStorage) {
-					entities.push({
-						entityType: "RawMessageStorage",
-						key: { rawStorageId: rms.rawStorageId },
-					});
-				}
-
-				for (const bps of messageData.bodyPartStorage) {
-					entities.push({
-						entityType: "BodyPartStorage",
-						key: { bodyPartStorageId: bps.bodyPartStorageId },
-					});
-				}
+				collectMessageChildEntities(
+					entities,
+					await messageService.describe(message.messageId),
+				);
 			}
 		}
 

package/src/events.ts

@@ -28,7 +28,7 @@ export type AccountDataPurgeSubtreeItem = {
  * S3-delete, CloudFront, and DDB batch-write grants.
  *
  * - `subtrees`: delete each `{ threadMessageId, messageId }` subtree (the
- *   Message, its 9 child entities, and the manifest row). Idempotent.
+ *   Message, its child entities, and the manifest row). Idempotent.
  * - `container`: the last message — delete the account-keyed container rows
  *   (mailboxes, outbox, locks), the S3 prefix, and the CloudFront cache. The
  *   tenant-shared Address is never deleted.

package/src/handlers/account-purge-finalize.test.ts

@@ -17,7 +17,6 @@ const messageDescription = {
 	bodyPart: [],
 	bodyPartParameter: [],
 	rawMessageStorage: [],
-	bodyPartStorage: [],
 };
 
 const fakeClient = (accountGone = false): RemitClient =>

package/src/handlers/account-purge-finalize.ts

@@ -37,7 +37,7 @@ export const processAccountDataPurgeFinalize = async (
 /**
  * Delete a batch of message subtrees. For each `{ threadMessageId, messageId }`
  * the manifest row is deleted UNCONDITIONALLY — there are ghost ThreadMessages
- * whose Message is already gone — and the Message + its 9 child entities are
+ * whose Message is already gone — and the Message + its child entities are
  * deleted only when `describe()` resolves. A `describe()` 404 means the subtree
  * is already gone: skip the children, still drop the manifest row.
  */