#2852: property to portfolio related fields - [AD] #3005

asaki222 · 2024-10-28T23:34:07Z

Ticket

Resolves #2852

Changes

Added @Property methods to DomainRequest model for the following fields:
- organization_name
- generic_org_type (called "organization_type" in Portfolio)
- federal_agency
- federal_type
- city
- state_territory
- urbanization
- senior_official
Changes to the domain request admin table
- the fields above now have the 'converted' prefix in the domain request admin table, and the information should be pulled from portfolio, not the domain request model.
- on the domain requests table in the non admin view, you should click on the csv report. And that report should have info pulled info from the fields above from Portfolio, and not the domain request model.

Context for reviewers

Setup

Code Review Verification Steps

As the original developer, I have

Satisfied acceptance criteria and met development standards

Met the acceptance criteria, or will meet them in a subsequent PR
Created/modified automated tests
Update documentation in READMEs and/or onboarding guide

Ensured code standards are met (Original Developer)

If any updated dependencies on Pipfile, also update dependencies in requirements.txt.
Interactions with external systems are wrapped in try/except
Error handling exists for unusual or missing values

Validated user-facing changes (if applicable)

Tag @dotgov-designers in this PR's Reviewers for design review. If code is not user-facing, delete design reviewer checklist
Verify new pages have been added to .pa11yci file so that they will be tested with our automated accessibility testing
Checked keyboard navigability
Tested general usability, landmarks, page header structure, and links with a screen reader (such as Voiceover or ANDI)

As a code reviewer, I have

Reviewed, tested, and left feedback about the changes

Pulled this branch locally and tested it
Verified code meets all checks above. Address any checks that are not satisfied
Reviewed this code and left comments. Indicate if comments must be addressed before code is merged
Checked that all code is adequately covered by tests
Verify migrations are valid and do not conflict with existing migrations

Validated user-facing changes as a developer

Note: Multiple code reviewers can share the checklists above, a second reviewer should not make a duplicate checklist. All checks should be checked before approving, even those labeled N/A.

New pages have been added to .pa11yci file so that they will be tested with our automated accessibility testing
Checked keyboard navigability
Meets all designs and user flows provided by design/product
Tested general usability, landmarks, page header structure, and links with a screen reader (such as Voiceover or ANDI)
(Rarely needed) Tested as both an analyst and applicant user

As a designer reviewer, I have

Verified that the changes match the design intention

Checked that the design translated visually
Checked behavior. Comment any found issues or broken flows.
Checked different states (empty, one, some, error)
Checked for landmarks, page heading structure, and links

Validated user-facing changes as a designer

Checked keyboard navigability
Tested general usability, landmarks, page header structure, and links with a screen reader (such as Voiceover or ANDI)
Tested with multiple browsers (check off which ones were used)
- Chrome
- Microsoft Edge
- FireFox
- Safari
(Rarely needed) Tested as both an analyst and applicant user

References

Code review best practices

Screenshots

… hotgov/2852-property-to-portfolio-related-fields

github-actions · 2024-11-05T18:41:53Z

🥳 Successfully deployed to developer sandbox ad.

… ad/2852-property-to-portfolio-related-fields

github-actions · 2024-11-05T22:26:07Z

🥳 Successfully deployed to developer sandbox ad.

github-actions · 2024-11-05T22:32:55Z

🥳 Successfully deployed to developer sandbox ad.

" "

github-actions · 2024-11-06T15:45:19Z

🥳 Successfully deployed to developer sandbox ad.

github-actions · 2024-11-06T20:22:28Z

🥳 Successfully deployed to developer sandbox ad.

github-actions · 2024-11-06T22:24:41Z

🥳 Successfully deployed to developer sandbox ad.

CocoByte

Blocking:
The admin table filters (for generic_org_type) has not been updated. If we are not doing this as part of this ticket, let me know and I can approve. @abroddrick (tagging for verification)

(Maybe) Blocking:
Also, do we want the column headers to include "converted" in the title? Or should we keep them the same as before, even though we are pulling from portfolio.

CocoByte · 2024-11-06T22:56:39Z

src/registrar/admin.py

@@ -1852,7 +1876,7 @@ def status_history(self, obj):

    # Read only that we'll leverage for CISA Analysts
    analyst_readonly_fields = [
-        "federal_agency",
+        "converted_federal_agency",


From my understanding, we are stripping out all the ACs involving change forms. Revert to federal_agency.

… ad/2852-property-to-portfolio-related-fields

github-actions · 2024-11-07T20:14:46Z

🥳 Successfully deployed to developer sandbox ad.

CocoByte

A couple minor changes still.

CocoByte · 2024-11-07T21:09:03Z

src/registrar/admin.py

+    class GenericOrgFilter(admin.SimpleListFilter):
+        """Custom Generic Organization filter that accomodates portfolio feature.
+        If we have a portfolio, use the portfolio's organization.  If not, use the
+        organization in the Domain Information object."""


Update this comment to "Domain Request" object

CocoByte · 2024-11-07T21:11:02Z

src/registrar/admin.py

        "custom_election_board",
-        "city",
-        "state_territory",
+        "converted_generic_org_type",


I still don't see updates for the column headers. Did we decide against it?

asaki222 · 2024-11-07T21:17:57Z

src/registrar/admin.py

+    @admin.display(description=_("State/Territory"))
+    def converted_state_territory(self, obj):
+        return obj.converted_state_territory
+
    # Columns


@CocoByte these are the admin.display methods.

CocoByte

Ok, LGTM

github-actions · 2024-11-07T21:23:25Z

🥳 Successfully deployed to developer sandbox ad.

asaki222 added 29 commits October 18, 2024 12:33

currrent thing

436809f

changes so far

6599515

ran the formatteR

db0806b

added additional methods to the html template that I missed

32183a2

added missing parts of the converted methods

e69a296

Merge branch 'main' of https://github.com/cisagov/manage.get.gov into…

5e8612b

… hotgov/2852-property-to-portfolio-related-fields

more changes

271eb01

updated the addressline1

bfded58

ran the formatter

00d0208

reverted changes due to changing ac

dec877b

fixed one test

015a08b

welcome

bac8d67

removed print statements

37ebe4e

updated the tests

eb2a5f6

removed print statements

a9aa8b1

updated tests

5a896ac

removed print statement

69d33ee

adjusted print

72297b4

adjusted line lengths

9b9e406

reformatted file

381423e

update to main

6e64f2c

removed trailing whitespace

4b45ccd

reverted changes

c977967

removed output

e93b35c

fixed more changes

7ada2d1

fixed yet another error

52c2132

fix test

b5f705f

merged to main

4d8e6b7

added changes to meta

b9ec168

asaki222 requested a review from abroddrick as a code owner October 28, 2024 23:34

ran black

29c20e8

asaki222 added 2 commits November 5, 2024 16:47

Merge branch 'main' of https://github.com/cisagov/manage.get.gov into…

ff7b4ac

… ad/2852-property-to-portfolio-related-fields

updated for incoming ticket

a7ec0d5

added minor space issues

c460e04

asaki222 changed the title ~~[Draft] - #2852: property to portfolio related fields - [AD]~~ #2852: property to portfolio related fields - [AD] Nov 5, 2024

asaki222 changed the title ~~#2852: property to portfolio related fields - [AD]~~ [DRAFT] - #2852: property to portfolio related fields - [AD] Nov 6, 2024

updated csv export file"

1ca5142

" "

asaki222 changed the title ~~[DRAFT] - #2852: property to portfolio related fields - [AD]~~ #2852: property to portfolio related fields - [AD] Nov 6, 2024

fixed tests

9a5ed14

updates

45f8a85

CocoByte requested changes Nov 6, 2024

View reviewed changes

asaki222 added 3 commits November 6, 2024 18:29

added a filter

3556309

Merge branch 'main' of https://github.com/cisagov/manage.get.gov into…

6e788d1

… ad/2852-property-to-portfolio-related-fields

changes

a800715

asaki222 requested a review from CocoByte November 7, 2024 20:25

CocoByte requested changes Nov 7, 2024

View reviewed changes

asaki222 commented Nov 7, 2024

View reviewed changes

added changes

5e9b9a7

CocoByte self-requested a review November 7, 2024 21:22

CocoByte approved these changes Nov 7, 2024

View reviewed changes

asaki222 merged commit 8a973a6 into main Nov 7, 2024
10 checks passed

asaki222 deleted the ad/2852-property-to-portfolio-related-fields branch November 7, 2024 21:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2852: property to portfolio related fields - [AD] #3005

#2852: property to portfolio related fields - [AD] #3005

asaki222 commented Oct 28, 2024 •

edited

Loading

github-actions bot commented Nov 5, 2024

github-actions bot commented Nov 5, 2024

github-actions bot commented Nov 5, 2024

github-actions bot commented Nov 6, 2024

github-actions bot commented Nov 6, 2024

github-actions bot commented Nov 6, 2024

CocoByte left a comment •

edited

Loading

CocoByte Nov 6, 2024

github-actions bot commented Nov 7, 2024

CocoByte left a comment

CocoByte Nov 7, 2024

CocoByte Nov 7, 2024 •

edited

Loading

asaki222 Nov 7, 2024

CocoByte left a comment

github-actions bot commented Nov 7, 2024

#2852: property to portfolio related fields - [AD] #3005

#2852: property to portfolio related fields - [AD] #3005

Conversation

asaki222 commented Oct 28, 2024 • edited Loading

Ticket

Changes

Context for reviewers

Setup

Code Review Verification Steps

As the original developer, I have

Satisfied acceptance criteria and met development standards

Ensured code standards are met (Original Developer)

Validated user-facing changes (if applicable)

As a code reviewer, I have

Reviewed, tested, and left feedback about the changes

Validated user-facing changes as a developer

As a designer reviewer, I have

Verified that the changes match the design intention

Validated user-facing changes as a designer

References

Screenshots

github-actions bot commented Nov 5, 2024

github-actions bot commented Nov 5, 2024

github-actions bot commented Nov 5, 2024

github-actions bot commented Nov 6, 2024

github-actions bot commented Nov 6, 2024

github-actions bot commented Nov 6, 2024

CocoByte left a comment • edited Loading

Choose a reason for hiding this comment

CocoByte Nov 6, 2024

Choose a reason for hiding this comment

github-actions bot commented Nov 7, 2024

CocoByte left a comment

Choose a reason for hiding this comment

CocoByte Nov 7, 2024

Choose a reason for hiding this comment

CocoByte Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

asaki222 Nov 7, 2024

Choose a reason for hiding this comment

CocoByte left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 7, 2024

asaki222 commented Oct 28, 2024 •

edited

Loading

CocoByte left a comment •

edited

Loading

CocoByte Nov 7, 2024 •

edited

Loading