Merge pull request #1625 from GSA/main

heyitsmebev · web-flow · commit c2345c205f4b · 2025-03-28T12:07:23.000-07:00
3-27-2025 Production release
diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
@@ -74,9 +74,25 @@ jobs:
           --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
           --strategy rolling
 
-    # TODO FIX
-    # - name: Update templates
-    #   run: cf run-task notify-api-demo --command "flask command update-templates"
+    - name: Update templates
+      uses: cloud-gov/cg-cli-tools@main
+      env:
+        DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
+        SECRET_KEY: ${{ secrets.SECRET_KEY }}
+        ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
+        NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+        NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+        NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+        LOGIN_DOT_GOV_REGISTRATION_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=NONCE&prompt=select_account&redirect_uri=https://notify-demo.app.cloud.gov/set-up-your-profile&response_type=code&scope=openid+email&state=STATE"
+
+      with:
+        cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
+        cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+        cf_org: gsa-tts-benefits-studio
+        cf_space: notify-demo
+        cf_command: >-
+          run-task notify-api-demo --command "flask command update-templates"
+
 
     - name: Deploy egress proxy
       uses: ./.github/actions/deploy-proxy
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -78,9 +78,24 @@ jobs:
           --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
           --strategy rolling
 
-    # TODO FIX
-    # - name: Update templates
-    #   run: cf run-task notify-api-production --command "flask command update-templates"
+    - name: Update templates
+      uses: cloud-gov/cg-cli-tools@main
+      env:
+        DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
+        SECRET_KEY: ${{ secrets.SECRET_KEY }}
+        ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
+        NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+        NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+        NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+        LOGIN_DOT_GOV_REGISTRATION_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=NONCE&prompt=select_account&redirect_uri=https://beta.notify.gov/set-up-your-profile&response_type=code&scope=openid+email&state=STATE"
+
+      with:
+        cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
+        cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+        cf_org: gsa-tts-benefits-studio
+        cf_space: notify-production
+        cf_command: >-
+          run-task notify-api-production --command "flask command update-templates"
 
     - name: Deploy egress proxy
       uses: ./.github/actions/deploy-proxy
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -80,9 +80,23 @@ jobs:
           --var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
           --strategy rolling
 
-    # TODO FIX
-    # - name: Update templates
-    #   run: cf run-task notify-api-staging --command "flask command update-templates"
+    - name: Update templates
+      uses: cloud-gov/cg-cli-tools@main
+      env:
+        DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
+        SECRET_KEY: ${{ secrets.SECRET_KEY }}
+        ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
+        NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+        NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+        NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+        LOGIN_DOT_GOV_REGISTRATION_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=NONCE&prompt=select_account&redirect_uri=https://notify-staging.app.cloud.gov/set-up-your-profile&response_type=code&scope=openid+email&state=STATE"
+      with:
+        cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
+        cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+        cf_org: gsa-tts-benefits-studio
+        cf_space: notify-staging
+        cf_command: >-
+          run-task notify-api-staging --command "flask command update-templates"
 
     - name: Deploy egress proxy
       uses: ./.github/actions/deploy-proxy
diff --git a/.github/workflows/restage-apps.yml b/.github/workflows/restage-apps.yml
@@ -18,14 +18,46 @@ jobs:
       matrix:
         app: ["api", "admin"]
     steps:
+      - name: Update env variables api
+        uses: cloud-gov/cg-cli-tools@main
+        with:
+          cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
+          cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+          cf_org: gsa-tts-benefits-studio
+          cf_space: notify-${{ inputs.environment }}
+          command: |
+            cf set-env notify-api-${{inputs.environment}} DANGEROUS_SALT "${{secrets.DANGEROUS_SALT}}"
+            cf set-env notify-api-${{inputs.environment}} ADMIN_CLIENT_SECRET "${{secrets.ADMIN_CLIENT_SECRET}}"
+            cf set-env notify-api-${{inputs.environment}} SECRET_KEY "${{secrets.SECRET_KEY}}"
+            cf set-env notify-api-${{inputs.environment}} LOGIN_PEM "${{secrets.LOGIN_PEM}}"
+            cf set-env notify-api-${{inputs.environment}} NOTIFY_E2E_TEST_EMAIL "${{secrets.NOTIFY_E2E_TEST_EMAIL}}"
+            cf set-env notify-api-${{inputs.environment}} NOTIFY_E2E_TEST_PASSWORD "${{secrets.NOTIFY_E2E_TEST_PASSWORD}}"
+
+      - name: Update env variables admin
+        uses: cloud-gov/cg-cli-tools@main
+        with:
+          cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
+          cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+          cf_org: gsa-tts-benefits-studio
+          cf_space: notify-${{ inputs.environment }}
+          command: |
+            cf set-env notify-admin-${{inputs.environment}} DANGEROUS_SALT "${{secrets.DANGEROUS_SALT}}"
+            cf set-env notify-admin-${{inputs.environment}} ADMIN_CLIENT_SECRET "${{secrets.ADMIN_CLIENT_SECRET}}"
+            cf set-env notify-admin-${{inputs.environment}} SECRET_KEY "${{secrets.SECRET_KEY}}"
+            cf set-env notify-admin-${{inputs.environment}} LOGIN_PEM "${{secrets.LOGIN_PEM}}"
+            cf set-env notify-admin-${{inputs.environment}} NOTIFY_E2E_TEST_EMAIL "${{secrets.NOTIFY_E2E_TEST_EMAIL}}"
+            cf set-env notify-admin-${{inputs.environment}} NOTIFY_E2E_TEST_PASSWORD "${{secrets.NOTIFY_E2E_TEST_PASSWORD}}"
+            cf set-env notify-api-${{inputs.environment}} E2E_BUCKET_NAME "${{secrets.E2E_BUCKET_NAME}}"
+
       - name: Restage ${{matrix.app}}
         uses: cloud-gov/cg-cli-tools@main
         with:
           cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
           cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
           cf_org: gsa-tts-benefits-studio
           cf_space: notify-${{ inputs.environment }}
-          command: "cf restage --strategy rolling notify-${{matrix.app}}-${{inputs.environment}}"
+          command: |
+            cf restage --strategy rolling notify-${{matrix.app}}-${{inputs.environment}}
       - name: Restage ${{matrix.app}} egress
         uses: cloud-gov/cg-cli-tools@main
         with:
diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py
@@ -604,7 +604,7 @@ def dao_fetch_stats_for_service_from_days_for_user(
 
     total_substmt = (
         select(
-            func.date_trunc("day", NotificationAllTimeView.created_at).label("day"),
+            func.date_trunc("hour", NotificationAllTimeView.created_at).label("hour"),
             Job.notification_count.label("notification_count"),
         )
         .join(Job, NotificationAllTimeView.job_id == Job.id)
@@ -618,25 +618,25 @@ def dao_fetch_stats_for_service_from_days_for_user(
         .group_by(
             Job.id,
             Job.notification_count,
-            func.date_trunc("day", NotificationAllTimeView.created_at),
+            func.date_trunc("hour", NotificationAllTimeView.created_at),
         )
         .subquery()
     )
 
     total_stmt = select(
-        total_substmt.c.day,
+        total_substmt.c.hour,
         func.sum(total_substmt.c.notification_count).label("total_notifications"),
-    ).group_by(total_substmt.c.day)
+    ).group_by(total_substmt.c.hour)
 
     total_notifications = {
-        row.day: row.total_notifications for row in db.session.execute(total_stmt).all()
+        row.hour: row.total_notifications for row in db.session.execute(total_stmt).all()
     }
 
     stmt = (
         select(
             NotificationAllTimeView.notification_type,
             NotificationAllTimeView.status,
-            func.date_trunc("day", NotificationAllTimeView.created_at).label("day"),
+            func.date_trunc("hour", NotificationAllTimeView.created_at).label("hour"),
             func.count(NotificationAllTimeView.id).label("count"),
         )
         .where(
@@ -649,7 +649,7 @@ def dao_fetch_stats_for_service_from_days_for_user(
         .group_by(
             NotificationAllTimeView.notification_type,
             NotificationAllTimeView.status,
-            func.date_trunc("day", NotificationAllTimeView.created_at),
+            func.date_trunc("hour", NotificationAllTimeView.created_at),
         )
     )
 
diff --git a/app/service/rest.py b/app/service/rest.py
@@ -282,10 +282,12 @@ def get_service_statistics_for_specific_days_by_user(
         service_id, start_date, end_date, user_id
     )
 
-    stats = get_specific_days_stats(
+    hours = days * 24
+
+    stats = get_specific_hours_stats(
         results,
         start_date,
-        days=days,
+        hours=hours,
         total_notifications=total_notifications,
     )
     return stats
diff --git a/poetry.lock b/poetry.lock

Original file line number	Diff line number	Diff line change
`@@ -282,10 +282,12 @@ def get_service_statistics_for_specific_days_by_user(`
`282`	`282`	`service_id, start_date, end_date, user_id`
`283`	`283`	`)`
`284`	`284`
`285`		`- stats = get_specific_days_stats(`
	`285`	`+ hours = days * 24`
	`286`	`+`
	`287`	`+ stats = get_specific_hours_stats(`
`286`	`288`	`results,`
`287`	`289`	`start_date,`
`288`		`- days=days,`
	`290`	`+ hours=hours,`
`289`	`291`	`total_notifications=total_notifications,`
`290`	`292`	`)`
`291`	`293`	`return stats`