@remit/drizzle-service 0.0.58 → 0.0.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/i4-address.test.ts

@@ -148,7 +148,6 @@ describe("AddressRepo", () => {
 		});
 
 		const ea = await repo.createEnvelopeAddress({
-			envelopeAddressId: envId,
 			messageId,
 			addressId,
 			normalizedEmail: "test@example.com",
@@ -170,7 +169,6 @@ describe("AddressRepo", () => {
 	test("upsertEnvelopeAddress is idempotent", async () => {
 		const messageId = randomUUID();
 		const input = {
-			envelopeAddressId: envelopeAddressId(messageId, "to", 1),
 			messageId,
 			addressId: randomUUID(),
 			normalizedEmail: "x@example.com",
@@ -179,15 +177,18 @@ describe("AddressRepo", () => {
 		};
 		const first = await repo.upsertEnvelopeAddress(input);
 		const second = await repo.upsertEnvelopeAddress(input);
-		assert.equal(first.envelopeAddressId, second.envelopeAddressId);
+		assert.equal(
+			first.envelopeAddressId,
+			envelopeAddressId(messageId, "to", 1),
+		);
+		assert.equal(second.envelopeAddressId, first.envelopeAddressId);
 
-		await repo.deleteEnvelopeAddress(input.envelopeAddressId);
+		await repo.deleteEnvelopeAddress(first.envelopeAddressId);
 	});
 
 	test("deleteManyEnvelopeAddresses removes in batch", async () => {
 		const messageId = randomUUID();
 		const ea1 = {
-			envelopeAddressId: envelopeAddressId(messageId, "from", 0),
 			messageId,
 			addressId: randomUUID(),
 			normalizedEmail: "a@x.com",
@@ -196,22 +197,21 @@ describe("AddressRepo", () => {
 		};
 		const ea2 = {
 			...ea1,
-			envelopeAddressId: envelopeAddressId(messageId, "to", 1),
 			addressRole: "to" as const,
 			addressOrder: 1,
 		};
 
-		await repo.createEnvelopeAddress(ea1);
-		await repo.createEnvelopeAddress(ea2);
+		const created1 = await repo.createEnvelopeAddress(ea1);
+		const created2 = await repo.createEnvelopeAddress(ea2);
 
 		await repo.deleteManyEnvelopeAddresses([
-			ea1.envelopeAddressId,
-			ea2.envelopeAddressId,
+			created1.envelopeAddressId,
+			created2.envelopeAddressId,
 		]);
 
 		const results = await repo.getEnvelopeAddress([
-			ea1.envelopeAddressId,
-			ea2.envelopeAddressId,
+			created1.envelopeAddressId,
+			created2.envelopeAddressId,
 		]);
 		assert.equal(results.length, 0);
 	});

package/src/repos/i4-address.ts

@@ -23,7 +23,7 @@ import {
 } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
-import { envelopeAddressId as deriveEnvelopeAddressId } from "../id.js";
+import { envelopeAddressId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import {
 	JUNK_ONLY_FLAG,
@@ -744,15 +744,14 @@ export class AddressRepo implements IAddressRepository {
 		input: CreateEnvelopeAddressInput,
 	): Promise<EnvelopeAddressItem> {
 		const now = Date.now();
-		const envelopeAddressId = deriveEnvelopeAddressId(
-			input.messageId,
-			input.addressRole,
-			input.addressOrder,
-		);
 		const [row] = await this.db
 			.insert(envelopeAddressTable)
 			.values({
-				envelopeAddressId,
+				envelopeAddressId: envelopeAddressId(
+					input.messageId,
+					input.addressRole,
+					input.addressOrder,
+				),
 				messageId: input.messageId,
 				addressId: input.addressId,
 				displayName: input.displayName,
@@ -770,7 +769,7 @@ export class AddressRepo implements IAddressRepository {
 		input: CreateEnvelopeAddressInput,
 	): Promise<EnvelopeAddressItem> {
 		const now = Date.now();
-		const envelopeAddressId = deriveEnvelopeAddressId(
+		const rowId = envelopeAddressId(
 			input.messageId,
 			input.addressRole,
 			input.addressOrder,
@@ -778,7 +777,7 @@ export class AddressRepo implements IAddressRepository {
 		const [row] = await this.db
 			.insert(envelopeAddressTable)
 			.values({
-				envelopeAddressId,
+				envelopeAddressId: rowId,
 				messageId: input.messageId,
 				addressId: input.addressId,
 				displayName: input.displayName,
@@ -791,7 +790,7 @@ export class AddressRepo implements IAddressRepository {
 			.onConflictDoNothing()
 			.returning();
 		if (!row) {
-			return this.getEnvelopeAddress(envelopeAddressId);
+			return this.getEnvelopeAddress(rowId);
 		}
 		return rowToEnvelopeAddress(row);
 	}