Merge branch 'development' into feat/aa-notifications

Author: jusdino

backend/bin/pre-commit

@@ -94,9 +94,27 @@ if [ -n "$files" ]; then
     ruff check $files || exit "$?"
 fi
 
+
 # Check dependencies for known vulnerabilities
 pip-audit || exit "$?"
 
+# Lint all typescript files
+
+files=$(git diff-index \
+    --cached \
+    --name-only \
+    $against \
+    --relative \
+    --no-renames \
+    --diff-filter=dr \
+    -- '*.ts')
+if [ -n "$files" ]; then
+    (
+        cd compact-connect/lambdas/nodejs/
+        yarn lint:ingest || exit "$?"
+    ) || exit "$?"
+fi
+
 # Run the back-end tests
 bin/run_tests.sh -no || exit "$?"
 

backend/compact-connect/lambdas/nodejs/ingest-event-reporter/handler.ts

@@ -1,10 +1,12 @@
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { SESClient } from '@aws-sdk/client-ses';
+import { S3Client } from '@aws-sdk/client-s3';
 import { Lambda } from './lambda';
 
 
 const lambda = new Lambda({
     dynamoDBClient: new DynamoDBClient(),
+    s3Client: new S3Client(),
     sesClient: new SESClient(),
 });
 

backend/compact-connect/lambdas/nodejs/ingest-event-reporter/lambda.ts

@@ -26,6 +26,7 @@ interface LambdaProperties {
  */
 export class Lambda implements LambdaInterface {
     private readonly jurisdictionClient: JurisdictionClient;
+    private readonly compactConfigurationClient: CompactConfigurationClient;
     private readonly eventClient: EventClient;
     private readonly emailService: IngestEventEmailService;
 
@@ -35,7 +36,7 @@ export class Lambda implements LambdaInterface {
             dynamoDBClient: props.dynamoDBClient,
         });
 
-        const compactConfigurationClient = new CompactConfigurationClient({
+        this.compactConfigurationClient = new CompactConfigurationClient({
             logger: logger,
             dynamoDBClient: props.dynamoDBClient,
         });
@@ -48,7 +49,7 @@ export class Lambda implements LambdaInterface {
             logger: logger,
             sesClient: props.sesClient,
             s3Client: props.s3Client,
-            compactConfigurationClient: compactConfigurationClient,
+            compactConfigurationClient: this.compactConfigurationClient,
             jurisdictionClient: this.jurisdictionClient
         });
     }
@@ -62,6 +63,17 @@ export class Lambda implements LambdaInterface {
 
         // Loop over each compact the system knows about
         for (const compact of environmentVariables.getCompacts()) {
+            let compactConfig;
+
+            try {
+                compactConfig = await this.compactConfigurationClient.getCompactConfiguration(compact);
+            } catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+
+                logger.warn('Compact configuration not found, skipping compact', { compact, error: errorMessage });
+                continue;
+            }
+
             const jurisdictionConfigs = await this.jurisdictionClient.getJurisdictionConfigurations(compact);
 
             // Loop over each jurisdiction that we have contacts configured for
@@ -74,7 +86,7 @@ export class Lambda implements LambdaInterface {
                 if (ingestEvents.ingestFailures.length || ingestEvents.validationErrors.length) {
                     const messageId = await this.emailService.sendReportEmail(
                         ingestEvents,
-                        compact,
+                        compactConfig.compactName,
                         jurisdictionConfig.jurisdictionName,
                         jurisdictionConfig.jurisdictionOperationsTeamEmails
                     );
@@ -113,31 +125,34 @@ export class Lambda implements LambdaInterface {
                             && weeklyIngestEvents.ingestSuccesses.length
                         ) {
                             const messageId = await this.emailService.sendAllsWellEmail(
-                                compact,
+                                compactConfig.compactName,
                                 jurisdictionConfig.jurisdictionName,
                                 jurisdictionConfig.jurisdictionOperationsTeamEmails
                             );
 
                             logger.info(
                                 'Sent alls well email',
                                 {
-                                    compact: compact,
+                                    compact: compactConfig.compactName,
                                     jurisdiction: jurisdictionConfig.postalAbbreviation,
                                     message_id: messageId
                                 }
                             );
                         }
                         else if(!weeklyIngestEvents.ingestSuccesses.length) {
                             const messageId = await this.emailService.sendNoLicenseUpdatesEmail(
-                                compact,
+                                compactConfig.compactName,
                                 jurisdictionConfig.jurisdictionName,
-                                jurisdictionConfig.jurisdictionOperationsTeamEmails
+                                [
+                                    ...jurisdictionConfig.jurisdictionOperationsTeamEmails,
+                                    ...compactConfig.compactOperationsTeamEmails
+                                ]
                             );
 
                             logger.warn(
                                 'No licenses uploaded withinin the last week',
                                 {
-                                    compact: compact,
+                                    compact: compactConfig.compactName,
                                     jurisdiction: jurisdictionConfig.postalAbbreviation,
                                     message_id: messageId
                                 }

backend/compact-connect/lambdas/nodejs/tests/ingest-event-reporter.test.ts

@@ -1,7 +1,7 @@
 import { mockClient } from 'aws-sdk-client-mock';
 import 'aws-sdk-client-mock-jest';
 import { Context, EventBridgeEvent } from 'aws-lambda';
-import { DynamoDBClient, QueryCommand } from '@aws-sdk/client-dynamodb';
+import { DynamoDBClient, QueryCommand, GetItemCommand } from '@aws-sdk/client-dynamodb';
 import { SendEmailCommand, SESClient } from '@aws-sdk/client-ses';
 import { S3Client } from '@aws-sdk/client-s3';
 
@@ -12,7 +12,8 @@ import {
     SAMPLE_INGEST_FAILURE_ERROR_RECORD,
     SAMPLE_JURISDICTION_CONFIGURATION,
     SAMPLE_VALIDATION_ERROR_RECORD,
-    SAMPLE_INGEST_SUCCESS_RECORD
+    SAMPLE_INGEST_SUCCESS_RECORD,
+    SAMPLE_COMPACT_CONFIGURATION
 } from './sample-records';
 
 
@@ -134,6 +135,11 @@ describe('Nightly runs', () => {
             }
         });
 
+        // Mock GetItemCommand for compact configuration
+        mockDynamoDBClient.on(GetItemCommand).resolves({
+            Item: SAMPLE_COMPACT_CONFIGURATION
+        });
+
         lambda = new Lambda({
             dynamoDBClient: asDynamoDBClient(mockDynamoDBClient),
             s3Client: asS3Client(mockS3Client),
@@ -162,8 +168,16 @@ describe('Nightly runs', () => {
             }
         );
 
-        // Verify an event report was sent
-        expect(mockSendReportEmail).toHaveBeenCalled();
+        // Verify an event report was sent with correct parameters
+        expect(mockSendReportEmail).toHaveBeenCalledWith(
+            expect.objectContaining({
+                ingestFailures: [expect.objectContaining({ eventType: 'license.ingest-failure' })],
+                validationErrors: [expect.objectContaining({ eventType: 'license.validation-error' })]
+            }),
+            'Audiology and Speech Language Pathology', // compactName instead of abbreviation
+            'Ohio', // jurisdictionName
+            ['[email protected]'] // jurisdiction operations emails
+        );
         expect(mockSendAllsWellEmail).not.toHaveBeenCalled();
     });
 
@@ -188,6 +202,11 @@ describe('Nightly runs', () => {
             }
         });
 
+        // Mock GetItemCommand for compact configuration
+        mockDynamoDBClient.on(GetItemCommand).resolves({
+            Item: SAMPLE_COMPACT_CONFIGURATION
+        });
+
         lambda = new Lambda({
             dynamoDBClient: asDynamoDBClient(mockDynamoDBClient),
             s3Client: asS3Client(mockS3Client),
@@ -226,6 +245,12 @@ describe('Nightly runs', () => {
         const mockDynamoDBClient = mockClient(DynamoDBClient);
         const mockS3Client = mockClient(S3Client);
 
+        // Mock GetItemCommand to succeed (compact config found)
+        mockDynamoDBClient.on(GetItemCommand).resolves({
+            Item: SAMPLE_COMPACT_CONFIGURATION
+        });
+
+        // Mock QueryCommand to fail (jurisdictions query fails)
         mockDynamoDBClient.on(QueryCommand).rejects(new Error('DynamoDB error'));
 
         lambda = new Lambda({
@@ -240,6 +265,31 @@ describe('Nightly runs', () => {
             SAMPLE_CONTEXT
         )).rejects.toThrow('DynamoDB error');
     });
+
+    it('should skip compact and continue processing when compact configuration is not found', async () => {
+        const mockDynamoDBClient = mockClient(DynamoDBClient);
+        const mockS3Client = mockClient(S3Client);
+
+        // Mock GetItemCommand to reject with "not found" error for compact configuration
+        mockDynamoDBClient.on(GetItemCommand).rejects(new Error('No configuration found for compact: aslp'));
+
+        lambda = new Lambda({
+            dynamoDBClient: asDynamoDBClient(mockDynamoDBClient),
+            s3Client: asS3Client(mockS3Client),
+            sesClient: asSESClient(mockSESClient)
+        });
+
+        // Should not throw an error, should complete successfully
+        await expect(lambda.handler(
+            SAMPLE_NIGHTLY_EVENT,
+            SAMPLE_CONTEXT
+        )).resolves.toBeUndefined();
+
+        // Verify no emails were sent since we skipped all compacts
+        expect(mockSendReportEmail).not.toHaveBeenCalled();
+        expect(mockSendAllsWellEmail).not.toHaveBeenCalled();
+        expect(mockSendNoLicenseUpdatesEmail).not.toHaveBeenCalled();
+    });
 });
 
 
@@ -307,6 +357,11 @@ describe('Weekly runs', () => {
             }
         });
 
+        // Mock GetItemCommand for compact configuration
+        mockDynamoDBClient.on(GetItemCommand).resolves({
+            Item: SAMPLE_COMPACT_CONFIGURATION
+        });
+
         lambda = new Lambda({
             dynamoDBClient: asDynamoDBClient(mockDynamoDBClient),
             s3Client: asS3Client(mockS3Client),
@@ -326,9 +381,13 @@ describe('Weekly runs', () => {
             }
         );
 
-        // Verify an "All's Well" email was sent
+        // Verify an "All's Well" email was sent with correct parameters
         expect(mockSendReportEmail).not.toHaveBeenCalled();
-        expect(mockSendAllsWellEmail).toHaveBeenCalled();
+        expect(mockSendAllsWellEmail).toHaveBeenCalledWith(
+            'Audiology and Speech Language Pathology', // compactName instead of abbreviation
+            'Ohio', // jurisdictionName
+            ['[email protected]'] // jurisdiction operations emails
+        );
         expect(mockSendNoLicenseUpdatesEmail).not.toHaveBeenCalled();
     });
 
@@ -354,6 +413,11 @@ describe('Weekly runs', () => {
             }
         });
 
+        // Mock GetItemCommand for compact configuration
+        mockDynamoDBClient.on(GetItemCommand).resolves({
+            Item: SAMPLE_COMPACT_CONFIGURATION
+        });
+
         lambda = new Lambda({
             dynamoDBClient: asDynamoDBClient(mockDynamoDBClient),
             s3Client: asS3Client(mockS3Client),
@@ -373,10 +437,26 @@ describe('Weekly runs', () => {
             }
         );
 
-        // Verify an "All's Well" email was sent
+        // Verify the compact configuration was fetched
+        expect(mockDynamoDBClient).toHaveReceivedCommandWith(
+            GetItemCommand,
+            {
+                TableName: 'compact-table',
+                Key: {
+                    'pk': { S: 'aslp#CONFIGURATION' },
+                    'sk': { S: 'aslp#CONFIGURATION' }
+                }
+            }
+        );
+
+        // Verify no license updates email was sent with correct parameters
         expect(mockSendReportEmail).not.toHaveBeenCalled();
         expect(mockSendAllsWellEmail).not.toHaveBeenCalled();
-        expect(mockSendNoLicenseUpdatesEmail).toHaveBeenCalled();
+        expect(mockSendNoLicenseUpdatesEmail).toHaveBeenCalledWith(
+            'Audiology and Speech Language Pathology', // compactName instead of abbreviation
+            'Ohio', // jurisdictionName
+            ['[email protected]', '[email protected]'] // combined jurisdiction and compact operations emails
+        );
     });
 
     it('should send a report email and not an alls well, when there were errors', async () => {
@@ -419,6 +499,11 @@ describe('Weekly runs', () => {
             }
         });
 
+        // Mock GetItemCommand for compact configuration
+        mockDynamoDBClient.on(GetItemCommand).resolves({
+            Item: SAMPLE_COMPACT_CONFIGURATION
+        });
+
         lambda = new Lambda({
             dynamoDBClient: asDynamoDBClient(mockDynamoDBClient),
             s3Client: asS3Client(mockS3Client),

backend/compact-connect/lambdas/nodejs/tests/sample-records.ts

@@ -322,3 +322,37 @@ export const SAMPLE_UNMARSHALLED_JURISDICTION_CONFIGURATION = {
     'postalAbbreviation': 'oh',
     'type': 'jurisdiction',
 };
+
+export const SAMPLE_COMPACT_CONFIGURATION = {
+    'pk': { 'S': 'aslp#CONFIGURATION' },
+    'sk': { 'S': 'aslp#CONFIGURATION' },
+    'compactAdverseActionsNotificationEmails': { 'L': [{ 'S': '[email protected]' }]},
+    'compactCommissionFee': {
+        'M': {
+            'feeAmount': { 'N': '3.5' },
+            'feeType': { 'S': 'FLAT_RATE' }
+        }
+    },
+    'compactAbbr': { 'S': 'aslp' },
+    'compactName': { 'S': 'Audiology and Speech Language Pathology' },
+    'compactOperationsTeamEmails': { 'L': [{ 'S': '[email protected]' }]},
+    'compactSummaryReportNotificationEmails': { 'L': [{ 'S': '[email protected]' }]},
+    'dateOfUpdate': { 'S': '2024-12-10T19:27:28+00:00' },
+    'type': { 'S': 'compact' }
+};
+
+export const SAMPLE_UNMARSHALLED_COMPACT_CONFIGURATION = {
+    'pk': 'aslp#CONFIGURATION',
+    'sk': 'aslp#CONFIGURATION',
+    'compactAdverseActionsNotificationEmails': ['[email protected]'],
+    'compactCommissionFee': {
+        'feeAmount': 3.5,
+        'feeType': 'FLAT_RATE'
+    },
+    'compactAbbr': 'aslp',
+    'compactName': 'Audiology and Speech Language Pathology',
+    'compactOperationsTeamEmails': ['[email protected]'],
+    'compactSummaryReportNotificationEmails': ['[email protected]'],
+    'dateOfUpdate': '2024-12-10T19:27:28+00:00',
+    'type': 'compact'
+};

backend/compact-connect/lambdas/python/common/requirements-dev.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile --no-emit-index-url compact-connect/lambdas/python/common/requirements-dev.in
 #
-boto3==1.38.38
+boto3==1.39.0
     # via moto
-botocore==1.38.38
+botocore==1.39.0
     # via
     #   boto3
     #   moto

backend/compact-connect/lambdas/python/common/requirements.txt

@@ -4,11 +4,11 @@
 #
 #    pip-compile --no-emit-index-url compact-connect/lambdas/python/common/requirements.in
 #
-aws-lambda-powertools==3.14.0
+aws-lambda-powertools==3.15.1
     # via -r compact-connect/lambdas/python/common/requirements.in
-boto3==1.38.38
+boto3==1.39.0
     # via -r compact-connect/lambdas/python/common/requirements.in
-botocore==1.38.38
+botocore==1.39.0
     # via
     #   boto3
     #   s3transfer

backend/compact-connect/lambdas/python/compact-configuration/requirements-dev.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile --no-emit-index-url compact-connect/lambdas/python/compact-configuration/requirements-dev.in
 #
-boto3==1.38.38
+boto3==1.39.0
     # via moto
-botocore==1.38.38
+botocore==1.39.0
     # via
     #   boto3
     #   moto