[00:46:03] (03PS1) 10Eileen: Use helper to call round, exchange convert [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020968 (https://phabricator.wikimedia.org/T349663) [00:47:54] (03PS2) 10Eileen: Use helper to call round, exchange convert [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020968 (https://phabricator.wikimedia.org/T349663) [00:57:09] (03PS1) 10Eileen: Switch FundraiseUp Audit to use new helpers for processing messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020975 (https://phabricator.wikimedia.org/T349663) [01:23:21] 03Fundraising Sprint: gone(), 06Fundraising-Backlog, 13Patch-For-Review, 07Unplanned-Sprint-Work: Mapping Import Project - Engage import - https://phabricator.wikimedia.org/T360150#9724975 (10Eileenmcnaughton) @MDemosWMF I've deployed a patch on staging that should implement the new rule - so if the no tha... [01:43:21] 14Fundraising Sprint: didAnyoneTryThis(), 03Fundraising Sprint: gone(), 06Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, and 2 others: Convert Queue2civicrm to civicrm extension - https://phabricator.wikimedia.org/T270672#9724984 (10Eileenmcnaughton) [01:52:43] 06Fundraising-Backlog: Staging - issues I hit today - https://phabricator.wikimedia.org/T362842 (10Eileenmcnaughton) 03NEW [01:55:36] 06Fundraising-Backlog: Matching EFT import error - but not duplicate - https://phabricator.wikimedia.org/T358143#9725007 (10Eileenmcnaughton) I tested on staging & was able to identify the rows.... Import row ID Row status Row Imported to Contribution ID Row import message Import field:Batch Import field:Contr... [01:55:51] 03Fundraising Sprint: gone(), 06Fundraising-Backlog, 07Unplanned-Sprint-Work: Matching EFT import error - but not duplicate - https://phabricator.wikimedia.org/T358143#9725009 (10Eileenmcnaughton) [02:02:53] 03Fundraising Sprint: gone(), 06Fundraising-Backlog, 07Unplanned-Sprint-Work: Matching EFT import error - but not duplicate - https://phabricator.wikimedia.org/T358143#9725010 (10Eileenmcnaughton) Here are the contact IDs ` select c.id, contact_id, receive_date, gateway, gateway_txn_id, trxn_id FROM civicrm_... [02:07:14] 03Fundraising Sprint: gone(), 06Fundraising-Backlog, 07Unplanned-Sprint-Work: Matching EFT import error - but not duplicate - https://phabricator.wikimedia.org/T358143#9725013 (10Eileenmcnaughton) @MDemosWMF so what is happened here is the 14 donations above were made on 19 Jan and then again on 25 Jan with... [02:14:59] (03CR) 10Ejegg: [C:03+2] Fix composer-in-a-mess [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020956 (owner: 10Eileen) [02:15:17] thanks ejegg|away I was a bit worried that might bite us [02:32:02] (03Merged) 10jenkins-bot: Fix composer-in-a-mess [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020956 (owner: 10Eileen) [03:02:19] 06Fundraising-Backlog: Civi batch data entry tool build out - https://phabricator.wikimedia.org/T360139#9725049 (10Eileenmcnaughton) Ok - so it looks to me like the field you are referring to is not a 'real' CiviCRM field but a pseudofield in the import? ie you have a column in your import like 'Owns the Donor A... [04:48:27] (03PS1) 10Eileen: WIP - test using donor advised field [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021084 (https://phabricator.wikimedia.org/T360139) [04:58:57] 06Fundraising-Backlog: Civi batch data entry tool build out - https://phabricator.wikimedia.org/T360139#9725084 (10Eileenmcnaughton) OK - I've created a custom field on staging that extends the Contribution & allows selection of an organization - if selected it creates the relationship - @MDemosWMF have a go at... [05:14:53] 03Fundraising Sprint: gone(), 06Fundraising-Backlog, 13Patch-For-Review, 07Unplanned-Sprint-Work: Mapping Import Project - Engage import - https://phabricator.wikimedia.org/T360150#9725088 (10Eileenmcnaughton) [12:05:45] (03CR) 10Damilare Adedoyin: [C:03+2] Clean up Adyen Audit to use new helpers, purgeable contacts [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020475 (owner: 10Eileen) [12:25:34] (03Merged) 10jenkins-bot: Clean up Adyen Audit to use new helpers, purgeable contacts [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020475 (owner: 10Eileen) [13:16:20] (03PS1) 10Damilare Adedoyin: Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) [13:36:13] (03CR) 10CI reject: [V:04-1] Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [13:38:47] (03PS1) 10Damilare Adedoyin: Push Fundraiseup modify msg to recur-upgrade queue [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1021476 (https://phabricator.wikimedia.org/T349663) [13:40:52] (03PS2) 10Damilare Adedoyin: Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) [13:46:26] (03CR) 10Jgleeson: [C:03+2] "LGTM!" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [13:49:12] thanks for the CR jgleeson|skrun, CI is failing on that patch because of the dependency on this: https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/SmashPig/+/1021476 [13:55:50] should we change the name of that queue to recurring-modify now that we're using it for more things? [13:57:30] yh I think that'd be more appropriate [14:00:52] (03CR) 10CI reject: [V:04-1] Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [14:01:06] cool, let's do it! [14:07:57] I guess we first add the setting in smashpig, to have both queues [14:08:07] (03PS2) 10Damilare Adedoyin: Rename Recurring upgrade queue to Recurring-modify. [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1021476 (https://phabricator.wikimedia.org/T349663) [14:08:10] then we change it over in the sending side [14:08:53] (03PS3) 10Damilare Adedoyin: Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) [14:09:16] damilare: we might need to have both for a short time, in case anyone is still clicking on that upgrade page [14:09:47] ohh so both recurring upgrade and modigy [14:09:51] modify** [14:09:59] right, email-pref [14:10:01] yeah, so just do a copy-paste in the main.yaml [14:12:59] (03PS3) 10Damilare Adedoyin: Rename Recurring upgrade queue to Recurring-modify. [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1021476 (https://phabricator.wikimedia.org/T349663) [14:13:06] (03CR) 10CI reject: [V:04-1] Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [14:19:35] (03PS1) 10Damilare Adedoyin: Push upgrade message to recurring-modify queue [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1021488 [14:22:20] (03CR) 10Ejegg: [C:03+2] Rename Recurring upgrade queue to Recurring-modify. [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1021476 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [14:22:25] thanks, Dami! [14:22:36] np [14:22:40] I'll get a puppet patch ready for prod [14:22:49] thanks for the CR [14:22:55] oh and we'll want an fr-dev settings patch too I guess [14:23:33] yep [14:23:59] is the puppet patch the one that would point the recurring modify quueue consumer to the new queue? [14:25:18] nope, just to add the new queue entry to the production main.yaml override [14:27:30] ohh [14:28:47] (03Merged) 10jenkins-bot: Rename Recurring upgrade queue to Recurring-modify. [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1021476 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [14:34:00] (03PS4) 10Damilare Adedoyin: Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) [15:52:42] (03CR) 10Ejegg: [C:03+2] "Thanks, this looks good!" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [15:53:27] (03CR) 10Ejegg: [C:03+2] "Thanks for the beautification, Thiemo!" [extensions/FundraisingEmailUnsubscribe] - 10https://gerrit.wikimedia.org/r/1019256 (owner: 10Thiemo Kreuz (WMDE)) [15:56:28] (03Merged) 10jenkins-bot: Fix a large amount of PHPCS code style violations [extensions/FundraisingEmailUnsubscribe] - 10https://gerrit.wikimedia.org/r/1019256 (owner: 10Thiemo Kreuz (WMDE)) [16:12:38] (03Merged) 10jenkins-bot: Fundraiseup audit import for recur plan change, push msg to the recurring-upgrade [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [16:58:10] (03CR) 10Cstone: [C:03+2] Move another test to import class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020392 (owner: 10Eileen) [16:59:37] (03CR) 10Cstone: [C:03+2] Move another test over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020442 (owner: 10Eileen) [17:17:56] (03Merged) 10jenkins-bot: Move another test to import class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020392 (owner: 10Eileen) [17:57:34] (03CR) 10Damilare Adedoyin: [C:03+2] Remove more disabled queue modules [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020915 (https://phabricator.wikimedia.org/T270672) (owner: 10Eileen) [18:11:59] (03CR) 10Cstone: [C:03+2] "recheck" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020442 (owner: 10Eileen) [18:12:37] (03PS2) 10Eileen: Move another test over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020442 [18:13:47] (03CR) 10Cstone: [C:03+2] Move another test over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020442 (owner: 10Eileen) [18:21:53] (03Merged) 10jenkins-bot: Remove more disabled queue modules [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020915 (https://phabricator.wikimedia.org/T270672) (owner: 10Eileen) [18:34:39] (03Merged) 10jenkins-bot: Move another test over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1020442 (owner: 10Eileen) [19:01:38] 06Fundraising-Backlog, 10FR-donorservices: Merging oddity - https://phabricator.wikimedia.org/T362928 (10SHust) 03NEW [19:03:13] (03CR) 10Ejegg: [C:03+2] Push upgrade message to recurring-modify queue [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1021488 (owner: 10Damilare Adedoyin) [19:03:29] damilare: should we push out that recurring-modify change to donorwiki? [19:04:06] yepp [19:04:09] oho, looks like it hasn't gotten the changes with the new error handling or the client-side error logging [19:05:26] (03Merged) 10jenkins-bot: Push upgrade message to recurring-modify queue [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1021488 (owner: 10Damilare Adedoyin) [19:05:43] so that shouldn't need the new smashpig version afaict [19:06:10] as long as the new setting that dwisehaupt pushed out is on donorwiki, that'll let it push even if the defaults aren't there [19:06:32] (03PS1) 10Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - 10https://gerrit.wikimedia.org/r/1021539 [19:06:52] ejegg: it should be there. i'll verify. [19:07:12] not doubting you :) [19:07:37] i doubt puppet. :) [19:07:49] but yeah, the yaml file was updated at 17:00:47 [19:07:58] utc that is. [19:08:15] (03CR) 10Ejegg: [C:03+2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - 10https://gerrit.wikimedia.org/r/1021539 (owner: 10Ejegg) [19:08:29] word, we'll proceed with the deploy! [19:09:38] (03Merged) 10jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - 10https://gerrit.wikimedia.org/r/1021539 (owner: 10Ejegg) [19:09:47] I'd do civi deploy too [19:12:28] (03PS1) 10Damilare Adedoyin: Upgrade SmashPig to v0.8.10.4 [wikimedia/fundraising/crm/vendor] - 10https://gerrit.wikimedia.org/r/1021540 [19:13:06] (03PS1) 10Damilare Adedoyin: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1021541 [19:52:21] (03CR) 10Damilare Adedoyin: [C:03+2] Upgrade SmashPig to v0.8.10.4 [wikimedia/fundraising/crm/vendor] - 10https://gerrit.wikimedia.org/r/1021540 (owner: 10Damilare Adedoyin) [19:52:27] (03CR) 10Eileen: "Just noting that during deploy this will require a process-control change, also a change to fundraising dev since the queues are listed in" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1021470 (https://phabricator.wikimedia.org/T349663) (owner: 10Damilare Adedoyin) [19:53:00] thanks eileen ! We're going to change the sender first, then run the consumer one extra time [19:53:16] then change the consumer along with the process-control change [19:53:23] oh cool & dev? [19:54:18] are we also changing the queue name for the rest of the recurring modfiy then? [19:56:21] yep yep eileen [19:56:36] damilare: did you make a fr-dev settings patch or should I ? [19:57:27] No I haven't done that yet ejegg [19:57:34] is that in localsettings? [19:57:50] in config/smashpig/main.yaml [19:58:04] oh ok, I'd do that now [19:58:17] i think there we can just change the name over, no need for the copy-paste [19:58:43] ok, about to deploy donorwiki [19:58:58] let me get a link to my pref & upgrade pages [19:59:11] ok no need to have the two queues - old/new [19:59:19] just the new one [19:59:35] nah, not in dev [19:59:44] hard cutover should be fine there [20:00:11] oh and like eileen said, there's the queue name in scripts/civicrm-consume-queues.sh [20:00:47] !log donorwiki upgraded from 5e39bdc5 to b005071a [20:00:51] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [20:01:24] ok, I was able to submit a 1 penny upgrade with no issues [20:01:46] email prefs submits fine too [20:01:59] so there should be one message in the new queue [20:02:45] let's see, i think there's a queue peek script to see the first message in queues [20:02:51] yep, QueuePeek [20:03:01] ok, will see if the old queue has anything [20:03:52] (for clarification, I'm going onto the civi box and running a maintenance script in the standalone smashpig dir) [20:04:49] (03PS1) 10Damilare Adedoyin: Change recurring upgrade to recurring modify [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/1021555 [20:05:24] awesome [20:06:22] thanks for what you did there with the explanation of what you're doing to view the queue content :) [20:06:32] :) [20:06:49] oh hey, I should make a wiki page for those maintenance scripts [20:07:13] I could just add a section here: https://wikitech.wikimedia.org/wiki/Fundraising/SmashPig [20:07:22] +1 [20:09:15] (03Merged) 10jenkins-bot: Upgrade SmashPig to v0.8.10.4 [wikimedia/fundraising/crm/vendor] - 10https://gerrit.wikimedia.org/r/1021540 (owner: 10Damilare Adedoyin) [20:10:26] (03CR) 10Damilare Adedoyin: [C:03+2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1021541 (owner: 10Damilare Adedoyin) [20:10:41] gonna do the civi deploy shortly [20:11:07] oh yay - the latest changes didn't conflict with the tweaks to the fundraise up test https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/1020975 [20:13:02] ahh awesome, but the patch shows some conflict [20:16:10] (03Merged) 10jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1021541 (owner: 10Damilare Adedoyin) [20:17:10] ok, got some really basic info in that page now [20:18:01] and there's a message in recurring-modify (of type recurring_upgrade) for my penny upgrade [20:18:14] and no messages in the recurring-upgrade queue [20:18:31] All clear to deploy civi whenever [20:18:40] ejegg: I just pulled master on localsettings [20:18:54] ok [20:19:11] ah, are you looking for the main.yaml there? [20:19:16] but I see this process control script recurring_upgrade_queue_consume.yaml still on the old name [20:19:31] oh yeah, that needs an update [20:20:04] Has anyone seen this before [20:20:07] https://usercontent.irccloud-cdn.com/file/2s29m9ZA/image.png [20:20:12] the blocked line [20:21:43] hmm, I don't see it when I refresh gmail [20:21:49] were you redirected to sign in [20:22:38] ejegg I assume the main.yaml file is in the SmashPig library in the civi/payments/donor servers [20:23:22] ok, I'd update the queue_consumes to read from both queues for now [20:23:51] thanks damilare [20:24:24] eileen: I don't see exactly that, but in Firefox I do see a content-security-policy warning that something was blocked due to the default-src [20:24:32] oh ok [20:24:44] still lets me log in though [20:25:08] https://usercontent.irccloud-cdn.com/file/6RR8Bzsj/Peek%202024-04-19%2008-23.gif [20:25:20] this is what I get - see how it kinda keeps reloading [20:25:55] jgleeson|away: perfect reply [21:11:30] 06Fundraising-Backlog, 06Infrastructure-Foundations, 10Mail, 06SRE: Access to DMARCIAN - https://phabricator.wikimedia.org/T356920#9728207 (10AKanji-WMF) 05Declined→03Open p:05High→03Medium a:03AKanji-WMF [21:34:36] !log civicrm upgraded from 28adb4da to e95e03d9 [21:34:40] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log