[REF] towards cleanup of update membership code #13759
Merged
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
|
(Standard links)
|
eileenmcnaughton
commented
Mar 4, 2019
| */ | ||
| protected static function getRelatedMemberships($contributionID) { | ||
| $contribution = new CRM_Contribute_BAO_Contribution(); | ||
| $contribution->id = $contributionID; |
There was a problem hiding this comment.
this 'double loading' of contribution is because we expect to stop passing the contribution object later
eileenmcnaughton
commented
Mar 4, 2019
| $memberships = $contribution->_relatedObjects['membership']; | ||
| foreach ($memberships as $membershipTypeIdKey => $membership) { | ||
| $memberships = self::getRelatedMemberships($contribution->id); | ||
| foreach ($memberships as $membership) { | ||
| if ($membership) { |
There was a problem hiding this comment.
this is is extraneous - but let's remove as a separate PR to keep this clean
eileenmcnaughton
force-pushed
the
matt
branch
3 times, most recently
from
b823275 to
f21d530
Compare
This PR limits itself to siphoning off how the memberships are fetched & having that function - return as an array of arrays rather than an array of objects - index the array by id rather than membership type This is a step towards the changes in civicrm#12542 & it should allow a separation of concerns relating to the LOADING of memberships from the processing. I note that the PR I'm looking at changes what gets loaded & that should be it's own PR but also that there is an extraneous if() here - I didn't alter that because it is a big white space change & doing on it's own will make that easy to review
|
Thanks @eileenmcnaughton. Tested locally and this works. It also has good test coverage which is passing - eg. Ok to merge |
|
@mattwire I'll bang up a follow up that removes the redundant IF |
Merged
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.
Overview
Minor code cleanup towards #12542
Before
less readable
After
More readable
Technical Details
@mattwire I've pulled this out as I think breaking out the loading of the memberships would simplify changing that function
This PR limits itself to siphoning off how the memberships are fetched & having that function
This is a step towards the changes in #12542
& it should allow a separation of concerns relating to the LOADING of memberships from the
processing.
I note that the PR I'm looking at changes what gets loaded & that should be it's own PR
but also that there is an extraneous if() here - I didn't alter that because
it is a big white space change & doing on it's own will make that easy to review
Comments
Anything else you would like the reviewer to note