[Prod] Properly track eventSubmitted, updates to Slack message around PR deploys

.circleci/config.yml

@@ -180,6 +180,7 @@ commands:
         description: "Name of environment"
         type: string
     steps:
+      - checkout
       - run:
           name: Generate Message
           command: |
@@ -203,43 +204,41 @@ commands:
             esac
 
             env_name="<< parameters.environment_name >>"
-            set -x 
-            if [ ! -z "${CIRCLE_PULL_REQUEST}" ]; then
-                PR_NUMBER=${CIRCLE_PULL_REQUEST##*/}
 
-                # Debugging output
-                echo "CIRCLE_PULL_REQUEST: ${CIRCLE_PULL_REQUEST}"
-                echo "Extracted PR_NUMBER: ${PR_NUMBER}"
+            if [ -n "${CIRCLE_PULL_REQUEST}" ]; then
+                PR_NUMBER=${CIRCLE_PULL_REQUEST##*/}
 
                 PR_TITLE=$(curl -s "${CIRCLE_PULL_REQUEST}" | sed -e :a -e "N; s/\n/ /g; ta" | grep -oP "<bdi class=\"js-issue-title markdown-title\">[^<]+</bdi>" | sed -re "s~<[^>]+>~~g")
-                # Debugging output
-                echo "Extracted PR_TITLE: ${PR_TITLE}"
 
                 if [ ! -z "${PR_TITLE}" ]; then
                     JIRA_URLS=$(curl -s "${CIRCLE_PULL_REQUEST}" | sed -e :a -e "N; s/\n/ /g; ta" | grep -oP "Issue[(]s[)]</h2>.*Checklists</h2>" | grep -oP "\"https[^\"]+\"" | sed -e "s~\"~~g" | grep -o "https://jira.acf.gov/browse/[A-Z0-9-]*")
 
-                    # Debugging output
-                    echo "Extracted JIRA_URLS: ${JIRA_URLS}"
-
                     MESSAGE_TEXT=":rocket: Deployment of PR <${CIRCLE_PULL_REQUEST}|${PR_NUMBER}> (${PR_TITLE}) to <${ENV_URL}|${env_name}> was successful!"
-                    if [ ! -z "${JIRA_URLS}" ]; then
+                    if [ -n "${JIRA_URLS}" ]; then
                         MESSAGE_TEXT="${MESSAGE_TEXT}\nJIRA URLs in the PR:\n${JIRA_URLS}"
                     fi
                 else
                     MESSAGE_TEXT=":rocket: Deployment of PR <${CIRCLE_PULL_REQUEST}|${PR_NUMBER}> to <${ENV_URL}|${env_name}> was successful!"
                 fi
             else
-                MESSAGE_TEXT=":rocket: Deployment to <${ENV_URL}|${env_name}> was successful!"
+                COMMIT_MESSAGE=$(git log -1 --pretty=%B)
+                if echo "$COMMIT_MESSAGE" | grep -q "Merge pull request #"; then
+                  PR_NUMBER=$(git log -1 --pretty=%B | grep -oP '(?<=Merge pull request #)\d+')
+                  MESSAGE_TEXT=":rocket: Deployment of PR #${PR_NUMBER} to <${ENV_URL}|${env_name}> was successful!"
+                  if [ ! -z "${JIRA_URLS}" ]; then
+                      MESSAGE_TEXT="${MESSAGE_TEXT}\nJIRA URLs in the PR:\n${JIRA_URLS}"
+                  fi
+                else
+                    MESSAGE_TEXT=":rocket: Deployment to <${ENV_URL}|${env_name}> was successful!"
+                fi
             fi
-
             echo -e "${MESSAGE_TEXT}" > /tmp/message_file
 
       - notify_slack:
           slack_bot_token: << parameters.slack_bot_token >>
           slack_channel: << parameters.slack_channel >>
           message_text_file: "/tmp/message_file"
 
-
   cf_deploy:
     description: "Login to cloud foundry space with service account credentials
       and push application using deployment configuration file."
@@ -562,8 +561,8 @@ parameters:
     description: "Name of github branch that will deploy to dev"
     default: "al-ttahub-3196-new-tr-views"
     type: string
-  sandbox_git_branch:  # change to feature branch to test deployment
-    default: "mb/TTAHUB-3198/training-report-alerts"
+  sandbox_git_branch: # change to feature branch to test deployment
+    default: "kw-test-deploy"
     type: string
   prod_new_relic_app_id:
     default: "877570491"
@@ -621,9 +620,9 @@ jobs:
           command: |
             chmod +x ./bin/check_node_version_compatibility.sh
             ./bin/check_node_version_compatibility.sh
-      - store_artifacts:  # store backend lint reports
+      - store_artifacts: # store backend lint reports
           path: reports
-      - store_artifacts:  # store frontend lint reports
+      - store_artifacts: # store frontend lint reports
           path: frontend/reports
       - run:
           name: Remove similarity api data
@@ -662,9 +661,9 @@ jobs:
           paths:
             - similarity_api/src/venv
           key: v1-pip-deps-{{ checksum "combined-requirements.txt" }}
-      - store_artifacts:  # store backend lint reports
+      - store_artifacts: # store backend lint reports
           path: reports
-      - store_artifacts:  # store frontend lint reports
+      - store_artifacts: # store frontend lint reports
           path: similarity_api/reports
       - persist_to_workspace:
           root: .
@@ -674,7 +673,7 @@ jobs:
   test_backend:
     executor: docker-postgres-executor
     environment:
-        SFTP_EXPOSED_PORT: 2222
+      SFTP_EXPOSED_PORT: 2222
     steps:
       - attach_workspace:
           at: .
@@ -693,7 +692,7 @@ jobs:
           background: true
       - run:
           name: Test backend
-          command:  |
+          command: |
             chmod 744 ./bin/test-backend-ci
             ./bin/test-backend-ci
       - run:
@@ -719,7 +718,7 @@ jobs:
             SYFT_VERSION: v1.5.0
             IMAGE_NAME: ghcr.io/kcirtapfromspace/cloudfoundry_circleci:latest
             OUTPUT_FORMAT: json
-            OUTPUT_FILE:  reports/syft_sbom.json
+            OUTPUT_FILE: reports/syft_sbom.json
           command: |
             mkdir -p reports/
             curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b . "$SYFT_VERSION"
@@ -946,22 +945,38 @@ jobs:
       - when:
           condition:
             and:
-              - equal: [<< pipeline.project.git_url >>, << pipeline.parameters.prod_git_url >>]
-              - equal: [<< pipeline.git.branch >>, << pipeline.parameters.prod_git_branch >>]
+              - equal:
+                  [
+                    << pipeline.project.git_url >>,
+                    << pipeline.parameters.prod_git_url >>,
+                  ]
+              - equal:
+                  [
+                    << pipeline.git.branch >>,
+                    << pipeline.parameters.prod_git_branch >>,
+                  ]
           steps:
-          - run:
-              name: Create production robot
-              command: ./bin/robot-factory
+            - run:
+                name: Create production robot
+                command: ./bin/robot-factory
       - run:
           name: Install Cloud Foundry
           command: |
             curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&version=v7&source=github'
             sudo dpkg -i cf-cli_amd64.deb
-      - when:  # sandbox: for short-term feature development, see README.md
+      - when: # sandbox: for short-term feature development, see README.md
           condition:
             and:
-              - equal: [<< pipeline.project.git_url >>, << pipeline.parameters.sandbox_git_url >>]
-              - equal: [<< pipeline.git.branch >>, << pipeline.parameters.sandbox_git_branch >>]
+              - equal:
+                  [
+                    << pipeline.project.git_url >>,
+                    << pipeline.parameters.sandbox_git_url >>,
+                  ]
+              - equal:
+                  [
+                    << pipeline.git.branch >>,
+                    << pipeline.parameters.sandbox_git_branch >>,
+                  ]
           steps:
             - run:
                 name: Build frontend assets
@@ -1016,11 +1031,19 @@ jobs:
                 slack_channel: "acf-head-start-github"
                 environment_name: "sandbox"
 
-      - when:  # dev
+      - when: # dev
           condition:
             and:
-              - equal: [<< pipeline.project.git_url >>, << pipeline.parameters.dev_git_url >>]
-              - equal: [<< pipeline.git.branch >>, << pipeline.parameters.dev_git_branch >>]
+              - equal:
+                  [
+                    << pipeline.project.git_url >>,
+                    << pipeline.parameters.dev_git_url >>,
+                  ]
+              - equal:
+                  [
+                    << pipeline.git.branch >>,
+                    << pipeline.parameters.dev_git_branch >>,
+                  ]
           steps:
             - run:
                 name: Build frontend assets
@@ -1075,11 +1098,19 @@ jobs:
                 slack_channel: "acf-head-start-github"
                 environment_name: "dev"
 
-      - when:  # staging
+      - when: # staging
           condition:
             and:
-              - equal: [<< pipeline.project.git_url >>, << pipeline.parameters.staging_git_url >>]
-              - equal: [<< pipeline.git.branch >>, << pipeline.parameters.staging_git_branch >>]
+              - equal:
+                  [
+                    << pipeline.project.git_url >>,
+                    << pipeline.parameters.staging_git_url >>,
+                  ]
+              - equal:
+                  [
+                    << pipeline.git.branch >>,
+                    << pipeline.parameters.staging_git_branch >>,
+                  ]
           steps:
             - run:
                 name: Build frontend assets
@@ -1132,11 +1163,19 @@ jobs:
                 slack_channel: "acf-head-start-github"
                 environment_name: "staging"
 
-      - when:  # prod
+      - when: # prod
           condition:
             and:
-              - equal: [<< pipeline.project.git_url >>, << pipeline.parameters.prod_git_url >>]
-              - equal: [<< pipeline.git.branch >>, << pipeline.parameters.prod_git_branch >>]
+              - equal:
+                  [
+                    << pipeline.project.git_url >>,
+                    << pipeline.parameters.prod_git_url >>,
+                  ]
+              - equal:
+                  [
+                    << pipeline.git.branch >>,
+                    << pipeline.parameters.prod_git_branch >>,
+                  ]
           steps:
             - run:
                 name: Build frontend assets
@@ -1194,10 +1233,10 @@ jobs:
     docker:
       - image: cimg/base:2024.05
     steps:
-    - sparse_checkout:
-          directories: 'automation'
+      - sparse_checkout:
+          directories: "automation"
           branch: << pipeline.git.branch >>
-    - cf_backup:
+      - cf_backup:
           auth_client_secret: PROD_AUTH_CLIENT_SECRET
           cloudgov_username: CLOUDGOV_PROD_USERNAME
           cloudgov_password: CLOUDGOV_PROD_PASSWORD

frontend/src/pages/TrainingReportForm/__tests__/index.js

@@ -304,4 +304,39 @@ describe('TrainingReportForm', () => {
     await waitFor(() => expect(screen.getByText(/: e-1 event/i)).toBeInTheDocument());
     await waitFor(() => expect(screen.getByText(/r01-pd-1234/i)).toBeInTheDocument());
   });
+  it('passes correct values to backend', async () => {
+    fetchMock.get('/api/events/id/1', completedForm);
+
+    fetchMock.put('/api/events/id/1', {});
+    fetchMock.get(sessionsUrl, [
+      { id: 2, eventId: 1, data: { sessionName: 'Toothbrushing vol 2', status: 'Complete' } },
+      { id: 3, eventId: 1, data: { sessionName: 'Toothbrushing vol 3', status: 'Complete' } },
+    ]);
+
+    act(() => {
+      renderTrainingReportForm('1');
+    });
+
+    await waitFor(() => expect(fetchMock.called('/api/events/id/1', { method: 'GET' })).toBe(true));
+    const submitButton = await screen.findByRole('button', { name: /Review and submit/i });
+    act(() => {
+      userEvent.click(submitButton);
+    });
+
+    // Wait for the modal to display.
+    await waitFor(() => expect(screen.getByText(/You will not be able to make changes once you save the event./i)).toBeInTheDocument());
+
+    // get the button with the text "Yes, continue".
+    const yesContinueButton = screen.getByRole('button', { name: /Yes, continue/i });
+    act(() => {
+      userEvent.click(yesContinueButton);
+    });
+
+    await waitFor(() => expect(fetchMock.called('/api/events/id/1', { method: 'PUT' })).toBe(true));
+
+    // expect the data to contain "eventSubmitted: true"
+    expect(fetchMock.lastOptions('/api/events/id/1').body).toContain('"eventSubmitted":true');
+
+    await waitFor(() => expect(screen.getByText(/There was an error saving the training report/i)).toBeInTheDocument());
+  });
 });

frontend/src/pages/TrainingReportForm/index.js

@@ -226,7 +226,10 @@ export default function TrainingReportForm({ match }) {
 
       // PUT it to the backend
       const updatedEvent = await updateEvent(trainingReportId, {
-        data,
+        data: {
+          ...data,
+          eventSubmitted: true,
+        },
         ownerId: ownerId || null,
         pocIds: pocIds || null,
         collaboratorIds,