test → val (9 January 2025)

package.json

@@ -26,7 +26,7 @@
   "homepage": "https://github.com/Enterprise-CMCS/macpro-mdct-mcr#readme",
   "dependencies": {
     "@enterprise-cmcs/serverless-waf-plugin": "^1.4.0",
-    "fast-xml-parser": "4.5.0",
+    "fast-xml-parser": "4.5.1",
     "loader-utils": "2.0.4"
   },
   "devDependencies": {

services/app-api/forms/naaar.json

@@ -4,7 +4,12 @@
   "basePath": "/naaar",
   "version": "NAAAR_2024-08-06",
   "entities": {
-    "plans": { "required": true }
+    "plans": {
+      "required": true
+    },
+    "analysisMethods": {
+      "required": true
+    }
   },
   "routes": [
     {
@@ -262,6 +267,140 @@
               }
             ]
           }
+        },
+        {
+          "name": "Analysis methods",
+          "path": "/naaar/state-and-program-information/analysis-methods",
+          "pageType": "drawer",
+          "entityType": "analysisMethods",
+          "verbiage": {
+            "intro": {
+              "section": "I. State and program information",
+              "subsection": "Analysis methods",
+              "info": [
+                {
+                  "type": "p",
+                  "content": "States should use this section of the tab to report on the analyses that the state uses to assess plan compliance with the state's 42 C.F.R. § 438.68 and 42 C.F.R. § 438.206 standards."
+                }
+              ]
+            },
+            "dashboardTitle": "",
+            "addEntityButtonText": "Add other analysis method",
+            "editEntityButtonText": "",
+            "readOnlyEntityButtonText": "",
+            "tableHeader": "Analysis method <br/> Frequency and plan utilization",
+            "addEditModalAddTitle": "Analysis method: Add other",
+            "addEditModalEditTitle": "Analysis method: Edit other",
+            "deleteEntityButtonAltText": "Delete other analysis method",
+            "deleteModalTitle": "Are you sure you want to delete this analysis method?",
+            "deleteModalConfirmButtonText": "Yes, delete method",
+            "deleteModalWarning": "Are you sure you want to proceed? You will lose all information entered for this analysis method in the NAAAR. The method will remain in previously submitted NAAAR reports if applicable.",
+            "entityUnfinishedMessage": "Complete the remaining indicators for this access measure by entering details.",
+            "enterEntityDetailsButtonText": "Enter",
+            "readOnlyEntityDetailsButtonText": "View",
+            "drawerTitle": "Analysis method: "
+          },
+          "drawerForm": {
+            "id": "iam",
+            "fields": [
+              {
+                "id": "analysis_applicable",
+                "type": "radio",
+                "validation": "radio",
+                "props": {
+                  "label": "Is this analysis method utilized to assess plan compliance?",
+                  "hint": "Select “Yes” if the method is utilized to assess plan compliance with the state's 42 C.F.R. § 438.68 and 42 C.F.R. § 438.206 standards.",
+                  "choices": [
+                    {
+                      "id": "KHvMO9SzSrkBhqCobPBUOY",
+                      "label": "No"
+                    },
+                    {
+                      "id": "Br7jPULxsYgbiuHV9zwyIB",
+                      "label": "Yes",
+                      "children": [
+                        {
+                          "id": "analysis_method_frequency",
+                          "type": "radio",
+                          "validation": {
+                            "type": "radio",
+                            "nested": true,
+                            "parentFieldName": "analysis_applicable"
+                          },
+                          "props": {
+                            "label": "Frequency of analysis",
+                            "choices": [
+                              {
+                                "id": "Sol1W6HJCixyOVxw4vDgXQ",
+                                "label": "Weekly"
+                              },
+                              {
+                                "id": "YjI3qT3Ml9cZfP4a1RV6G9",
+                                "label": "Bi-weekly"
+                              },
+                              {
+                                "id": "L8q1N1DXEYv8LsDfGkdbOe",
+                                "label": "Monthly"
+                              },
+                              {
+                                "id": "05ThR4UN7kYDGpKaTWESOB",
+                                "label": "Bi-monthly"
+                              },
+                              {
+                                "id": "Y0Rkz7e3Kkxw0T4aFDb38j",
+                                "label": "Quarterly"
+                              },
+                              {
+                                "id": "mcn99pzTOqnEmr3uXiEOYs",
+                                "label": "Semi-annually"
+                              },
+                              {
+                                "id": "r938vpeMJxkPOqk53N7qW0",
+                                "label": "Other, specify",
+                                "children": [
+                                  {
+                                    "id": "analysis_method_frequency-otherText",
+                                    "type": "textarea",
+                                    "validation": {
+                                      "type": "text",
+                                      "nested": true,
+                                      "parentFieldName": "analysis_method_frequency"
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "id": "WkqIis4bGGtK8Nzzqa6rPl",
+                                "label": "Varies by plan"
+                              }
+                            ]
+                          }
+                        },
+                        {
+                          "id": "analysis_method_applicable_plans",
+                          "type": "checkbox",
+                          "validation": {
+                            "type": "checkbox",
+                            "nested": true,
+                            "parentFieldName": "analysis_applicable"
+                          },
+                          "props": {
+                            "label": "Plans utilizing this method",
+                            "choices": [
+                              {
+                                "id": "tvCUw5CcaGUFSIMByAopjF",
+                                "label": "Fill in plans here"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            ]
+          }
         }
       ]
     },

services/app-api/handlers/reports/create.test.ts

@@ -65,13 +65,25 @@ const creationEvent: APIGatewayProxyEvent = {
   }),
 };
 
-const naaarCreationEvent: APIGatewayProxyEvent = {
+const naaarCreationDisabledEvent: APIGatewayProxyEvent = {
   ...proxyEvent,
   headers: { "cognito-identity-id": "test" },
   pathParameters: { reportType: "NAAAR", state: "AL" },
   body: JSON.stringify({
     fieldData: {
       contactName: "Contact Name",
+      analysisMethods: [
+        {
+          id: "id1",
+          name: "Geomapping",
+          isRequired: true,
+        },
+        {
+          id: "id2",
+          name: "Plan Provider Directory Review",
+          isRequired: true,
+        },
+      ],
     },
     metadata: {
       reportType: "NAAAR",
@@ -87,6 +99,40 @@ const naaarCreationEvent: APIGatewayProxyEvent = {
   }),
 };
 
+const naaarCreationEvent: APIGatewayProxyEvent = {
+  ...proxyEvent,
+  headers: { "cognito-identity-id": "test" },
+  pathParameters: { reportType: "NAAAR", state: "AL" },
+  body: JSON.stringify({
+    fieldData: {
+      contactName: "Contact Name",
+      analysisMethods: [
+        {
+          id: "id1",
+          name: "Geomapping",
+          isRequired: true,
+        },
+        {
+          id: "id2",
+          name: "Plan Provider Directory Review",
+          isRequired: true,
+        },
+      ],
+    },
+    metadata: {
+      reportType: "NAAAR",
+      contactName: "Contact Name",
+      status: "Not started",
+      reportingPeriodStartDate: 162515200000,
+      reportingPeriodEndDate: 168515200000,
+      dueDate: 168515200000,
+      combinedData: false,
+      lastAlteredBy: "Thelonious States",
+      naaarReport: true,
+    },
+  }),
+};
+
 const createPccmEvent: APIGatewayProxyEvent = {
   ...mockProxyEvent,
   body: JSON.stringify({
@@ -242,12 +288,12 @@ describe("Test createReport API method", () => {
   });
 
   test("Test NAAAR report creation when form is disabled throws 400 error", async () => {
-    const res = await createReport(naaarCreationEvent, null);
+    const res = await createReport(naaarCreationDisabledEvent, null);
     expect(res.statusCode).toBe(StatusCodes.BadRequest);
     expect(res.body).toContain(error.INVALID_DATA);
   });
 
-  test("Test successful run of report creation, not copied", async () => {
+  test("Test successful run of MCPAR report creation, not copied", async () => {
     dynamoClientMock.on(QueryCommand).resolves({
       Items: [],
     });
@@ -318,6 +364,26 @@ describe("Test createReport API method", () => {
     expect(s3PutSpy).toHaveBeenCalled();
   });
 
+  test("Test successful run of NAAAR report creation, not copied", async () => {
+    dynamoClientMock.on(QueryCommand).resolves({
+      Items: [],
+    });
+    const s3PutSpy = jest.spyOn(s3Lib, "put");
+    s3PutSpy.mockResolvedValue(mockS3PutObjectCommandOutput);
+    const res = await createReport(naaarCreationEvent, null);
+
+    const body = JSON.parse(res.body!);
+    expect(consoleSpy.debug).toHaveBeenCalled();
+    expect(res.statusCode).toBe(StatusCodes.Created);
+    expect(body.status).toContain("Not started");
+    expect(body.fieldDataId).toBeDefined;
+    expect(body.formTemplateId).toBeDefined;
+    expect(body.fieldData.analysisMethods).toBeDefined();
+    expect(body.fieldData.analysisMethods.length).toBeGreaterThan(0);
+    expect(body.fieldData.plans).toBeUndefined();
+    expect(s3PutSpy).toHaveBeenCalled();
+  });
+
   test("Test dynamo issue throws error", async () => {
     dynamoClientMock
       .on(PutCommand)

services/app-api/handlers/reports/create.ts

@@ -97,11 +97,17 @@ export const createReport = handler(async (event, _context) => {
   const fieldDataId: string = KSUID.randomSync().string;
   const formTemplateId: string = formTemplateVersion?.id;
 
+  const validationSchema = formTemplate.validationJson;
+  if (reportType === "NAAAR") {
+    // this entity does not have validation specified in the form template
+    validationSchema["analysisMethods"] = "objectArray";
+  }
+
   // Validate field data
   let validatedFieldData;
   try {
     validatedFieldData = await validateFieldData(
-      formTemplate.validationJson,
+      validationSchema,
       unvalidatedFieldData
     );
   } catch {

services/app-api/handlers/reports/update.test.ts

@@ -6,7 +6,9 @@ import { mockClient } from "aws-sdk-client-mock";
 import { proxyEvent } from "../../utils/testing/proxyEvent";
 import {
   mockDynamoData,
+  mockDynamoNAAARData,
   mockMcparReport,
+  mockNaaarReport,
   mockReportFieldData,
   mockReportJson,
   mockS3PutObjectCommandOutput,
@@ -37,6 +39,13 @@ const mockProxyEvent: APIGatewayProxyEvent = {
   body: JSON.stringify(mockMcparReport),
 };
 
+const mockNaaarProxyEvent: APIGatewayProxyEvent = {
+  ...proxyEvent,
+  headers: { "cognito-identity-id": "test" },
+  pathParameters: { reportType: "NAAAR", state: "CO", id: "testReportId" },
+  body: JSON.stringify(mockNaaarReport),
+};
+
 const updateEvent: APIGatewayProxyEvent = {
   ...mockProxyEvent,
   body: JSON.stringify({
@@ -61,6 +70,34 @@ const submissionEvent: APIGatewayProxyEvent = {
   }),
 };
 
+const naaarSubmissionEvent: APIGatewayProxyEvent = {
+  ...mockNaaarProxyEvent,
+  body: JSON.stringify({
+    ...mockNaaarReport,
+    metadata: {
+      status: "submitted",
+    },
+    submittedBy: mockNaaarReport.metadata.lastAlteredBy,
+    submittedOnDate: Date.now(),
+    fieldData: {
+      ...mockReportFieldData,
+      contactName: "Contact Name",
+      analysisMethods: [
+        {
+          id: "id1",
+          name: "Geomapping",
+          isRequired: true,
+        },
+        {
+          id: "id2",
+          name: "Plan Provider Directory Review",
+          isRequired: true,
+        },
+      ],
+    },
+  }),
+};
+
 const invalidFieldDataSubmissionEvent: APIGatewayProxyEvent = {
   ...mockProxyEvent,
   body: JSON.stringify({
@@ -113,7 +150,7 @@ describe("handlers/reports/update", () => {
       mockAuthUtil.hasPermissions.mockReturnValue(true);
     });
 
-    test("Test report update submission succeeds", async () => {
+    test("Test MCPAR report update submission succeeds", async () => {
       // s3 mocks
       const s3GetSpy = jest.spyOn(s3Lib, "get");
       s3GetSpy
@@ -143,6 +180,36 @@ describe("handlers/reports/update", () => {
       expect(mockPut).toHaveBeenCalled();
     });
 
+    test("Test NAAAR report update submission succeeds", async () => {
+      // s3 mocks
+      const s3GetSpy = jest.spyOn(s3Lib, "get");
+      s3GetSpy
+        .mockResolvedValueOnce(mockReportJson)
+        .mockResolvedValueOnce(mockReportFieldData);
+      const s3PutSpy = jest.spyOn(s3Lib, "put");
+      s3PutSpy.mockResolvedValue(mockS3PutObjectCommandOutput);
+      // dynamodb mocks
+      const mockPut = jest.fn();
+      dynamoClientMock.on(PutCommand).callsFake(mockPut);
+      // fetch mock
+      mockedFetchReport.mockResolvedValue({
+        statusCode: 200,
+        headers: {
+          "Access-Control-Allow-Origin": "string",
+          "Access-Control-Allow-Credentials": true,
+        },
+        body: JSON.stringify(mockDynamoNAAARData),
+      });
+
+      const response = await updateReport(naaarSubmissionEvent, null);
+      const body = JSON.parse(response.body!);
+      expect(body.status).toContain("submitted");
+      expect(body.fieldData["analysisMethods"]).toBeDefined();
+      expect(consoleSpy.debug).toHaveBeenCalled();
+      expect(response.statusCode).toBe(StatusCodes.Ok);
+      expect(mockPut).toHaveBeenCalled();
+    });
+
     test("Test attempted report update with no data returns 400", async () => {
       const noBodyEvent = {
         ...submissionEvent,