Skip to content

<WIP> Removing SAC and Dissemination. #4890

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

Closed
wants to merge 283 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
283 commits
Select commit Hold shift + click to select a range
f032fc2
Revert Access change
rnovak338 Mar 14, 2025
153b3ba
Creating/Saving Audits
jrothacker Feb 28, 2025
56d1052
Audit migration command
rnovak338 Mar 6, 2025
3ba9c4e
Linting and feedback
rnovak338 Mar 6, 2025
dd10719
More linting and more feedback
rnovak338 Mar 6, 2025
1b1a76c
Exclusive mgmt command from Bandit
rnovak338 Mar 6, 2025
d1f54de
Remove deprecated "Schema" field
rnovak338 Mar 6, 2025
b191d33
New migration and migration logic cleanup
rnovak338 Mar 6, 2025
dcb8092
Missed the General Information tab
jrothacker Mar 7, 2025
9734eb1
Updating mixins to account for audits
jrothacker Mar 6, 2025
86f81f8
Search on Audits, with some refactoring
jrothacker Mar 4, 2025
71e207c
Minor bug fixes
jrothacker Mar 7, 2025
3869103
Removing template tag
jrothacker Mar 11, 2025
7b8dfc0
Adding blurb about how to use search
jrothacker Mar 11, 2025
12f359f
First start at cross validation
jrothacker Mar 7, 2025
d453d66
Migration script revisions
rnovak338 Mar 11, 2025
60f049c
Migration corrections
rnovak338 Mar 12, 2025
3c18c7f
Update instructions for testing migration script
rnovak338 Mar 12, 2025
447645a
Updating the excel file handling to save records into the history table.
jrothacker Mar 12, 2025
c1ac3af
Fix migration conflict
rnovak338 Mar 14, 2025
1fe4b73
Create History when adding accesses
rnovak338 Mar 14, 2025
e1ba0a6
Revert Access change
rnovak338 Mar 14, 2025
58325a9
Updated Events for Access.
jrothacker Mar 11, 2025
90fcbf9
Tested management command
gsa-suk Mar 14, 2025
196a95c
Monitor A Bunch More Endpoints (#4764)
jperson1 Mar 11, 2025
224cd8f
Dependency updates (#4768)
phildominguez-gsa Mar 11, 2025
936e4a4
Scale ClamAV and App for March (#4762)
asteel-gsa Mar 11, 2025
f642651
Terraform module updates (#4692)
asteel-gsa Mar 14, 2025
da290fc
Updating the excel file handling to save records into the history table.
jrothacker Mar 12, 2025
f7f5ef4
Fix migration conflict
rnovak338 Mar 14, 2025
15ff948
Create History when adding accesses
rnovak338 Mar 14, 2025
4e24087
Revert Access change
rnovak338 Mar 14, 2025
720c653
Updated Events for Access.
jrothacker Mar 11, 2025
9363bbd
Added _get_cog_over
gsa-suk Mar 13, 2025
680a6da
Fixes after rebase with jr/source-of-truth/main
gsa-suk Mar 14, 2025
24d5d75
Updating the excel file handling to save records into the history table.
jrothacker Mar 12, 2025
cc3b092
Scale ClamAV and App for March (#4762)
asteel-gsa Mar 11, 2025
cce42fd
Terraform module updates (#4692)
asteel-gsa Mar 14, 2025
c16f7a1
Merge branch 'jr/source-of-truth/main' into sk_source_of_truth_cog
gsa-suk Mar 14, 2025
6554a29
Deleted to match jr/source-of-truth/main
gsa-suk Mar 14, 2025
121a371
Using only the audits with status SUBMITTED or IN_PROGRESS
gsa-suk Mar 14, 2025
13e4db7
Merge branch 'jr/source-of-truth/main' of https://github.com/GSA-TTS/…
rnovak338 Mar 14, 2025
76308e1
Admin and migration changes
rnovak338 Mar 14, 2025
8fa2f05
Delete migrations
rnovak338 Mar 14, 2025
707ffe7
Correcting linting
jrothacker Mar 14, 2025
7e58938
Rename function, exit when no federal awards
gsa-suk Mar 17, 2025
56e183f
Added year 2025, processing audits with SUBMITTED or DISSEMINATED status
gsa-suk Mar 17, 2025
8fef339
My Submissions Beta Page
jrothacker Mar 14, 2025
3019750
Update
gsa-suk Mar 17, 2025
af234c1
Add arg for individual report_ids to migration script
rnovak338 Mar 18, 2025
eaa6d29
Merge pull request #4791 from GSA-TTS/jr/source-of-truth/ui
jrothacker Mar 18, 2025
3e79745
Fix for auditee_ein
jrothacker Mar 18, 2025
32603e5
Updates per discussion
gsa-suk Mar 18, 2025
abd065a
Removed initialize_db
gsa-suk Mar 18, 2025
6157811
Adding a beta page for Summary View
jrothacker Mar 18, 2025
4a2ed42
Remived CognizantAssignment
gsa-suk Mar 18, 2025
467a8f4
Removed unused imports
gsa-suk Mar 18, 2025
83d59cd
Removed unused imports
gsa-suk Mar 18, 2025
5fe980d
Merge pull request #4797 from GSA-TTS/jr/source-of-truth/ein-fix
jrothacker Mar 18, 2025
787f610
Merge pull request #4790 from GSA-TTS/sk_source_of_truth_cog
gsa-suk Mar 18, 2025
8e73052
Tweak verbose names for Audit and Audit History
rnovak338 Mar 18, 2025
fff8a6e
Merging tests into real-time-checking (#4796)
phildominguez-gsa Mar 19, 2025
5f29830
Fix issue with non-disseminated audits
jrothacker Mar 19, 2025
cac4bac
Implimented normalized key error loop
anagradova Mar 19, 2025
567fa68
Added standard dict return for consistency
anagradova Mar 19, 2025
2175364
Incorrect value adjusted
anagradova Mar 19, 2025
d7e2653
Merge pull request #4798 from GSA-TTS/jr/source-of-truth/ui-summary
jrothacker Mar 19, 2025
7580c42
moved value1==value2 logic to calling function
anagradova Mar 19, 2025
26bdfe5
Fix typo with showing download button
jrothacker Mar 19, 2025
52b5435
Fix notes to sefa count
jrothacker Mar 19, 2025
b5d3b23
Fix for counting of findings to be in-line with previous method
jrothacker Mar 19, 2025
f08d45c
Merge pull request #4800 from GSA-TTS/rnovak/source-of-truth/admin-mo…
rnovak338 Mar 19, 2025
b65931e
Update ein
gsa-suk Mar 19, 2025
f0812e0
Merge pull request #4810 from GSA-TTS/sk_update_ein_source_of_truth
gsa-suk Mar 19, 2025
5ef6468
Fix for counting of findings to be in-line with previous method
jrothacker Mar 19, 2025
95b11be
Merge branch 'jr/source-of-truth/summary-fix' of https://github.com/G…
rnovak338 Mar 20, 2025
7505ccc
Updating unit tests
phildominguez-gsa Mar 20, 2025
67bb0db
Merge pull request #4809 from GSA-TTS/jr/source-of-truth/summary-fix
jrothacker Mar 20, 2025
0f7d043
Limited number of rows read from audit table so container memory will…
gsa-suk Mar 20, 2025
2d0fcc7
Updated error formatting for alternative values
anagradova Mar 20, 2025
49272d0
added found_with_different_format flag
anagradova Mar 20, 2025
3b08db0
Fixing some tests
phildominguez-gsa Mar 20, 2025
c8dc7be
Removed un-needed return statement
anagradova Mar 20, 2025
e72e088
Corrected nesting of loops
anagradova Mar 20, 2025
ac3f846
This provides repeatable data loading for test
jadudm Mar 21, 2025
d7e1ed5
Updating README
jadudm Mar 21, 2025
efc32db
Update menu.bash
rnovak338 Mar 21, 2025
9c8a74a
Merge pull request #4812 from GSA-TTS/sk_source_of_truth_limit_audit_…
gsa-suk Mar 21, 2025
7726854
Fixing loop indent
phildominguez-gsa Mar 21, 2025
cd7cd7d
Put in checks to skip bools if no direct match
anagradova Mar 21, 2025
de513b1
Update backend/util/load_public_dissem_data/README.md
jadudm Mar 21, 2025
c051f37
Merge pull request #4814 from GSA-TTS/jadudm/sot/data-load
jadudm Mar 21, 2025
0a1b039
Ignoring bools fix and unit test
phildominguez-gsa Mar 21, 2025
8261aaa
File Uploads connection to Audit. Refactoring.
jrothacker Mar 18, 2025
eb5dab6
Ignoring another bool
phildominguez-gsa Mar 21, 2025
c2084d6
added check for != 0
anagradova Mar 21, 2025
1d138c4
switched non-0 conditional logic
anagradova Mar 21, 2025
81a5ce6
Added 0 value edge case
anagradova Mar 21, 2025
f705524
Assign file references to audit in migration script
rnovak338 Mar 21, 2025
79abde0
Updates the script to handle additional utilities
jadudm Mar 22, 2025
482534c
Minor tweak to the migration script
jrothacker Mar 24, 2025
f5e4331
Merge pull request #4822 from GSA-TTS/jr/source-of-truth/migration-to…
jrothacker Mar 24, 2025
f319be8
Rename compare_values, tests, error overwrite fix
phildominguez-gsa Mar 24, 2025
1db00b1
Merge pull request #4815 from GSA-TTS/jr/source-of-truth/sar
jrothacker Mar 24, 2025
7f7e54c
Merge branch 'main' into real-time-checking
anagradova Mar 25, 2025
442003e
Merge branch 'jr/source-of-truth/main' into real-time-checking
anagradova Mar 25, 2025
85a4467
Fixed build issue
anagradova Mar 26, 2025
710a431
Merge pull request #4816 from GSA-TTS/jadudm/sot/load-improvement
jadudm Mar 26, 2025
4a73389
Updated matching logic
anagradova Mar 27, 2025
1a5d800
Fixed the audit type underscore issue
jrothacker Mar 27, 2025
f09c735
Updating the downloads to use the audit table.
jrothacker Mar 24, 2025
dc89179
Adding format error tests
phildominguez-gsa Mar 27, 2025
9645b3b
Initial commit
rnovak338 Mar 27, 2025
8fb194e
Include staffuser permissions for new models
rnovak338 Mar 27, 2025
f729ef9
Made corrections for corner case test
anagradova Mar 27, 2025
9325945
Merge pull request #4830 from GSA-TTS/jr/source-of-truth/downloads
jrothacker Mar 27, 2025
4bbf3a6
Adding meta and tribal tests
phildominguez-gsa Mar 28, 2025
a3bf28c
Fix for meta test
phildominguez-gsa Mar 28, 2025
a8a5e8b
Test for eins
phildominguez-gsa Mar 28, 2025
1b9cec2
Tribal consent tests
phildominguez-gsa Mar 28, 2025
fd9b1b1
Tribal test fix
phildominguez-gsa Mar 28, 2025
025c4ce
Fixed indent; Test comments; Checking differences before bools
phildominguez-gsa Mar 31, 2025
a541d0d
Fixing tribal tests
phildominguez-gsa Apr 1, 2025
b84f67e
{} checks for SOT
phildominguez-gsa Apr 1, 2025
d14723b
Adding Meta exception
phildominguez-gsa Apr 1, 2025
5a910f0
Merge branch 'jr/source-of-truth/main' of https://github.com/GSA-TTS/…
rnovak338 Apr 1, 2025
905a9c6
Copy over datasource during migration
jrothacker Apr 1, 2025
5a084c5
PR Feedback
rnovak338 Apr 1, 2025
3e6a7aa
Refactor save_model() for AuditValidationWaiverAdmin
rnovak338 Apr 1, 2025
c5a6d59
Further refactoring to save_model() and logical error fixes
rnovak338 Apr 1, 2025
fec4fe9
Merge pull request #4836 from GSA-TTS/rnovak/source-of-truth/django-a…
rnovak338 Apr 2, 2025
379e0d3
Merge pull request #4847 from GSA-TTS/jr/source-of-truth/migration-fix
jrothacker Apr 2, 2025
00e5214
Updating the API to account for audit table, and refactoring.
jrothacker Mar 31, 2025
742eee1
Updating created/updated for the migration script
jrothacker Apr 2, 2025
9656ba8
Updating the previous references validation to use Audit table
jrothacker Apr 2, 2025
44bf4d4
Merge pull request #4845 from GSA-TTS/jr/source-of-truth/api
jrothacker Apr 3, 2025
f43ab75
Merge pull request #4849 from GSA-TTS/jr/source-of-truth/cross
jrothacker Apr 3, 2025
0016b9f
Merge branch 'jr/source-of-truth/main' of https://github.com/GSA-TTS/…
phildominguez-gsa Apr 4, 2025
44a1f74
Adding limit option
phildominguez-gsa Apr 7, 2025
80027f0
Query fix
phildominguez-gsa Apr 7, 2025
ee8d944
Query fix
phildominguez-gsa Apr 7, 2025
3689043
Skipping dataless FindingsText and CorrectiveActionPlan
phildominguez-gsa Apr 7, 2025
76b18cd
Requiring dashes for dates
phildominguez-gsa Apr 7, 2025
036cc17
Fixing unit tests
phildominguez-gsa Apr 8, 2025
c41e730
Adding tests for cap and ft
phildominguez-gsa Apr 8, 2025
3b4801f
Catching up with main
phildominguez-gsa Apr 8, 2025
83f2861
Fixing conflicts
phildominguez-gsa Apr 8, 2025
3fdafb9
Fixing conflicts
phildominguez-gsa Apr 8, 2025
d0585cf
Added code for additional_eins structure test
anagradova Apr 8, 2025
d576c38
EINs tests
phildominguez-gsa Apr 9, 2025
689965c
Tests for additional_ueis and secondary_auditors
phildominguez-gsa Apr 10, 2025
3cf8a63
Test fixes
phildominguez-gsa Apr 11, 2025
cbd469f
Handling additional_ueis and secondary_auditors
phildominguez-gsa Apr 11, 2025
d8473b1
Adding message for no differences
phildominguez-gsa Apr 11, 2025
5ee3551
Merge branch 'main' of https://github.com/GSA-TTS/FAC into real-time-…
phildominguez-gsa Apr 14, 2025
b4af592
--report_id uses SAC table instead of General
phildominguez-gsa Apr 14, 2025
df70248
Adding flag to skip cog/over during real-time validation
phildominguez-gsa Apr 14, 2025
c7c7c54
Fixes for secondary_auditors and additional_ueis
phildominguez-gsa Apr 14, 2025
9bd0fbb
Removing SAC and Dissemination.
jrothacker Apr 7, 2025
3b8e830
dissemination test_views
jrothacker Apr 14, 2025
d1abfd0
fix for migration merge
jrothacker Apr 14, 2025
ba3cf20
Audit test_models
jrothacker Apr 14, 2025
b3c8b2f
Updated test to call correct function for mock
anagradova Apr 14, 2025
00972d3
Merge branch 'source-of-truth/phase-2' of https://github.com/GSA-TTS/…
anagradova Apr 14, 2025
6e7b3dd
Removing SAC and Dissemination.
jrothacker Apr 7, 2025
462fc3b
dissemination test_views
jrothacker Apr 14, 2025
7a2bd2f
fix for migration merge
jrothacker Apr 14, 2025
1358a09
Updated test to call correct function for mock
anagradova Apr 14, 2025
709b384
Audit test_models
jrothacker Apr 14, 2025
473324e
test_workbooks
jrothacker Apr 14, 2025
4c8e4a3
test_remove_editor
jrothacker Apr 14, 2025
e4b8c17
test_deleted_access
jrothacker Apr 14, 2025
071b113
test_serializers
jrothacker Apr 14, 2025
6bf1d78
test_xform_reformat_prior_references
jrothacker Apr 14, 2025
b21e423
test_remove_singleauditreport_pdf
jrothacker Apr 14, 2025
6022c16
test_manage_submission_view
jrothacker Apr 14, 2025
a5f89b2
test_admin
jrothacker Apr 15, 2025
6624ddc
test_verify_status
jrothacker Apr 15, 2025
2096507
test_settings
jrothacker Apr 15, 2025
babf2e2
test_manage_submission_access_view
jrothacker Apr 15, 2025
f4260b2
test_commands
jrothacker Apr 15, 2025
ccb9c4d
file_downloads
jrothacker Apr 15, 2025
2f988ad
api.test_views
jrothacker Apr 15, 2025
b2bde41
test_remove_workbook_artifacts
jrothacker Apr 15, 2025
cf026b0
test_mixins
jrothacker Apr 15, 2025
9690829
test_mixins
jrothacker Apr 15, 2025
a47181c
census linting
jrothacker Apr 15, 2025
8f28894
Merge branch 'source-of-truth/phase-2' of https://github.com/GSA-TTS/…
anagradova Apr 15, 2025
315aa01
Revert "Merge branch 'source-of-truth/phase-2' of https://github.com/…
jrothacker Apr 15, 2025
109672e
census historical
jrothacker Apr 15, 2025
0b742c3
minor linting fixes
jrothacker Apr 15, 2025
e8623c0
test_admin_api
jrothacker Apr 15, 2025
cf1eb85
test_auth
jrothacker Apr 15, 2025
f341449
test_views
jrothacker Apr 16, 2025
9ac3a04
test_views
jrothacker Apr 16, 2025
03d403a
dissemination test_views
jrothacker Apr 16, 2025
136778d
Catching up with main
phildominguez-gsa Apr 16, 2025
ac6ea16
removing sac, materialized views, cleaning up some docs/comments
jrothacker Apr 16, 2025
a14e724
Import fix
phildominguez-gsa Apr 16, 2025
dec1fc7
Updated user roles in baker for testing to resolve
anagradova Apr 16, 2025
4ed4ca2
Merge branch 'main' of https://github.com/GSA-TTS/FAC into real-time-…
phildominguez-gsa Apr 16, 2025
c17025e
linting
jrothacker Apr 16, 2025
b79148f
Lint
phildominguez-gsa Apr 16, 2025
4f1c7d5
Lint
phildominguez-gsa Apr 16, 2025
d74feb2
Lint
phildominguez-gsa Apr 16, 2025
1d81742
Merge branch 'main' into source-of-truth/phase-2
jrothacker Apr 16, 2025
8ad106f
Creating _validate_*_fields helpers
phildominguez-gsa Apr 16, 2025
536e241
linting
jrothacker Apr 16, 2025
96682f1
Creating _validate_flat_json helper
phildominguez-gsa Apr 16, 2025
b9de836
linting and tests
jrothacker Apr 16, 2025
42119a5
Merge branch 'main' into source-of-truth/phase-2
jrothacker Apr 16, 2025
4c77870
linting
jrothacker Apr 16, 2025
9c217ac
Creating _attempt_field_match and _attempt_value_match
phildominguez-gsa Apr 16, 2025
36333f8
updating api versions
jrothacker Apr 16, 2025
bf56c25
updating the fixtures
jrothacker Apr 16, 2025
0c5886e
Catching up with main
phildominguez-gsa Apr 17, 2025
21d5e8f
Fixing import
phildominguez-gsa Apr 17, 2025
a2d0d6f
Lint
phildominguez-gsa Apr 17, 2025
5f131ca
Lint
phildominguez-gsa Apr 17, 2025
727153c
Marking some methods as private
phildominguez-gsa Apr 17, 2025
a4f622e
Adding sys.exit(1)s
phildominguez-gsa Apr 17, 2025
72b6d2a
Performance upgrades on migration script
rnovak338 Apr 17, 2025
ab879c9
Log times on each step of SAC migration
rnovak338 Apr 17, 2025
44f5b13
Lint
phildominguez-gsa Apr 18, 2025
a136777
Putting real-time validation back
phildominguez-gsa Apr 18, 2025
d3fd5da
Not using General table; logging
phildominguez-gsa Apr 18, 2025
901e180
Lint
phildominguez-gsa Apr 18, 2025
face5d9
Lint
phildominguez-gsa Apr 18, 2025
e9fc1b8
Debugging - validation optimization
rnovak338 Apr 18, 2025
b7c0499
Migration and validation performance increase
rnovak338 Apr 18, 2025
0b852f9
Switching to direct dict compare
phildominguez-gsa Apr 21, 2025
b97c3b9
Lint
phildominguez-gsa Apr 21, 2025
491a1e6
Adding custom exception and handler for version mismatch (#4929)
jrothacker Apr 21, 2025
8bfcd48
Remove mistakenly compiled dependency
jperson1 Apr 21, 2025
ba834b4
Updating the submission process to go straight to dissemination (#4927)
jrothacker Apr 21, 2025
13727d5
Fixing TestValidateAuditConsistency tests
phildominguez-gsa Apr 21, 2025
509d2c0
Unit tests
phildominguez-gsa Apr 21, 2025
041b948
Removing unused methods/tests
phildominguez-gsa Apr 21, 2025
70af3e9
Merge branch 'main' into source-of-truth/phase-2
rnovak338 Apr 21, 2025
fb25c29
Merge pull request #4940 from GSA-TTS/source-of-truth/remove-unused-bits
jadudm Apr 21, 2025
41ed968
Remove unused module
rnovak338 Apr 21, 2025
78f0ce9
Merge branch 'source-of-truth/phase-2' into real-time-checking
rnovak338 Apr 21, 2025
bc626d1
Merge pull request #4942 from GSA-TTS/real-time-checking
rnovak338 Apr 21, 2025
ffe8fe0
Initial commit
rnovak338 Apr 21, 2025
2fa497a
Performance enhancements
rnovak338 Apr 22, 2025
617b8b7
Improve performance of SAC validation waivers
rnovak338 Apr 22, 2025
de3678c
Refactoring
rnovak338 Apr 22, 2025
44794d0
Remove audit_data in migrational event history
rnovak338 Apr 22, 2025
d0b9884
Merge branch 'main' into source-of-truth/phase-1.5
rnovak338 Apr 22, 2025
fce42a7
Merge branch 'source-of-truth/phase-1.5' into source-of-truth/phase-2
rnovak338 Apr 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/cypress-testing-from-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
CYPRESS_API_GOV_KEY_ADMIN: ${{ secrets.CYPRESS_API_GOV_KEY_ADMIN }}
CYPRESS_API_GOV_USER_ID_ADMIN: ${{ secrets.CYPRESS_API_GOV_USER_ID_ADMIN }}
CYPRESS_API_GOV_JWT: ${{ secrets.CYPRESS_API_GOV_JWT }}
CYPRESS_API_VERSION: "api_v1_1_0"
CYPRESS_ADMIN_API_VERSION: "admin_api_v1_1_0"
CYPRESS_API_VERSION: "api_v1_2_0"
CYPRESS_ADMIN_API_VERSION: "admin_api_v1_2_0"
CYPRESS_BASE_URL: "http://localhost:8000"
CYPRESS_LOGIN_TEST_EMAIL: ${{ secrets.CYPRESS_LOGIN_TEST_EMAIL }}
CYPRESS_LOGIN_TEST_PASSWORD: ${{ secrets.CYPRESS_LOGIN_TEST_PASSWORD }}
Expand Down Expand Up @@ -65,10 +65,6 @@ jobs:
working-directory: ./backend
run: docker compose run web python manage.py load_fixtures

- name: Create materialized view
working-directory: ./backend
run: docker compose run web python manage.py materialized_views --create

- uses: browser-actions/setup-chrome@v1
with:
install-chromedriver: true
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/materialized-views.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/regression-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
CYPRESS_API_GOV_KEY_ADMIN: ${{ secrets.CYPRESS_API_GOV_KEY_ADMIN }}
CYPRESS_API_GOV_USER_ID_ADMIN: ${{ secrets.CYPRESS_API_GOV_USER_ID_ADMIN }}
CYPRESS_API_GOV_URL: ${{ secrets.CYPRESS_API_GOV_URL }}
CYPRESS_API_VERSION: "api_v1_1_0"
CYPRESS_ADMIN_API_VERSION: "admin_api_v1_1_0"
CYPRESS_API_VERSION: "api_v1_2_0"
CYPRESS_ADMIN_API_VERSION: "admin_api_v1_2_0"
CYPRESS_BASE_URL: ${{ inputs.url }}
CYPRESS_LOGIN_TEST_EMAIL: ${{ secrets.CYPRESS_LOGIN_TEST_EMAIL }}
CYPRESS_LOGIN_TEST_PASSWORD: ${{ secrets.CYPRESS_LOGIN_TEST_PASSWORD }}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/testing-from-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ jobs:
working-directory: ./backend
run: docker compose run web python manage.py load_fixtures

- name: Create materialized view
working-directory: ./backend
run: docker compose run web python manage.py materialized_views --create

- name: Run A11y tests
uses: cypress-io/github-action@v6
with:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/testing-from-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ jobs:
working-directory: ./backend
run: docker compose run web python manage.py load_fixtures

- name: Create materialized view
working-directory: ./backend
run: docker compose run web python manage.py materialized_views --create

- name: Run A11y tests
uses: cypress-io/github-action@v6
with:
Expand Down
3 changes: 0 additions & 3 deletions backend/.profile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source tools/api_teardown.sh
source tools/migrate_app_tables.sh
source tools/api_standup.sh
source tools/run_collectstatic.sh
source tools/materialized_views.sh
source tools/create_staffusers.sh

#####
Expand Down Expand Up @@ -47,8 +46,6 @@ if [[ "$CF_INSTANCE_INDEX" == 0 ]]; then
# run_collectstatic
# gonogo "run_collectstatic"

# materialized_views
# gonogo "materialized_views"

#####
# CREATE STAFF USERS
Expand Down
3 changes: 1 addition & 2 deletions backend/api/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
AccessSerializer,
CERTIFIERS_HAVE_DIFFERENT_EMAILS,
)
from api.serializers.audit import AuditSerializer, SingleAuditChecklistSerializer
from api.serializers.audit import AuditSerializer
from api.serializers.auditee import AuditeeInfoSerializer
from api.serializers.eligibility import EligibilitySerializer
from api.serializers.uei import UEISerializer
Expand All @@ -16,7 +16,6 @@
AuditeeInfoSerializer,
AuditSerializer,
EligibilitySerializer,
SingleAuditChecklistSerializer,
UEISerializer,
]

Expand Down
29 changes: 5 additions & 24 deletions backend/api/serializers/access.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,44 +109,25 @@ class AccessListSerializer(serializers.ModelSerializer):
report_id = serializers.SerializerMethodField()
submission_status = serializers.SerializerMethodField()

# TODO: Update Post SOC Launch
@staticmethod
def get_auditee_uei(access):
return (
access.audit.audit.get("general_information", {}).get("auditee_uei", None)
if access.audit
else access.sac.auditee_uei
)
return access.audit.auditee_uei

@staticmethod
def get_auditee_fiscal_period_end(access):
return (
access.audit.audit.get("general_information", {}).get(
"auditee_fiscal_period_end", None
)
if access.audit
else access.sac.auditee_fiscal_period_end
)
return access.audit.auditee_fiscal_period_end

@staticmethod
def get_auditee_name(access):
return (
access.audit.audit.get("general_information", {}).get("auditee_name", None)
if access.audit
else access.sac.auditee_name
)
return access.audit.auditee_name

@staticmethod
def get_report_id(access):
return access.audit.report_id if access.audit else access.sac.report_id
return access.audit.report_id

@staticmethod
def get_submission_status(access):
return (
access.audit.submission_status
if access.audit
else access.sac.submission_status
)
return access.audit.submission_status

class Meta:
model = Access
Expand Down
9 changes: 1 addition & 8 deletions backend/api/serializers/audit.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
from rest_framework import serializers

from audit.models import SingleAuditChecklist, Audit


# TODO: Update Post SOC Launch -> Delete
class SingleAuditChecklistSerializer(serializers.ModelSerializer):
class Meta:
model = SingleAuditChecklist
fields = "__all__"
from audit.models import Audit


class AuditSerializer(serializers.ModelSerializer):
Expand Down
37 changes: 18 additions & 19 deletions backend/api/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from unittest import TestCase

from unittest.mock import patch

from django.contrib.auth.models import User
from django.utils import timezone as django_timezone
from datetime import timedelta
from django.test import SimpleTestCase
Expand All @@ -17,7 +19,8 @@
AccessAndSubmissionSerializer,
CERTIFIERS_HAVE_DIFFERENT_EMAILS,
)
from audit.models import User, Access, UeiValidationWaiver
from audit.models import Access, UeiValidationWaiver, Audit
from audit.models.constants import STATUS


class EligibilityStepTests(SimpleTestCase):
Expand Down Expand Up @@ -570,20 +573,27 @@ def test_certifiers_same_email(self):

class AccessListSerializerTests(TestCase):
def test_expected_fields_included(self):
access = baker.make(Access)
audit_data = {
"general_information": {
"auditee_uei": "TEST_UEI",
"auditee_fiscal_period_end": "2024-12-31",
"auditee_name": "Steve",
}
}

audit = baker.make(
Audit, version=0, audit=audit_data, submission_status=STATUS.IN_PROGRESS
)
access = baker.make(Access, audit=audit)

serializer = AccessListSerializer(access)

# TODO: Update Post SOC Launch
# remove if/else when we deprecate SAC data.
self.assertEqual(
serializer.data["auditee_uei"],
(
access.audit.audit.get("general_information", {}).get(
"auditee_uei", None
)
if access.audit
else access.sac.auditee_uei
),
)
self.assertEqual(
Expand All @@ -592,8 +602,6 @@ def test_expected_fields_included(self):
access.audit.audit.get("general_information", {}).get(
"auditee_fiscal_period_end", None
)
if access.audit
else access.sac.auditee_fiscal_period_end
),
)
self.assertEqual(
Expand All @@ -602,20 +610,11 @@ def test_expected_fields_included(self):
access.audit.audit.get("general_information", {}).get(
"auditee_name", None
)
if access.audit
else access.sac.auditee_name
),
)
self.assertEqual(
serializer.data["report_id"],
access.audit.report_id if access.audit else access.sac.report_id,
)
self.assertEqual(serializer.data["report_id"], access.audit.report_id)
self.assertEqual(
serializer.data["submission_status"],
(
access.audit.submission_status
if access.audit
else access.sac.submission_status
),
(access.audit.submission_status),
)
self.assertEqual(serializer.data["role"], access.role)
1 change: 0 additions & 1 deletion backend/api/test_uei.py
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ def test_automatic_waiver_issuance_for_sam_gov(self):
before = UeiValidationWaiver.objects.all().count()
results = get_uei_info_from_sam_gov(uei=test_uei)
after = UeiValidationWaiver.objects.all().count()
print(f"{before} {after}")
self.assertTrue(after - before == 1)
self.assertTrue(results["valid"])
self.assertEqual(
Expand Down
Loading
Loading