-
Notifications
You must be signed in to change notification settings - Fork 1
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
feat: contact contribution history #42
Draft
wpf500
wants to merge
32
commits into
main
Choose a base branch
from
refactor/contribution-info
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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
wpf500
force-pushed
the
refactor/contribution-info
branch
from
August 8, 2024 13:09
3a95321
to
6384849
Compare
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.
This is a fairly major refactor (rewrite?) of the contribution code.
There are lots of problems with the contribution logic at the moment:
Contact
model (contribution*
fields) andContactContribution
. This indicates poor logical separation and means some contribution code ends up being inContactsService
when it shouldn't be.Contact.contributionType
andContactContribution.method
largely overlap (e.g. a Stripe payment method is always an automatic contribution, etc.)Contact
only has oneContactContribution
, so changes are overwritten and there's no history of a contact's payment IDs. This is especially problematic for contributions that have pending changes (e.g. a non-prorated annual change), as we can loose the ID for a current subscription or mandateContactContribution.nextAmount
attempts to solve this in a very ugly wayPaymentProvider
implementations have to manage a lot of the logic of how things are stored inContactContribution
and there's a lot of duplicationContactsService.forceUpdateContactContribution
method to allow updating themThis PR introduces a many-to-one relationship between
ContactContribution
andContact
, and aContactContribution.status
field to differentiate between versions. The status can bepending
,current
orNULL
, there can only ever be one current or pendingContactContribution
.To do
nextAmount
contributionType