22063 - Allow multiple payment methods, also create multiple CFS accounts to support EFT/PAD switching #1597
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
seeker25
commented
Jul 2, 2024
seeker25
commented
Jul 2, 2024
seeker25
commented
Jul 2, 2024
seeker25
changed the title
|
Note: Need to do a few tests for this:
|
seeker25
commented
Jul 9, 2024
pay-api/migrations/versions/2024_07_08_f6990cf5ddf1_cfs_account_payment_method.py
Show resolved
Hide resolved
# Conflicts: # pay-admin/admin/__init__.py
seeker25
commented
Jul 11, 2024
| @@ -175,13 +175,14 @@ def get_payment_methods_query(statement: StatementModel): | |||
| .select_from(subquery) | |||
| .where( | |||
| and_( | |||
| subquery.c.start_date != subquery.c.end_date, | |||
There was a problem hiding this comment.
Not sure if this is enough on the real system yet
Are the history rows 5ms away from each other or exact like the unit test?
seeker25
commented
Jul 11, 2024
| func.lag(union_query.c.end_date) | ||
| .over(order_by=union_query.c.version.asc()) | ||
| func.coalesce(func.lag(union_query.c.end_date) | ||
| .over(order_by=union_query.c.version.asc()), datetime.min.date()) |
There was a problem hiding this comment.
Add in a default for start_date, being the min date
seeker25
commented
Jul 11, 2024
| @@ -138,7 +138,7 @@ def get_payment_methods_query(statement: StatementModel): | |||
| PaymentAccountModel.id, | |||
| PaymentAccountModel.payment_method, | |||
| PaymentAccountModel.version, | |||
| literal(None).label('end_date') | |||
| literal(datetime.max.date()).label('end_date') | |||
There was a problem hiding this comment.
default for end_date
seeker25
commented
Jul 11, 2024
| @@ -702,11 +702,22 @@ def test_statement_various_payment_methods_history(db, app): | |||
| """Unit test to test various payment methods over the life of a statement.""" | |||
| # We aren't using the session fixture here because we want to test the history_cls | |||
| # history_cls wont work on scoped session flush. | |||
| # Freezegun etc doesn't work here. | |||
| changed_column = [ | |||
There was a problem hiding this comment.
Not super fun here...
|
Fixing pay jobs, then local testing |
rodrigo-barraza
approved these changes
Jul 11, 2024
rodrigo-barraza
approved these changes
Jul 11, 2024
seeker25
commented
Jul 12, 2024
pay-api/migrations/versions/2024_07_11_248cf4155e19_cfs_payment_method_populate.py
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #:
bcgov/entity#22063
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the sbc-pay license (Apache 2.0).