Move top level modules into utils

_templates/new-lambda/api-gateway/jest.config.ejs.t

@@ -11,6 +11,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/alarms-handler/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/alarms-handler/src/alarmMappings.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 
 type Team = 'VALUE' | 'GROWTH' | 'PORTFOLIO' | 'PLATFORM' | 'SRE';
 

handlers/alarms-handler/src/cloudwatch.ts

@@ -4,7 +4,7 @@ import {
 } from '@aws-sdk/client-cloudwatch';
 import type { Tag } from '@aws-sdk/client-cloudwatch';
 import { fromTemporaryCredentials } from '@aws-sdk/credential-providers';
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 
 const buildCrossAccountCloudwatchClient = (roleArn: string) => {
 	const credentials = fromTemporaryCredentials({

handlers/discount-api/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/discount-api/src/discountEndpoint.ts

@@ -1,8 +1,8 @@
-import { sum } from '@modules/arrayFunctions';
-import { ValidationError } from '@modules/errors';
-import { Lazy } from '@modules/lazy';
-import { getIfDefined } from '@modules/nullAndUndefined';
-import type { Stage } from '@modules/stage';
+import { sum } from '@modules/utils/arrayFunctions';
+import { ValidationError } from '@modules/utils/errors';
+import { Lazy } from '@modules/utils/lazy';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import type { Stage } from '@modules/utils/stage';
 import { addDiscount, previewDiscount } from '@modules/zuora/addDiscount';
 import {
 	billingPreviewToSimpleInvoiceItems,

handlers/discount-api/src/eligibilityChecker.ts

@@ -1,5 +1,5 @@
-import { ValidationError } from '@modules/errors';
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { ValidationError } from '@modules/utils/errors';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import type { SimpleInvoiceItem } from '@modules/zuora/billingPreview';
 import { getNextInvoiceTotal } from '@modules/zuora/billingPreview';
 import type { Logger } from '@modules/zuora/logger';

handlers/discount-api/src/index.ts

@@ -1,7 +1,7 @@
 import { sendEmail } from '@modules/email/email';
-import { ValidationError } from '@modules/errors';
-import { getIfDefined } from '@modules/nullAndUndefined';
-import type { Stage } from '@modules/stage';
+import { ValidationError } from '@modules/utils/errors';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import type { Stage } from '@modules/utils/stage';
 import { Logger } from '@modules/zuora/logger';
 import type {
 	APIGatewayProxyEvent,

handlers/discount-api/src/productToDiscountMapping.ts

@@ -1,8 +1,8 @@
-import { getSingleOrThrow } from '@modules/arrayFunctions';
 import type { DataExtensionName } from '@modules/email/email';
 import { DataExtensionNames } from '@modules/email/email';
-import { ValidationError } from '@modules/errors';
-import type { Stage } from '@modules/stage';
+import { getSingleOrThrow } from '@modules/utils/arrayFunctions';
+import { ValidationError } from '@modules/utils/errors';
+import type { Stage } from '@modules/utils/stage';
 import { isNotRemovedOrDiscount } from '@modules/zuora/rateplan';
 import type { ZuoraSubscription } from '@modules/zuora/zuoraSchemas';
 

handlers/discount-api/test/addDiscountIntegration.test.ts

@@ -4,7 +4,7 @@
  * @group integration
  */
 
-import type { Stage } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
 import { addDiscount } from '@modules/zuora/addDiscount';
 import { getSubscription } from '@modules/zuora/getSubscription';
 import { ZuoraClient } from '@modules/zuora/zuoraClient';

handlers/discount-api/test/applyDiscountIntegration.test.ts

@@ -2,7 +2,7 @@
  * @group integration
  */
 import type { EmailMessageWithUserId } from '@modules/email/email';
-import type { Stage } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
 import { cancelSubscription } from '@modules/zuora/cancelSubscription';
 import { zuoraDateFormat } from '@modules/zuora/common';
 import { Logger } from '@modules/zuora/logger';

handlers/discount-api/test/helpers.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import type { ZuoraClient } from '@modules/zuora/zuoraClient';
 import type {
 	ZuoraSubscribeResponse,

handlers/discount-api/test/previewDiscountIntegration.test.ts

@@ -1,7 +1,7 @@
 /**
  * @group integration
  */
-import type { Stage } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
 import { cancelSubscription } from '@modules/zuora/cancelSubscription';
 import { zuoraDateFormat } from '@modules/zuora/common';
 import { Logger } from '@modules/zuora/logger';

handlers/generate-product-catalog/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/generate-product-catalog/src/index.ts

@@ -1,8 +1,8 @@
 import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { awsConfig } from '@modules/aws/config';
 import { generateProductCatalog } from '@modules/product-catalog/generateProductCatalog';
-import type { Stage } from '@modules/stage';
-import { stageFromEnvironment } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
+import { stageFromEnvironment } from '@modules/utils/stage';
 import { getZuoraCatalogFromS3 } from '@modules/zuora-catalog/S3';
 import type { Handler, S3CreateEvent } from 'aws-lambda';
 

handlers/press-reader-entitlements/jest.config.js

@@ -5,7 +5,6 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };
 process.env = Object.assign(process.env, {

handlers/press-reader-entitlements/src/identity.ts

@@ -1,9 +1,9 @@
 import { GetParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
 import { awsConfig } from '@modules/aws/config';
-import { ValidationError } from '@modules/errors';
+import { ValidationError } from '@modules/utils/errors';
 import type { IdentityUserDetails } from '@modules/identity/identity';
-import { getIfDefined } from '@modules/nullAndUndefined';
-import type { Stage } from '@modules/stage';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import type { Stage } from '@modules/utils/stage';
 import { getUserDetailsSchema } from './schemas';
 
 export const getClientAccessToken = async (stage: Stage) => {

handlers/press-reader-entitlements/src/index.ts

@@ -1,11 +1,11 @@
-import { Lazy } from '@modules/lazy';
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { Lazy } from '@modules/utils/lazy';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import { userHasGuardianEmail } from '@modules/product-benefits/userBenefits';
 import { getProductCatalogFromApi } from '@modules/product-catalog/api';
 import { Router } from '@modules/routing/router';
-import type { Stage } from '@modules/stage';
-import { stageFromEnvironment } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
+import { stageFromEnvironment } from '@modules/utils/stage';
 import type { SupporterRatePlanItem } from '@modules/supporter-product-data/supporterProductData';
 import type {
 	APIGatewayProxyEvent,
 	APIGatewayProxyResult,

handlers/press-reader-entitlements/src/supporterProductData.ts

@@ -1,10 +1,10 @@
-import { sortBy } from '@modules/arrayFunctions';
+import { sortBy } from '@modules/utils/arrayFunctions';
 import type {
 	ProductCatalog,
 	ProductKey,
 } from '@modules/product-catalog/productCatalog';
 import { ProductCatalogHelper } from '@modules/product-catalog/productCatalog';
-import type { Stage } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
 import type { SupporterRatePlanItem } from '@modules/supporter-product-data/supporterProductData';
 import { getSupporterProductData } from '@modules/supporter-product-data/supporterProductData';
 

handlers/product-switch-api/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/product-switch-api/src/catalogInformation.ts

@@ -1,7 +1,7 @@
-import type { BillingPeriod } from '@modules/billingPeriod';
+import type { BillingPeriod } from '@modules/utils/billingPeriod';
 import type { Currency } from '@modules/internationalisation/currency';
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import type { ProductCatalog } from '@modules/product-catalog/productCatalog';
 
 export type CatalogInformation = {
 	supporterPlus: {

handlers/product-switch-api/src/contributionToSupporterPlus.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import { zuoraDateFormat } from '@modules/zuora/common';
 import type {
 	ChangePlanOrderAction,

handlers/product-switch-api/src/index.ts

@@ -1,6 +1,6 @@
-import { ValidationError } from '@modules/errors';
-import { getIfDefined } from '@modules/nullAndUndefined';
-import type { Stage } from '@modules/stage';
+import { ValidationError } from '@modules/utils/errors';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import type { Stage } from '@modules/utils/stage';
 import type {
 	APIGatewayProxyEvent,
 	APIGatewayProxyResult,

handlers/product-switch-api/src/payment.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import {
 	creditInvoice,
 	getInvoice,

handlers/product-switch-api/src/productSwitchEmail.ts

@@ -1,4 +1,4 @@
-import type { BillingPeriod } from '@modules/billingPeriod';
+import type { BillingPeriod } from '@modules/utils/billingPeriod';
 import type { EmailMessageWithUserId } from '@modules/email/email';
 import { DataExtensionNames, sendEmail } from '@modules/email/email';
 import type { Currency } from '@modules/internationalisation/currency';

handlers/product-switch-api/src/productSwitchEndpoint.ts

@@ -1,7 +1,7 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
-import { prettyPrint } from '@modules/prettyPrint';
 import { getProductCatalogFromApi } from '@modules/product-catalog/api';
-import type { Stage } from '@modules/stage';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import { prettyPrint } from '@modules/utils/prettyPrint';
+import type { Stage } from '@modules/utils/stage';
 import { getAccount } from '@modules/zuora/getAccount';
 import { getSubscription } from '@modules/zuora/getSubscription';
 import { ZuoraClient } from '@modules/zuora/zuoraClient';

handlers/product-switch-api/src/salesforceTracking.ts

@@ -1,6 +1,6 @@
 import { SendMessageCommand, SQSClient } from '@aws-sdk/client-sqs';
 import { awsConfig } from '@modules/aws/config';
-import { prettyPrint } from '@modules/prettyPrint';
+import { prettyPrint } from '@modules/utils/prettyPrint';
 import type { SwitchInformation } from './switchInformation';
 
 export type SalesforceTrackingInput = {

handlers/product-switch-api/src/supporterProductData.ts

@@ -1,6 +1,6 @@
 import { SendMessageCommand, SQSClient } from '@aws-sdk/client-sqs';
 import { awsConfig } from '@modules/aws/config';
-import { prettyPrint } from '@modules/prettyPrint';
+import { prettyPrint } from '@modules/utils/prettyPrint';
 import { zuoraDateFormat } from '@modules/zuora/common';
 import dayjs from 'dayjs';
 import type { SwitchInformation } from './switchInformation';

handlers/product-switch-api/src/switchInformation.ts

@@ -1,11 +1,11 @@
-import type { BillingPeriod } from '@modules/billingPeriod';
-import { ValidationError } from '@modules/errors';
+import type { BillingPeriod } from '@modules/utils/billingPeriod';
+import { ValidationError } from '@modules/utils/errors';
 import type { Currency } from '@modules/internationalisation/currency';
 import { isSupportedCurrency } from '@modules/internationalisation/currency';
-import { getIfDefined } from '@modules/nullAndUndefined';
-import { prettyPrint } from '@modules/prettyPrint';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import { prettyPrint } from '@modules/utils/prettyPrint';
 import type { ProductCatalog } from '@modules/product-catalog/productCatalog';
-import type { Stage } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
 import type {
 	RatePlan,
 	ZuoraAccount,

handlers/product-switch-api/src/urlParsing.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 
 const regex =
 	/\/product-move\/(recurring-contribution-to-supporter-plus)\/(A-S\d+)/;

handlers/product-switch-api/test/contributionToSupporterPlus.test.ts

@@ -3,7 +3,7 @@
  *
  */
 import type { EmailMessageWithUserId } from '@modules/email/email';
-import { ValidationError } from '@modules/errors';
+import { ValidationError } from '@modules/utils/errors';
 import { generateProductCatalog } from '@modules/product-catalog/generateProductCatalog';
 import type { ProductCatalog } from '@modules/product-catalog/productCatalog';
 import type { ZuoraSubscription } from '@modules/zuora/zuoraSchemas';

handlers/salesforce-disaster-recovery-health-check/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/salesforce-disaster-recovery-health-check/src/handlers/salesforceDisasterRecoveryHealthCheck.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import { publishSnsMessage } from '../services/sns';
 import { describeExecution, startExecution } from '../services/step-functions';
 

handlers/salesforce-disaster-recovery/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/salesforce-disaster-recovery/src/handlers/saveFailedRowsToS3.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import {
 	type AccountRowWithResult,
 	convertArrayToCsv,

handlers/salesforce-disaster-recovery/src/handlers/saveSalesforceQueryResultToS3.ts

@@ -1,4 +1,4 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import {
 	generateSalesforceAccessToken,
 	getSalesforceQueryResult,

handlers/salesforce-disaster-recovery/src/handlers/updateZuoraAccounts.ts

@@ -1,5 +1,5 @@
-import { getIfDefined } from '@modules/nullAndUndefined';
-import { type Stage } from '@modules/stage';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
+import { type Stage } from '@modules/utils/stage';
 import { ZuoraClient } from '@modules/zuora/zuoraClient';
 import {
 	type AccountRow,

handlers/ticket-tailor-webhook/jest.config.js

@@ -4,7 +4,6 @@ module.exports = {
 	testEnvironment: 'node',
 	runner: 'groups',
 	moduleNameMapper: {
-		'@modules/(.*)/src/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
+		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
 	},
 };

handlers/ticket-tailor-webhook/src/idapiService.ts

@@ -1,5 +1,5 @@
-import { getSecretValue } from '@modules/secrets-manager/src/getSecret';
-import { stageFromEnvironment } from '@modules/stage';
+import { getSecretValue } from '@modules/secrets-manager/getSecret';
+import { stageFromEnvironment } from '@modules/utils/stage';
 import { z } from 'zod';
 
 export type IdApiToken = {

handlers/ticket-tailor-webhook/src/validateRequest.ts

@@ -1,6 +1,6 @@
 import { createHmac, timingSafeEqual } from 'crypto';
-import { getSecretValue } from '@modules/secrets-manager/src/getSecret';
-import { stageFromEnvironment } from '@modules/stage';
+import { getSecretValue } from '@modules/secrets-manager/getSecret';
+import { stageFromEnvironment } from '@modules/utils/stage';
 import type { SQSRecord } from 'aws-lambda';
 
 export type HmacKey = {

handlers/ticket-tailor-webhook/test/index.test.ts

@@ -15,7 +15,7 @@ const mockKey: HmacKey = {
 	secret: '9dn189d53me1ania7d73a45d5de4674d',
 };
 
-jest.mock('@modules/secrets-manager/src/getSecret', () => ({
+jest.mock('@modules/secrets-manager/getSecret', () => ({
 	getSecretValue: () => mockKey,
 }));
 

handlers/ticket-tailor-webhook/test/validateRequest.test.ts

@@ -17,14 +17,14 @@ const mockKey: HmacKey = {
 	secret: '9dn189d53me1ania7d73a45d5de4674d',
 };
 
-jest.mock('@modules/secrets-manager/src/getSecret', () => ({
+jest.mock('@modules/secrets-manager/getSecret', () => ({
 	getSecretValue: () => mockKey,
 }));
 
 beforeEach(() => {
 	process.env.Stage = 'CODE';
 	jest.resetAllMocks();
-	jest.mock('@modules/secrets-manager/src/getSecret', () => ({
+	jest.mock('@modules/secrets-manager/getSecret', () => ({
 		getSecretValue: () => mockKey,
 	}));
 });

handlers/update-supporter-plus-amount/jest.config.js

@@ -5,6 +5,5 @@ module.exports = {
 	runner: 'groups',
 	moduleNameMapper: {
 		'@modules/(.*)/(.*)$': '<rootDir>/../../modules/$1/src/$2',
-		'@modules/(.*)$': '<rootDir>/../../modules/$1',
 	},
 };

handlers/update-supporter-plus-amount/src/index.ts

@@ -1,8 +1,8 @@
 import { sendEmail } from '@modules/email/email';
-import { ValidationError } from '@modules/errors';
-import { getIfDefined } from '@modules/nullAndUndefined';
+import { ValidationError } from '@modules/utils/errors';
+import { getIfDefined } from '@modules/utils/nullAndUndefined';
 import { getProductCatalogFromApi } from '@modules/product-catalog/api';
-import type { Stage } from '@modules/stage';
+import type { Stage } from '@modules/utils/stage';
 import { Logger } from '@modules/zuora/logger';
 import { ZuoraClient } from '@modules/zuora/zuoraClient';
 import type {