type cleanup

Author: stevebux

internal/datastore/src/__test__/letter-queue-repository.test.ts

@@ -7,16 +7,14 @@ import {
   setupDynamoDBContainer,
 } from "./db";
 import LetterQueueRepository from "../letter-queue-repository";
-import { PendingLetterBase } from "../types";
+import { InsertPendingLetter } from "../types";
 import { LetterAlreadyExistsError } from "../letter-already-exists-error";
 import { createTestLogger } from "./logs";
 import { LetterDoesNotExistError } from "../letter-does-not-exist-error";
 
-type PendingLetterWithPriority = PendingLetterBase & { priority: number };
-
 function createLetter(
-  overrides: Partial<PendingLetterWithPriority> = {},
-): PendingLetterWithPriority {
+  overrides: Partial<InsertPendingLetter> = {},
+): InsertPendingLetter {
   return {
     letterId: "letter1",
     supplierId: "supplier1",

internal/datastore/src/letter-queue-repository.ts

@@ -7,7 +7,12 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import { Logger } from "pino";
 import z from "zod";
-import { PendingLetter, PendingLetterBase, PendingLetterSchema } from "./types";
+import {
+  InsertPendingLetter,
+  PendingLetter,
+  PendingLetterBase,
+  PendingLetterSchema,
+} from "./types";
 import { LetterAlreadyExistsError } from "./letter-already-exists-error";
 import { LetterDoesNotExistError } from "./letter-does-not-exist-error";
 
@@ -26,7 +31,7 @@ export default class LetterQueueRepository {
   private readonly defaultPriority = 10;
 
   async putLetter(
-    insertPendingLetter: PendingLetterBase & { priority: number },
+    insertPendingLetter: InsertPendingLetter,
   ): Promise<PendingLetter> {
     // needs to be an ISO timestamp as Db sorts alphabetically
     const now = new Date().toISOString();

internal/datastore/src/types.ts

@@ -99,6 +99,7 @@ export const PendingLetterSchemaBase = z.object({
 
 export type PendingLetter = z.infer<typeof PendingLetterSchema>;
 export type PendingLetterBase = z.infer<typeof PendingLetterSchemaBase>;
+export type InsertPendingLetter = PendingLetterBase & { priority?: number };
 
 export const MISchemaBase = z.object({
   id: z.string(),

lambdas/update-letter-queue/src/update-letter-queue.ts

@@ -8,11 +8,11 @@ import { unmarshall } from "@aws-sdk/util-dynamodb";
 import { Unit } from "aws-embedded-metrics";
 import { buildEMFObject } from "@internal/helpers";
 import {
+  InsertPendingLetter,
   Letter,
   LetterAlreadyExistsError,
   LetterDoesNotExistError,
   LetterSchema,
-  PendingLetterBase,
 } from "@internal/datastore";
 import { Deps } from "./deps";
 
@@ -184,9 +184,7 @@ function extractNewOrUpdatedLetter(record: DynamoDBRecord): Letter {
   return LetterSchema.parse(unmarshall(newImage as any));
 }
 
-function mapLetterToPendingLetter(
-  letter: Letter,
-): PendingLetterBase & { priority?: number } {
+function mapLetterToPendingLetter(letter: Letter): InsertPendingLetter {
   return {
     supplierId: letter.supplierId,
     letterId: letter.id,