Merge branch 'main' into feature/CCM-11474_message-plan-name-screen

Author: harrim91

frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap

@@ -1,24 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignId field when campaignIds is not available 1`] = `
-<LetterTemplateForm
-  campaignIds={
-    [
-      "campaign-id",
-    ]
-  }
-  initialState={
-    {
-      "campaignId": "campaign-id",
-      "language": "en",
-      "letterType": "x0",
-      "name": "",
-      "templateType": "LETTER",
-    }
-  }
-/>
-`;
-
 exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignIds field when available 1`] = `
 <LetterTemplateForm
   campaignIds={

frontend/src/__tests__/app/upload-letter-template/page.test.tsx

@@ -23,20 +23,6 @@ describe('UploadLetterTemplatePage', () => {
   it('should render UploadLetterTemplatePage with campaignIds field when available', async () => {
     mockFetchClient.mockResolvedValueOnce({
       campaignIds: ['campaign-id', 'other-campaign-id'],
-      campaignId: 'campaign-id',
-      features: {},
-    });
-
-    const page = await UploadLetterTemplatePage();
-
-    expect(await generateMetadata()).toEqual({ title: pageTitle });
-    expect(page).toMatchSnapshot();
-  });
-
-  it('should render UploadLetterTemplatePage with campaignId field when campaignIds is not available', async () => {
-    mockFetchClient.mockResolvedValueOnce({
-      campaignIds: undefined,
-      campaignId: 'campaign-id',
       features: {},
     });
 
@@ -64,7 +50,6 @@ describe('UploadLetterTemplatePage', () => {
 
     mockFetchClient.mockResolvedValueOnce({
       campaignIds: [],
-      campaignId: 'campaign-id',
       features: {},
     });
 
@@ -76,12 +61,11 @@ describe('UploadLetterTemplatePage', () => {
     );
   });
 
-  it('should redirect to error page when neither campaignIds nor campaignId is present', async () => {
+  it('should redirect to error page when campaignIds are not present', async () => {
     const mockRedirect = jest.mocked(redirect);
 
     mockFetchClient.mockResolvedValueOnce({
       campaignIds: undefined,
-      campaignId: undefined,
       features: {},
     });
 

frontend/src/__tests__/components/providers/client-config-provider-server.test.tsx

@@ -9,7 +9,6 @@ const mockFetchClient = jest.mocked(fetchClient);
 describe('ClientConfigProviderServer', () => {
   it('returns ClientConfigProvider with value set', async () => {
     mockFetchClient.mockResolvedValueOnce({
-      campaignId: 'legacy-campaign-id',
       campaignIds: ['new-campaign-id'],
       features: { proofing: true, routing: true },
     });
@@ -19,7 +18,6 @@ describe('ClientConfigProviderServer', () => {
     expect(rendered.type).toBe(ClientConfigProvider);
 
     expect(rendered.props.value).toEqual({
-      campaignId: 'legacy-campaign-id',
       campaignIds: ['new-campaign-id'],
       features: { proofing: true, routing: true },
     });

frontend/src/__tests__/components/providers/client-config-provider.test.tsx

@@ -19,7 +19,6 @@ const renderProvider =
 
 it('returns client config from context', () => {
   const config: ClientConfiguration = {
-    campaignId: 'campaign-0',
     campaignIds: ['campaign-1', 'campaign-2'],
     features: { proofing: true, routing: false },
   };
@@ -32,9 +31,8 @@ it('returns client config from context', () => {
 });
 
 describe('useCampaignIds', () => {
-  it('returns a sorted list of all campaign ids (ignores deprecated)', () => {
+  it('returns a sorted list of all campaign ids', () => {
     const config: ClientConfiguration = {
-      campaignId: 'b',
       campaignIds: ['c', 'a'],
       features: {},
     };
@@ -46,9 +44,8 @@ describe('useCampaignIds', () => {
     expect(result.current).toEqual(['a', 'c']);
   });
 
-  it('returns a empty list of all campaign ids if present (ignores deprecated)', () => {
+  it('returns an empty list of campaign ids if present', () => {
     const config: ClientConfiguration = {
-      campaignId: 'b',
       campaignIds: [],
       features: {},
     };
@@ -60,17 +57,16 @@ describe('useCampaignIds', () => {
     expect(result.current).toEqual([]);
   });
 
-  it('returns a list of campaign ids (only legacy present)', () => {
+  it('returns an empty list of campaign ids if not present', () => {
     const config: ClientConfiguration = {
-      campaignId: 'campaign-0',
       features: {},
     };
 
     const { result } = renderHook(useCampaignIds, {
       wrapper: renderProvider(config),
     });
 
-    expect(result.current).toEqual(['campaign-0']);
+    expect(result.current).toEqual([]);
   });
 
   it('removes duplicates', () => {

frontend/src/utils/client-config.ts

@@ -7,17 +7,7 @@ export const initialFeatureFlags: ClientFeatures = Object.fromEntries(
 ) as ClientFeatures;
 
 export const getCampaignIds = (client: ClientConfiguration | null) => {
-  if (!client) return [];
+  if (!client?.campaignIds) return [];
 
-  const { campaignIds, campaignId } = client;
-
-  if (campaignIds) {
-    return [...new Set(campaignIds)].sort();
-  }
-
-  if (campaignId) {
-    return [campaignId];
-  }
-
-  return [];
+  return [...new Set(client.campaignIds)].sort();
 };

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -297,10 +297,6 @@
       },
       "ClientConfiguration": {
         "properties": {
-          "campaignId": {
-            "deprecated": true,
-            "type": "string"
-          },
           "campaignIds": {
             "items": {
               "type": "string"

lambdas/backend-api/src/__tests__/templates/api/get-client-configuration.test.ts

@@ -86,7 +86,7 @@ describe('Template API - get client configuration', () => {
 
     const clientConfiguration: ClientConfiguration = {
       features: { proofing: false },
-      campaignId: 'campaign',
+      campaignIds: ['campaign'],
     };
 
     mocks.templateClient.getClientConfiguration.mockResolvedValueOnce({

lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts

@@ -98,33 +98,18 @@ describe('templateClient', () => {
           {
             features: {},
             campaignIds: ['pea-campaign'],
-            campaignId: 'bean-campaign',
           },
           'bean-campaign'
         )
       ).toEqual(false);
     });
 
-    test('campaignIds list not present and campaign ID matches fallback campaign ID', () => {
+    test('campaignIds not present', () => {
       const { templateClient } = setup();
       expect(
         templateClient.isCampaignIdValid(
           {
             features: {},
-            campaignId: 'bean-campaign',
-          },
-          'bean-campaign'
-        )
-      ).toEqual(true);
-    });
-
-    test('campaign ID does not match config', () => {
-      const { templateClient } = setup();
-      expect(
-        templateClient.isCampaignIdValid(
-          {
-            features: {},
-            campaignId: 'pea-campaign',
           },
           'bean-campaign'
         )
@@ -191,34 +176,6 @@ describe('templateClient', () => {
       });
     });
 
-    test('should return a failure result when client configuration unexpectedly cant be fetched', async () => {
-      const { templateClient, mocks } = setup();
-
-      const data: CreateUpdateTemplate = {
-        templateType: 'EMAIL',
-        name: 'name',
-        message: 'message',
-        subject: 'subject',
-      };
-
-      mocks.clientConfigRepository.get.mockResolvedValueOnce({
-        error: { errorMeta: { code: 500, description: 'err' } },
-      });
-
-      const result = await templateClient.createTemplate(data, user);
-
-      expect(mocks.templateRepository.create).not.toHaveBeenCalled();
-
-      expect(result).toEqual({
-        error: {
-          errorMeta: {
-            code: 500,
-            description: 'err',
-          },
-        },
-      });
-    });
-
     test('should return a failure result, when saving to the database unexpectedly fails', async () => {
       const { templateClient, mocks } = setup();
 
@@ -247,8 +204,7 @@ describe('templateClient', () => {
       expect(mocks.templateRepository.create).toHaveBeenCalledWith(
         data,
         user,
-        'NOT_YET_SUBMITTED',
-        undefined
+        'NOT_YET_SUBMITTED'
       );
 
       expect(result).toEqual({
@@ -298,8 +254,7 @@ describe('templateClient', () => {
       expect(mocks.templateRepository.create).toHaveBeenCalledWith(
         data,
         user,
-        'NOT_YET_SUBMITTED',
-        undefined
+        'NOT_YET_SUBMITTED'
       );
 
       expect(result).toEqual({
@@ -354,8 +309,7 @@ describe('templateClient', () => {
       expect(mocks.templateRepository.create).toHaveBeenCalledWith(
         data,
         user,
-        'NOT_YET_SUBMITTED',
-        undefined
+        'NOT_YET_SUBMITTED'
       );
 
       expect(result).toEqual({
@@ -1762,7 +1716,7 @@ describe('templateClient', () => {
       const { templateClient, mocks, logMessages } = setup();
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
-        data: { features: { proofing: true }, campaignId: 'campaignId' },
+        data: { features: { proofing: true }, campaignIds: ['campaignId'] },
       });
 
       const actualError = new Error('from db');
@@ -1779,7 +1733,7 @@ describe('templateClient', () => {
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
         data: {
-          campaignId: 'campaignId',
+          campaignIds: ['campaignId'],
           features: {
             proofing: true,
           },
@@ -1840,7 +1794,7 @@ describe('templateClient', () => {
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
         data: {
-          campaignId: 'campaignId',
+          campaignIds: ['campaignId'],
           features: {
             proofing: true,
           },
@@ -1891,7 +1845,7 @@ describe('templateClient', () => {
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
         data: {
-          campaignId: 'campaignId',
+          campaignIds: ['campaignId'],
           features: {
             proofing: true,
           },
@@ -1959,7 +1913,7 @@ describe('templateClient', () => {
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
         data: {
-          campaignId: 'campaign-id-from-ssm',
+          campaignIds: ['campaign-id-from-ssm'],
           features: {
             proofing: true,
           },
@@ -2027,7 +1981,7 @@ describe('templateClient', () => {
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
         data: {
-          campaignId: 'campaign-from-ssm',
+          campaignIds: ['campaign-from-ssm'],
           features: {
             proofing: true,
           },
@@ -2179,7 +2133,7 @@ describe('templateClient', () => {
 
       const client: ClientConfiguration = {
         features: { proofing: true },
-        campaignId: 'campaign',
+        campaignIds: ['campaign'],
       };
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({ data: client });

lambdas/backend-api/src/__tests__/templates/infra/client-config-repository.test.ts

@@ -30,7 +30,7 @@ const mockClientId = 'test-client-123';
 const mockKey = `${mockSSMKeyPrefix}/${mockClientId}`;
 
 const validClient: ClientConfiguration = {
-  campaignId: 'campaign-123',
+  campaignIds: ['campaign-123'],
   features: {
     proofing: true,
   },

lambdas/backend-api/src/templates/app/template-client.ts

@@ -62,26 +62,10 @@ export class TemplateClient {
       return validationResult;
     }
 
-    const clientConfigurationResult = await this.clientConfigRepository.get(
-      user.clientId
-    );
-
-    if (clientConfigurationResult.error) {
-      log
-        .child(clientConfigurationResult.error.errorMeta)
-        .error(
-          'Failed to fetch client configuration',
-          clientConfigurationResult.error.actualError
-        );
-
-      return clientConfigurationResult;
-    }
-
     const createResult = await this.templateRepository.create(
       validationResult.data,
       user,
-      'NOT_YET_SUBMITTED',
-      clientConfigurationResult.data?.campaignId
+      'NOT_YET_SUBMITTED'
     );
 
     if (createResult.error) {
@@ -539,13 +523,9 @@ export class TemplateClient {
       return false;
     }
 
-    const { campaignIds, campaignId } = clientConfiguration;
-
-    const validCampaignId = campaignIds?.includes(campaignIdFromRequest);
-    const validFallbackCampaignId =
-      !campaignIds && campaignIdFromRequest === campaignId;
+    const { campaignIds = [] } = clientConfiguration;
 
-    return validCampaignId || validFallbackCampaignId;
+    return campaignIds.includes(campaignIdFromRequest);
   }
 
   async getClientConfiguration(