Sort out state shape

support-workers/src/typescript/lambdas/createPaymentMethodLambda.ts

@@ -3,29 +3,30 @@ import type {
 	DirectDebitPaymentFields,
 	PaymentFields,
 	PayPalPaymentFields,
-	// SepaPaymentFields,
 	StripePaymentFields,
 } from '../model/paymentFields';
 import type {
 	DirectDebitPaymentMethod,
 	PaymentMethod,
 	PayPalPaymentMethod,
-	// SepaPaymentMethod,
 	StripePaymentMethod,
 } from '../model/paymentMethod';
-import type { Stage } from '../model/stage';
+import { stageFromEnvironment } from '../model/stage';
 import type {
 	CreatePaymentMethodState,
 	CreateSalesforceContactState,
 	User,
 } from '../model/stateSchemas';
-import { createPaymentMethodStateSchema } from '../model/stateSchemas';
+import {
+	createPaymentMethodStateSchema,
+	wrapperSchemaForState,
+} from '../model/stateSchemas';
 import { ServiceHandler } from '../services/config';
 import { getPayPalConfig, PayPalService } from '../services/payPal';
 import { getStripeConfig, StripeService } from '../services/stripe';
 import { getIfDefined } from '../util/nullAndUndefined';
 
-const stage = process.env.stage as Stage;
+const stage = stageFromEnvironment();
 const stripeServiceHandler = new ServiceHandler(stage, async (stage) => {
 	const config = await getStripeConfig(stage);
 	return new StripeService(config);
@@ -35,11 +36,11 @@ const paypalServiceHandler = new ServiceHandler(stage, async (stage) => {
 	return new PayPalService(config);
 });
 
-export const handler = async (
-	state: unknown,
-): Promise<CreateSalesforceContactState> => {
+export const handler = async (state: unknown) => {
 	console.log(`Input is ${JSON.stringify(state)}`);
-	const createPaymentMethodState = createPaymentMethodStateSchema.parse(state);
+	const createPaymentMethodState = wrapperSchemaForState(
+		createPaymentMethodStateSchema,
+	).parse(state).state;
 	return createSalesforceContactState(
 		createPaymentMethodState,
 		await createPaymentMethod(
@@ -71,13 +72,17 @@ export function createPaymentMethod(
 }
 
 export function createSalesforceContactState(
-	state: CreatePaymentMethodState,
+	inputState: CreatePaymentMethodState,
 	paymentMethod: PaymentMethod,
-): CreateSalesforceContactState {
-	return {
-		...state,
+) {
+	const outputState: CreateSalesforceContactState = {
+		...inputState,
 		paymentMethod,
 	};
+
+	return {
+		state: outputState,
+	};
 }
 
 export async function createStripePaymentMethod(

support-workers/src/typescript/model/stage.ts

@@ -1 +1,9 @@
 export type Stage = 'CODE' | 'PROD';
+
+export const stageFromEnvironment = (): Stage => {
+	const stage = process.env.STAGE;
+	if (stage === undefined) {
+		throw new Error('STAGE is not defined as an environment variable');
+	}
+	return stage as Stage;
+};

support-workers/src/typescript/model/stateSchemas.ts

@@ -110,3 +110,11 @@ export const createSalesforceContactStateSchema = baseStateSchema.merge(
 export type CreateSalesforceContactState = z.infer<
 	typeof createSalesforceContactStateSchema
 >;
+
+export function wrapperSchemaForState<SchemaType extends z.ZodTypeAny>(
+	stateSchema: SchemaType,
+) {
+	return z.object({
+		state: stateSchema,
+	});
+}