Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supporting multiple expenditure thresholds on eligibility page #4405

Merged
merged 14 commits into from
Dec 9, 2024

Conversation

phildominguez-gsa
Copy link
Contributor

@phildominguez-gsa phildominguez-gsa commented Oct 22, 2024

Addresses #3872 and #4198

In this PR:

  • Adding DOLLAR_THRESHOLDS const that determines the dollar thresholds required during specified time periods
    • Note: Start dates, when defined, are always considered inclusive, while end dates are exclusive
  • Eligibility Step 1 now generates the required conditions as bullet points by using DOLLAR_THRESHOLDS
  • Tweaking the error when you select No
  • Unit test update
  • Another note: We currently don't validate the $750,000 threshold in submissions, so this change will not be breaking any existing validations. These validations will be added as the next step for this work in another PR.

Testing:

  • Start making an audit and get to Step 1
  • The threshold conditions should look like:
    • image
  • Clicking No results in this error:
    • image

PR Checklist: Submitter

  • Link to an issue if possible. If there’s no issue, describe what your branch does. Even if there is an issue, a brief description in the PR is still useful.
  • List any special steps reviewers have to follow to test the PR. For example, adding a local environment variable, creating a local test file, etc.
  • For extra credit, submit a screen recording like this one.
  • Make sure you’ve merged main into your branch shortly before creating the PR. (You should also be merging main into your branch regularly during development.)
  • Make sure you’ve accounted for any migrations. When you’re about to create the PR, bring up the application locally and then run git status | grep migrations. If there are any results, you probably need to add them to the branch for the PR. Your PR should have only one new migration file for each of the component apps, except in rare circumstances; you may need to delete some and re-run python manage.py makemigrations to reduce the number to one. (Also, unless in exceptional circumstances, your PR should not delete any migration files.)
  • Make sure that whatever feature you’re adding has tests that cover the feature. This includes test coverage to make sure that the previous workflow still works, if applicable.
  • Make sure the full-submission.cy.js Cypress test passes, if applicable.
  • Do manual testing locally. Our tests are not good enough yet to allow us to skip this step. If that’s not applicable for some reason, check this box.
  • Verify that no Git surgery was necessary, or, if it was necessary at any point, repeat the testing after it’s finished.
  • Once a PR is merged, keep an eye on it until it’s deployed to dev, and do enough testing on dev to verify that it deployed successfully, the feature works as expected, and the happy path for the broad feature area (such as submission) still works.
  • Ensure that prior to merging, the working branch is up to date with main and the terraform plan is what you expect.

PR Checklist: Reviewer

  • Pull the branch to your local environment and run make docker-clean; make docker-first-run && docker compose up; then run docker compose exec web /bin/bash -c "python manage.py test"
  • Manually test out the changes locally, or check this box to verify that it wasn’t applicable in this case.
  • Check that the PR has appropriate tests. Look out for changes in HTML/JS/JSON Schema logic that may need to be captured in Python tests even though the logic isn’t in Python.
  • Verify that no Git surgery is necessary at any point (such as during a merge party), or, if it was, repeat the testing after it’s finished.

The larger the PR, the stricter we should be about these points.

Pre Merge Checklist: Merger

  • Ensure that prior to approving, the terraform plan is what we expect it to be. -/+ resource "null_resource" "cors_header" should be destroying and recreating its self and ~ resource "cloudfoundry_app" "clamav_api" might be updating its sha256 for the fac-file-scanner and fac-av-${ENV} by default.
  • Ensure that the branch is up to date with main.
  • Ensure that a terraform plan has been recently generated for the pull request.

Copy link
Contributor

github-actions bot commented Oct 22, 2024

Terraform plan for meta

No changes. Your infrastructure matches the configuration.
No changes. Your infrastructure matches the configuration.

Terraform has compared your real infrastructure against your configuration
and found no differences, so no changes are needed.

✅ Plan applied in Deploy to Development and Management Environment #880

Copy link
Contributor

github-actions bot commented Oct 22, 2024

Terraform plan for dev

Plan: 1 to add, 0 to change, 1 to destroy.
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # module.dev.module.cors.null_resource.cors_header must be replaced
-/+ resource "null_resource" "cors_header" {
!~      id       = "*******************" -> (known after apply)
!~      triggers = { # forces replacement
!~          "always_run" = "2024-12-05T19:41:28Z" -> (known after apply)
        }
    }

Plan: 1 to add, 0 to change, 1 to destroy.

❌ Plan not applied in Deploy to Development and Management Environment #880 (Plan has changed)

@phildominguez-gsa phildominguez-gsa changed the title Draft: Supporting multiple expenditure thresholds Supporting multiple expenditure thresholds Oct 24, 2024
@phildominguez-gsa phildominguez-gsa marked this pull request as ready for review October 24, 2024 13:06
@phildominguez-gsa phildominguez-gsa changed the title Supporting multiple expenditure thresholds Supporting multiple expenditure thresholds on eligibility page Oct 24, 2024
@Leighdiddy
Copy link

@James-Paul-Mason @phildominguez-gsa tiny feedback on the error message - Could we simplify to "You do not meet the requirements for submitting a single audit report." ?

@James-Paul-Mason
Copy link

@Leighdiddy @phildominguez-gsa Looking at this now. I agree with Leigh's content suggestion for the "No" error message. Otherwise everything looks clear and GTG.

@phildominguez-gsa phildominguez-gsa changed the title Draft: Supporting multiple expenditure thresholds on eligibility page Supporting multiple expenditure thresholds on eligibility page Dec 5, 2024
@phildominguez-gsa phildominguez-gsa marked this pull request as ready for review December 5, 2024 18:57
@phildominguez-gsa phildominguez-gsa marked this pull request as draft December 6, 2024 13:16
Copy link
Contributor

github-actions bot commented Dec 6, 2024

Code Coverage

Package Line Rate Branch Rate Health
. 100% 100%
api 98% 90%
audit 97% 87%
audit.cross_validation 98% 88%
audit.fixtures 84% 50%
audit.intakelib 90% 81%
audit.intakelib.checks 92% 85%
audit.intakelib.common 98% 82%
audit.intakelib.transforms 100% 94%
audit.management.commands 78% 17%
audit.migrations 100% 100%
audit.models 93% 75%
audit.templatetags 100% 100%
audit.views 62% 41%
census_historical_migration 96% 65%
census_historical_migration.migrations 100% 100%
census_historical_migration.sac_general_lib 92% 84%
census_historical_migration.transforms 95% 90%
census_historical_migration.workbooklib 68% 69%
config 77% 27%
curation 100% 100%
curation.curationlib 57% 100%
curation.migrations 100% 100%
dissemination 91% 72%
dissemination.migrations 97% 25%
dissemination.searchlib 74% 64%
dissemination.templatetags 100% 100%
djangooidc 53% 38%
djangooidc.tests 100% 94%
report_submission 93% 88%
report_submission.migrations 100% 100%
report_submission.templatetags 74% 100%
support 92% 65%
support.management.commands 96% 100%
support.migrations 100% 100%
support.models 97% 83%
tools 98% 50%
users 95% 92%
users.fixtures 100% 83%
users.management 100% 100%
users.management.commands 100% 100%
users.migrations 100% 100%
Summary 91% (17461 / 19280) 76% (2173 / 2850)

@phildominguez-gsa phildominguez-gsa marked this pull request as ready for review December 6, 2024 13:59
Copy link
Contributor

@jperson1 jperson1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@phildominguez-gsa phildominguez-gsa added this pull request to the merge queue Dec 9, 2024
Merged via the queue into main with commit 569ef19 Dec 9, 2024
15 checks passed
@phildominguez-gsa phildominguez-gsa deleted the pd/new-threshold branch December 9, 2024 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants