Refactor: Update goal/stats to use Donation Query #7376
Conversation
| public function between($startDate, $endDate) | ||
| { | ||
| $this->joinMeta('_give_completed_date', 'completed'); | ||
| $this->whereBetween('completed.meta_value', $startDate, $endDate); |
There was a problem hiding this comment.
I didn't test it on my end, but I'm very surprised that this works because the meta_value type is longtext and not datetime 🤔
There was a problem hiding this comment.
Tested this on my end and it works 😅
Interesting
| $this->joinMeta('_give_payment_total', 'amount'); | ||
| $this->joinMeta('_give_fee_donation_amount', 'intendedAmount'); | ||
| return $this->sum( | ||
| 'COALESCE(intendedAmount.meta_value, amount.meta_value)' |
There was a problem hiding this comment.
Hmmm, I'm not sure I fully understand this.
_give_payment_total has an amount that includes fees, and _give_fee_donation_amount doesn't include fees.
_give_fee_donation_amount is set only if fee recovery is checked. Correct me if I'm wrong, but COALESCE will return both _give_payment_total and _give_fee_donation_amount if the values are not null. So, if both are set, then the calculation is wrong, or I'm missing something?
| public function between($startDate, $endDate) | ||
| { | ||
| $this->joinMeta('_give_completed_date', 'completed'); | ||
| $this->whereBetween('completed.meta_value', $startDate, $endDate); |
There was a problem hiding this comment.
Tested this on my end and it works 😅
Interesting
| $this->joinMeta('_give_payment_total', 'amount'); | ||
| $this->joinMeta('_give_fee_donation_amount', 'intendedAmount'); | ||
| return $this->sum( | ||
| 'COALESCE(intendedAmount.meta_value, amount.meta_value)' |
Resolves GIVE-677
Description
This PR updates the donation goal and the donation stats for the Donation Form to use a new
DonationQuery, which supports a date range and accounts for recovered fees.Affects
DonationQueryclass to account for recovered fees.DonationFormGoalDataDTO.getTotalRevenuemethod with theDonationQuery.getTotalRevenueForDateRangemethod to the repository.getTotalNumberOfDonationsmethod with theDonationQuery.getTotalNumberOfDonationsForDateRangemethod to the repository.formStatsDataarray to use theDonationQuery.