jenkins-bot has submitted this change and it was merged.
Change subject: AstroPay audit: match on log_id, not just ct_id
......................................................................
AstroPay audit: match on log_id, not just ct_id
Matching on ct_id could give us multiple lines if the user returned
to the site and tried a different payment in the same session.
Bug: T90507
Change-Id: If26b77bd8ffe5b3236000b70da8839150ccc9982
---
M sites/all/modules/wmf_audit/astropay/AstroPayAuditProcessor.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_audit/astropay/AstroPayAuditProcessor.php
b/sites/all/modules/wmf_audit/astropay/AstroPayAuditProcessor.php
index 2499f6b..9404cdd 100644
--- a/sites/all/modules/wmf_audit/astropay/AstroPayAuditProcessor.php
+++ b/sites/all/modules/wmf_audit/astropay/AstroPayAuditProcessor.php
@@ -26,8 +26,7 @@
}
protected function get_log_line_grep_string( $order_id ) {
- # FIXME: escaping is getting silly
- return "\"contribution_tracking_id\":\"\\?$order_id\"\\?";
+ return ":$order_id Redirecting for transaction:";
}
protected function parse_log_line( $logline ) {
@@ -123,8 +122,8 @@
* @return string|false the order_id, or false if we can't figure it out
*/
protected function get_order_id( $transaction ) {
- if ( is_array( $transaction ) && array_key_exists(
'contribution_tracking_id', $transaction ) ) {
- return $transaction['contribution_tracking_id'];
+ if ( is_array( $transaction ) && array_key_exists( 'log_id',
$transaction ) ) {
+ return $transaction['log_id'];
}
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/224462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If26b77bd8ffe5b3236000b70da8839150ccc9982
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
