Feat: CalFresh enrollment success with expiration #1988

thekaveman · 2024-03-26T23:03:54Z

Closes #1919

Todo

Questions sent to @srhhnry in Figma

Confirm spacing on Desktop: between top heading and image
Confirm spacing on Mobile: between image and expiry heading, between expiry heading and first paragraph
Rebase on feat/expiry-date to de-dupe the TIME_ZONE setting change

How to test

In the Admin, update a flow that you can pass eligibility for (e.g. MST Courtesy Cards): check supports expiration and add a value for the expiration days, re-enrollment days, and a QA group ID
In the Admin, update the corresponding agency's PaymentProcessor to connect to the QA environment
Pass eligibility
Enroll a test credit card
See the new success page

Screenshot - English

Screenshot - Spanish

github-actions · 2024-03-26T23:05:00Z

Coverage report

Click to see where and how coverage changed

File	Statements	Missing	Coverage	Coverage (new stmts)	Lines missing
benefits
settings.py
benefits/locale/en
formats.py
benefits/locale/es
formats.py
Project Total

_{This report was generated by python-coverage-comment-action}

thekaveman · 2024-04-25T20:14:37Z

I think we can actually merge this in, as it won't be activated for flows until we get back the expiration logic for enrollment (after #2052). And it doesn't have any conflicts with those changes, it just changed the enrollment/success.html template.

angela-tran

To test this locally, I:

(temporarily) merged dev into my local feat/calfresh-enrollment-success branch so that I have the revert from Revert "Feat: enrollments can expire (#1989)" #2052
edited my Courtesy Card eligibility type to support expiration
ran through the full Courtesy Card flow

I then see the success screen:

The expiration date doesn't show because currently there isn't any code that sets the enrollment_expiry session variable, and that's ok because this screen won't be accessible until after #2052 is reverted.

Hard-coding in an `enrollment_expiry` to test date formatting

Just to test the date-formatting, I hard-coded a value in for expiry in the session.enrollment_expiry function:

    # expiry = request.session.get(_ENROLLMENT_EXP)
    expiry = datetime(2024, 12, 1).timestamp()

English:

Spanish:

@thekaveman Do you know how the date formatting gets set? I'm not sure why I'm getting an abbreviated month in English

angela-tran · 2024-04-26T15:45:34Z

With a March date, I see the full month name:

thekaveman · 2024-04-26T16:18:35Z

@angela-tran:

@thekaveman Do you know how the date formatting gets set? I'm not sure why I'm getting an abbreviated month in English

We're using the date filter, which uses the DATE_FORMAT setting by default, which is:

DATE_FORMAT = "N j, Y"

Broken down as (from the table here):

N: Month abbreviation in Associated Press style. Proprietary extension.
j: Day of the month without leading zeros.
Y: Year, 4 digits with leading zeros.

It looks like for N, some months are fully spelled out and others are abbreviated. I guess we should change the default and instead use one of:

E: Month, locale specific alternative representation usually used for long date representation.
F: Month, textual, long.

I think each language has its own default format string, so changing this one should only affect English.

with the TIME_ZONE='America/Los_Angeles' setting, Django will display the expiration date in that time zone Django automatically formats the date according to the user's locale (e.g. 'en' or 'es') turned off djlint around this section because the different <p> tags in branches of the {% if %} block was throwing errors and causing weird formatting"

align with the 8-point grid and updated comps in Figma

see https://docs.djangoproject.com/en/5.0/topics/i18n/formatting/#creating-custom-format-files

thekaveman · 2024-04-26T16:55:39Z

@angela-tran I rebased on dev so this branch now has the revert from #2052.

I introduced custom date formats per locale and now we get the expected full-month formatting for both English and Spanish:

angela-tran · 2024-04-26T19:19:05Z

Nice!

angela-tran

The coverage report is flagging that the formats.py files aren't tested... should we do something about that?

adding a few init files here to get test discovery to work with the new locale directories

thekaveman · 2024-04-29T19:40:35Z

The coverage report is flagging that the formats.py files aren't tested... should we do something about that?

Good call on this! I added tests for each in 9cdacdc

angela-tran

🚀

angela-tran · 2024-04-29T20:15:06Z

Just noticed the infra pipeline failure... looking into it

angela-tran · 2024-04-29T20:16:52Z

terraform plan failed with Error: Unable to list provider registration status... seems unrelated to this PR's changes

angela-tran · 2024-04-29T20:18:59Z

Re-ran it and it worked 😂

github-actions bot added back-end Django views, sessions, middleware, models, migrations etc. deployment-dev [auto] Changes that will trigger a deploy if merged to dev front-end HTML/CSS/JavaScript and Django templates labels Mar 26, 2024

thekaveman self-assigned this Mar 26, 2024

thekaveman marked this pull request as ready for review March 28, 2024 22:35

thekaveman requested a review from a team as a code owner March 28, 2024 22:35

thekaveman force-pushed the feat/calfresh-enrollment-success branch from b265454 to 531a793 Compare March 28, 2024 22:39

thekaveman marked this pull request as draft March 28, 2024 23:30

thekaveman mentioned this pull request Mar 28, 2024

Feat: enrollments can expire #1989

Merged

thekaveman force-pushed the feat/calfresh-enrollment-success branch from 531a793 to 4726c9a Compare April 2, 2024 17:22

thekaveman changed the base branch from dev to feat/expiry-date April 2, 2024 17:22

Base automatically changed from feat/expiry-date to dev April 2, 2024 17:30

thekaveman mentioned this pull request Apr 2, 2024

Feat: CalFresh re-enrollment error #1992

Merged

thekaveman marked this pull request as ready for review April 2, 2024 17:34

thekaveman added this to the Low-income rider enrollment pathway milestone Apr 2, 2024

thekaveman marked this pull request as draft April 2, 2024 20:11

thekaveman marked this pull request as ready for review April 25, 2024 20:12

angela-tran reviewed Apr 26, 2024

View reviewed changes

thekaveman added 3 commits April 26, 2024 16:32

style: desktop spacing on enrollment success

01c52c9

align with the 8-point grid and updated comps in Figma

feat(i18n): custom date formats per locale

cb42683

see https://docs.djangoproject.com/en/5.0/topics/i18n/formatting/#creating-custom-format-files

thekaveman force-pushed the feat/calfresh-enrollment-success branch from 4726c9a to cb42683 Compare April 26, 2024 16:52

thekaveman requested a review from angela-tran April 26, 2024 16:55

fix(i18n): add missing strings

77e9e65

angela-tran previously approved these changes Apr 26, 2024

View reviewed changes

angela-tran reviewed Apr 26, 2024

View reviewed changes

test(locale): DATE_FORMAT results in expected str

9cdacdc

adding a few init files here to get test discovery to work with the new locale directories

thekaveman dismissed angela-tran’s stale review via 9cdacdc April 29, 2024 19:39

thekaveman requested a review from angela-tran April 29, 2024 19:40

angela-tran approved these changes Apr 29, 2024

View reviewed changes

thekaveman merged commit fecc1cc into dev Apr 29, 2024
13 checks passed

thekaveman deleted the feat/calfresh-enrollment-success branch April 29, 2024 20:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: CalFresh enrollment success with expiration #1988

Feat: CalFresh enrollment success with expiration #1988

thekaveman commented Mar 26, 2024 •

edited

Loading

github-actions bot commented Mar 26, 2024 •

edited

Loading

thekaveman commented Apr 25, 2024

angela-tran left a comment •

edited

Loading

angela-tran commented Apr 26, 2024

thekaveman commented Apr 26, 2024 •

edited

Loading

thekaveman commented Apr 26, 2024

angela-tran commented Apr 26, 2024

angela-tran left a comment

thekaveman commented Apr 29, 2024

angela-tran left a comment

angela-tran commented Apr 29, 2024

angela-tran commented Apr 29, 2024

angela-tran commented Apr 29, 2024 •

edited

Loading

Feat: CalFresh enrollment success with expiration #1988

Feat: CalFresh enrollment success with expiration #1988

Conversation

thekaveman commented Mar 26, 2024 • edited Loading

Todo

How to test

Screenshot - English

Screenshot - Spanish

github-actions bot commented Mar 26, 2024 • edited Loading

Coverage report

thekaveman commented Apr 25, 2024

angela-tran left a comment • edited Loading

Choose a reason for hiding this comment

Hard-coding in an enrollment_expiry to test date formatting

angela-tran commented Apr 26, 2024

thekaveman commented Apr 26, 2024 • edited Loading

thekaveman commented Apr 26, 2024

angela-tran commented Apr 26, 2024

angela-tran left a comment

Choose a reason for hiding this comment

thekaveman commented Apr 29, 2024

angela-tran left a comment

Choose a reason for hiding this comment

angela-tran commented Apr 29, 2024

angela-tran commented Apr 29, 2024

angela-tran commented Apr 29, 2024 • edited Loading

thekaveman commented Mar 26, 2024 •

edited

Loading

github-actions bot commented Mar 26, 2024 •

edited

Loading

angela-tran left a comment •

edited

Loading

Hard-coding in an `enrollment_expiry` to test date formatting

thekaveman commented Apr 26, 2024 •

edited

Loading

angela-tran commented Apr 29, 2024 •

edited

Loading