[00:00:05] where does the funneling happen? [00:00:13] yep, I agree with making it a different consumer [00:00:22] searching is failing me [00:00:55] (03PS3) 10Eileen: Move test covering ContributionTracking api to api folder [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011002 (https://phabricator.wikimedia.org/T357469) [00:02:49] cstone the queue consumer takes an argument to decide which queue to read from [00:03:09] ok so its just running rqc with that flag that sends them there? [00:03:17] yeah I think [00:03:23] or rather the flag that reads them from there [00:03:35] they are sent by the RecurUpgrade special page on donorwiki [00:03:50] yeah i guess that the recurring queue reads in the redis messages [00:05:55] ejegg: so that comes in from process_control? [00:07:11] yeah i think instead of process controll calling rqc --queue=recurring-upfrade would have a new style cvapi RecurringUpgrade.consume [00:07:42] eileen: yep it comes in from process_control [00:08:01] drush @wmff -vv rqc --queue=recurring-upgrade [00:09:47] how do the new style ones know the name of the redis queue? [00:09:50] cstone: ejegg so if we were to rename it I think it looks like [00:09:50] 1) agree the name [00:09:50] 2) move the tests into their new location based on that name [00:09:50] 3) create a new queue consumer, copy in the logic [00:09:51] 4) update process-control [00:09:51] 5) remove the logic from the original [00:09:52] slightly complicated by [00:09:53] - the fact we want to switch process-control to using wmf-cv which I *think* has been fixed for mail but we need to check in on status [00:09:54] - we talked about creating new users & ideally would update to use them when we modify process-control but haven't had the discussion about naming etc [00:10:07] cstone: by new-style you mean the api? It's an argument [00:10:17] the api takes queueName & queueConsumer [00:10:20] argh, and I just added email sending into the recurring upgrade queue consumer [00:10:20] yeah the ones in WMFQueue now [00:10:34] also they're going to send out about 100k emails to send people to that page [00:10:59] is the page a separate topic or just saying 'don't change anything right now' [00:11:19] maybe not run via cv just yet [00:11:28] i think the tests could be moved easily and we already have the redis queue [00:11:30] ? [00:11:30] the rest seems safe [00:11:35] not easily safely [00:11:35] yeah [00:12:13] yeah the step I'm likely to work on today is just the tests & maybe some write up [00:15:06] but the tests do require use to get the name [00:15:06] Currently we have [00:15:06] RecurringQueueTest [00:15:07] RecuringQueueAutoRescueTest (in review) [00:15:07] RecurringModifyAmountQueueTest (what I'm working on) [00:15:08] - but I see some preference for just 'Upgrade' even though it could be 'Downgrade' [00:15:09] Also - note that the difference above is deliberate - ie if we agree it should be `RecurringModifyAmountQueue` then the Test name is right [00:15:10] It's a sub-feature of RecurringQueue then it would have `RecurringQueue` before the sub-feature name (AutoRescue) above - it's all about where the word Queue sits [00:15:58] (03PS1) 10Eileen: Separate out modify amount queue tests to new class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011007 (https://phabricator.wikimedia.org/T357469) [00:16:28] (03PS2) 10Eileen: Separate out modify amount queue tests to new class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011007 (https://phabricator.wikimedia.org/T357469) [00:51:27] (03PS1) 10Eileen: Test move preparation [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011008 (https://phabricator.wikimedia.org/T357469) [00:53:03] (03PS2) 10Eileen: Test move preparation [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011008 (https://phabricator.wikimedia.org/T357469) [01:01:54] (03CR) 10CI reject: [V:04-1] Test move preparation [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011008 (https://phabricator.wikimedia.org/T357469) (owner: 10Eileen) [01:06:57] (03PS1) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [01:07:21] heh, i'm about to need to edit the recurringUpgrade tests [01:07:29] well, I'll do the front-end bit first [01:19:19] ejegg: in theory once merged to https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/1011007/2 it would be somewhat stable as far as the upgrade tests go [01:24:23] (03PS1) 10Eileen: Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) [01:25:15] (03CR) 10CI reject: [V:04-1] Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [01:27:42] (03PS1) 10Ejegg: Add wmf_* tracking fields to RecurUpgrade message [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011014 (https://phabricator.wikimedia.org/T360047) [01:29:46] ah dang, lots of test fails when trying to add a custom field just called 'campaign' to the civicrm_activty_tracking custom group -- CRM_Core_Exception: id is missing: Campaign [01:29:53] Guessing it's a name collision [01:30:06] so is that civi core, or one of our silly custom functions? [01:30:25] wmf_civicrm.module:152 [01:30:28] guess our own [01:31:51] argh [01:32:00] so... fix that, or make a janky name? [01:33:07] (03CR) 10CI reject: [V:04-1] Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) (owner: 10Eileen) [01:33:54] whew, so there are only two places where that's called without the group name [01:34:12] but... they're right in the heart of the contribution save and the contact save [01:40:16] (03PS2) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [01:40:50] eileen: I know you probably would have taken on that dragon right then and there... but I'm not quite so ambitious right now [01:41:12] Let's see if that workaround actually works [01:42:11] ejegg: I think future us will hate us if we don't keep the name unique - maybe activity_campaign [01:42:27] oh really? [01:42:29] - label can stay the same [01:42:37] so civicrm_activity_tracking.activity_campaign ? [01:42:58] ... and activity_medium, activity_source ? [01:43:20] well - yeah there might be a better prefix [01:43:28] utm_ ? [01:43:33] :P [01:43:42] where have I heard that one before :-) [01:44:06] or we could call it Acoustic & every 2 years rename it when they rebrand.... [01:44:13] argh [01:45:17] grumble... [01:47:55] well imagine how you'd feel if one day Civi enforces name being unique & kindly alters the name so it will be... [01:48:08] ejegg: BUT column_name does not have to be the same as custom_field.name [01:48:40] & in fact it is ONLY in sql where not prefixing is better I would say [01:49:34] k, just coming around to that [01:50:21] I'm still annoyed that the old 'campaign' field that's preventing this from being clean is labeled 'Gift Source' [01:50:38] can we just fix that name? [01:50:57] not really [01:51:25] ok, I'll go with activity_* for the names and the non-prefixed columns [01:54:10] ejegg: yeah feels a bit risky to change but it is an ongoing annoyance [01:54:38] ejegg: on something else .... https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/1011013 - I'm thinking the smashpig db & table just aren't created? [01:56:02] (03PS3) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [01:56:41] eileen: ohh probably not [01:56:50] relocating... [02:00:29] ok eileen I'm about to edit the RecurringQueueConsumer to add those tracking fields in the upgrade activity [02:00:43] are you in the middle of breaking that whole functionality off into a new consumer? [02:00:49] or just breaking up the tests now? [02:00:56] nope - just the tests at the moment [02:02:52] k, thanks [02:06:32] (03PS1) 10Ejegg: Remove BAD_DATA_SESSION_KEY stuff from RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011018 [02:07:07] (03PS2) 10Eileen: Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) [02:13:41] (03CR) 10CI reject: [V:04-1] Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [02:15:52] (03CR) 10CI reject: [V:04-1] Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) (owner: 10Eileen) [02:17:03] well dang, eileen, it's still failing with name set to activity_campaign and the column staying 'campaign' [02:17:42] ohhh it needs to have a unique label too :P [02:19:07] (03CR) 10Eileen: "recheck" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) (owner: 10Eileen) [02:19:56] (03PS4) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [02:21:20] (03PS1) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [02:21:38] ejegg: does it fail locally for you there? [02:27:56] (03CR) 10jenkins-bot: Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) (owner: 10Eileen) [02:28:25] eileen: yep, the core function CustomField::getCustomFieldID looks for anything with name OR label matching the arg passed in [02:28:45] oh... [02:28:51] so I've updated the labels in PS4 [02:29:08] FWIW I just took a look at fixing one place [02:29:56] Well, I'm going to try an end to end test of what I've got here [02:30:25] (03PS1) 10Eileen: Remove one place where we call our outgoing helpers [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011020 [02:30:57] cool [02:35:32] (03PS1) 10Ejegg: Fix some RecurUpgrade variable names [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011021 [02:37:36] (03PS2) 10Ejegg: Add wmf_* tracking fields to RecurUpgrade message [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011014 (https://phabricator.wikimedia.org/T360047) [02:37:39] so I can see that the smashpig vendor directory has code to create the smashpig tables - but when does that get called? [02:38:51] 03Fundraising Sprint: explain($LikeImFive), 06Fundraising-Backlog, 10FR-donorservices, 10Recurring-Donations, 13Patch-For-Review: Track which email people clicked to upgrade their recurring donation - https://phabricator.wikimedia.org/T360047#9629053 (10Ejegg) a:03Ejegg [02:40:08] eileen in dev, it's when you set up the SmashPig standalone project [02:40:31] oh those tracking fields might as well be readonly in the UI, huh? [02:41:30] ejegg: hmm - so why is it the fredge db is set up & not the smash pig DB? [02:41:57] eileen: that's 'is_view' => 1, right? [02:42:05] sounds right [02:42:21] eileen: good question! [02:42:55] Perhaps I could add if not table exists then create in the damaged extension [02:43:07] We could certainly add that setup to wmff [02:43:18] wouldn't we want to create the database? [02:43:20] yeah - the problem is jenkins [02:44:08] I did throw in to create the db in buildkit - same as fredge - but jenkins has the fredge db tables & doesn't have the smashpig ones [02:45:02] (03PS5) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [02:45:03] (03PS2) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [02:46:59] (03PS6) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [02:46:59] (03PS3) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [02:47:33] (03PS7) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [02:47:34] (03PS4) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [02:47:39] sorry for the spam [02:55:47] (03PS1) 10Krinkle: tests: Remove redundant MainCacheType assignment [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011022 [03:02:30] (03PS2) 10Ejegg: Remove BAD_DATA_SESSION_KEY stuff from RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011018 [03:02:31] (03PS2) 10Ejegg: Fix some RecurUpgrade variable names [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011021 [03:02:33] (03PS1) 10Ejegg: Remove subpage logic for RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011023 [03:04:31] (03CR) 10CI reject: [V:04-1] Remove subpage logic for RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011023 (owner: 10Ejegg) [03:04:44] ejegg: I ran the fields on staging & they look OK - do we want to limit the activity types they apply to? [03:15:14] (03CR) 10Eileen: [C:03+1] "I ran the fields on staging & they look OK - just one question - do we want to limit the activity types they apply to?" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [03:16:56] (03PS3) 10Eileen: Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) [03:26:09] (03CR) 10CI reject: [V:04-1] Enable Damaged extension on dev [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011013 (https://phabricator.wikimedia.org/T357469) (owner: 10Eileen) [03:34:52] (03PS1) 10Ejegg: Add wmf_ params to recur upgrade URL, remove subpage [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/1011025 [03:39:58] (03Abandoned) 10Ejegg: WIP rescue reference for adyen capture job [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/997970 (owner: 10Ejegg) [03:51:43] (03PS2) 10Ejegg: Remove subpage logic for RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011023 [03:51:43] (03PS1) 10Ejegg: Validate checksum and contact_id in RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011026 [03:58:36] (03PS5) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [04:00:21] eileen: oh, I was thinking of that limit, but can we do multiple types? [04:01:24] (03CR) 10Ejegg: "Can we limit it to multiple activity types? We want to track both recurring upgrades and recurring upgrade declines" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [04:01:34] ok, really |away now [04:35:23] (03CR) 10Eileen: [C:03+1] "it's multiple select in the ui" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [04:43:57] 06Fundraising-Backlog, 10Recurring-Donations, 07recurring upgrade: RecurUpgrade: error message for donors with no upgradable recur - https://phabricator.wikimedia.org/T360052#9629114 (10MSuijkerbuijk_WMF) The right URL for a new recurring donation should be a direct link to donate.wiki. This improves donors'... [06:01:43] (03PS3) 10Wfan: Update description for following recurrings [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1009579 (https://phabricator.wikimedia.org/T356963) [06:04:51] 03Fundraising Sprint: didAnyoneTryThis(), 03Fundraising Sprint: explain($LikeImFive), 06Fundraising-Backlog, 13Patch-For-Review: Recurring transaction information from dLocal console - https://phabricator.wikimedia.org/T356963#9629142 (10AnnWF) >>! In T356963#9627153, @Cstone wrote: > Taking this over from... [06:24:40] (03CR) 10CI reject: [V:04-1] Update description for following recurrings [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1009579 (https://phabricator.wikimedia.org/T356963) (owner: 10Wfan) [06:27:14] (03PS4) 10Wfan: Update description for following recurrings [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1009579 (https://phabricator.wikimedia.org/T356963) [10:38:45] 03Fundraising Sprint: didAnyoneTryThis(), 06Fundraising-Backlog, 10FR-email-preferences, 10MW-1.42-notes (1.42.0-wmf.22; 2024-03-12): 14Create variant version of Recurring Upgrade landing page - 14https://phabricator.wikimedia.org/T356370#9629488 (10ehughes) 14Hi @Ejegg , I've attached a Zip with an u... [14:32:17] (03CR) 10Ejegg: "Oh man, the db storage for that is horrible! They just concatenate the values, so to say it extends activity types 165, 168, and 166 they " [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [14:33:59] grr, now I can't sign in to civi gitlab? [14:35:51] ooh, 502 bad gateway at https://civicrm.org/user/login [14:47:00] (03PS8) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [14:47:00] (03PS6) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [14:49:27] (03CR) 10CI reject: [V:04-1] Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [14:49:37] (03CR) 10CI reject: [V:04-1] Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [14:54:57] 06Fundraising-Backlog, 10Recurring-Donations, 07recurring upgrade: RecurUpgrade: error message for donors with no upgradable recur - https://phabricator.wikimedia.org/T360052#9631405 (10AMJohnson) ^ Like this option that gives them a link and also how to contact us for support should they need it. Thanks @MS... [15:07:35] 06Fundraising-Backlog: New recurring donation that gets stopped at auth makes INVALID_RECURRING Recurring donation, but no subscription ID or recurring payment token found. - https://phabricator.wikimedia.org/T360122 (10Cstone) 03NEW [15:07:37] 06Fundraising-Backlog: ACH recurring link not working - https://phabricator.wikimedia.org/T360123 (10EMartin) 03NEW [15:14:52] 06Fundraising-Backlog: Create links to incorporate ACH into Banners and Emails - https://phabricator.wikimedia.org/T360124 (10EMartin) 03NEW [15:26:23] 06Fundraising-Backlog: ACH recurring link not working - https://phabricator.wikimedia.org/T360123#9631529 (10Cstone) I see them in adyen now but not in civi. Looking into this, ids: 204454862.1 VSR43RVD5MCNT872 204449922.1 MMDZMTPNKQ9DP672 [16:25:11] PROBLEM - check_puppetrun on civi1002 is CRITICAL: CRITICAL: Puppet has 1 failures. Last run 6 minutes ago with 1 failures. Failed resources (up to 3 shown): Service[coworker] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=civi1002&service=check_puppetrun [16:27:26] ^^^ that should clear in a sec. puppet runs are already clear. [16:30:15] RECOVERY - check_puppetrun on civi1002 is OK: OK: Puppet is currently enabled, last run 3 minutes ago with 0 failures https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=civi1002&service=check_puppetrun [16:41:52] 03Fundraising Sprint: didAnyoneTryThis(), 06Fundraising-Backlog, 10FR-email-preferences, 10MW-1.42-notes (1.42.0-wmf.23; 2024-03-19): 14Redirect to ThankYou wiki after completing upgrade - 14https://phabricator.wikimedia.org/T359578#9631753 (10ehughes) 14Thank you @Ejegg , perfect! [17:55:27] 06Fundraising-Backlog: Import error pages expiring - https://phabricator.wikimedia.org/T360137 (10MDemosWMF) 03NEW [18:05:23] 06Fundraising-Backlog: Civi batch data entry tool build out - https://phabricator.wikimedia.org/T360139 (10MDemosWMF) 03NEW [18:30:56] 03Fundraising Tech - Chaos Crew, 06Fundraising-Backlog, 13Patch-For-Review: Autorescue: successful donations are losing their names and becoming Anonymous - https://phabricator.wikimedia.org/T359985#9632208 (10Damilare) [18:32:35] 03Fundraising Tech - Chaos Crew, 06Fundraising-Backlog: AutoRescue message causing duplicates in Civi contact contribution record - https://phabricator.wikimedia.org/T360140 (10Damilare) 03NEW [18:48:08] 06Fundraising-Backlog, 10fundraising-tech-ops: Request access to CIVI Staging - https://phabricator.wikimedia.org/T358042#9632330 (10greg) [18:48:39] (03PS1) 10Damilare Adedoyin: Do not attempt to capture message from AutoRescue message, attempt capture for Authorisation message only. [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1011164 (https://phabricator.wikimedia.org/T360140) [18:53:35] cstone: here's the smashpig patch for the double donations in Civi [18:53:39] ^^^ [19:35:45] (03PS11) 10Ejegg: Use a getter for language [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1010688 (owner: 10Eileen) [19:35:58] (03CR) 10Ejegg: [C:03+2] Use a getter for language [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1010688 (owner: 10Eileen) [19:36:36] (03PS9) 10Ejegg: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) [19:36:37] (03PS7) 10Ejegg: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) [19:37:51] thanks damilare ! [19:39:21] (03PS1) 10Ejegg: Update RecurUpgrade css [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011175 [19:39:44] (03PS3) 10Ejegg: Add wmf_* tracking fields to RecurUpgrade message [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011014 (https://phabricator.wikimedia.org/T360047) [19:40:06] (03PS2) 10Ejegg: Update RecurUpgrade css [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011175 [19:40:26] ok cstone, I C+2ed the fix for blanking the language [19:40:35] nice ejegg|food [19:42:32] when you're done with the autorescue stuff could I beg some time to review more recurring upgrade stuff? I'd be happy to do a call [19:43:50] I just got back and didnt start anything yet, I can look at the upgrade first [19:45:01] 06Fundraising-Backlog: Mapping Import Project - Engage import - https://phabricator.wikimedia.org/T360150 (10MDemosWMF) 03NEW [19:45:56] if you want to do a call ejegg or is it just the utm stuff? or the activity stuff to i guess would be in that [19:45:57] 06Fundraising-Backlog: Mapping Import Project - Engage import - https://phabricator.wikimedia.org/T360150#9632437 (10MDemosWMF) Here is the screenshot of the error {F42626924} [19:46:16] (03PS3) 10Ejegg: Update RecurUpgrade css [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011175 (https://phabricator.wikimedia.org/T356370) [19:53:15] cstone: there are a few things - UTM, styles, some cleanup [19:54:14] (03Merged) 10jenkins-bot: Use a getter for language [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1010688 (owner: 10Eileen) [19:55:36] oh i need to do one more civi patch to send firstname to the recurUpgrade page rather than display name [19:56:23] ejegg: gerrit is not straight forward is the wmf_ stuff on top of the remove bad data one ? [19:56:29] should I start on that bad data one and then rebase? [19:58:39] cstone: oh yeah, I rebased on top of the language one after I C+2ed the language on [19:58:42] *one [19:58:51] but I think the language one just merged [19:59:00] so there should be no need to rebase I think [19:59:25] ah just in DI [19:59:43] like looking at this one https://gerrit.wikimedia.org/r/c/mediawiki/extensions/DonationInterface/+/1011018/2 [20:00:47] ah i see [20:01:02] lemme rebase that cleanup on top of the style stuff [20:01:10] so it's just one chain [20:01:21] thanks@ [20:02:22] (03PS1) 10Ejegg: Update title for RecurUpgrade page [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011176 [20:02:45] (03PS3) 10Ejegg: Remove BAD_DATA_SESSION_KEY stuff from RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011018 [20:02:46] (03PS3) 10Ejegg: Fix some RecurUpgrade variable names [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011021 [20:02:48] (03PS2) 10Ejegg: Validate checksum and contact_id in RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011026 [20:02:54] (03PS3) 10Ejegg: Remove subpage logic for RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011023 [20:03:00] ok, there it is in one straight line [20:03:19] thank you! [20:03:57] so I'm following some feedback in a google doc: https://docs.google.com/document/d/1o1O6SSl05LD5NvIjrgOOHcFp0mi5gW9ak89iQOcisTE/edit [20:05:20] (03Abandoned) 10Damilare Adedoyin: Skip normalize message in autorescue recur consume [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1010631 (owner: 10Damilare Adedoyin) [20:05:33] (03PS1) 10Ejegg: Update default recurring upgrade options [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011177 [20:06:18] I could make phabs for each of those tasks if we wanted to go by the book [20:06:49] 03Fundraising Tech - Chaos Crew, 06Fundraising-Backlog: Ensure Damaged UI shows "Not Found" when a message no longer exist - https://phabricator.wikimedia.org/T359437#9632466 (10Damilare) a:03Damilare [20:07:20] (03PS1) 10Ejegg: Return donor first name for RecurUpgrade page [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011178 [20:14:55] ejegg: for the first patch is it if its the url itll pass back through on the recurring-upgrade queue? [20:15:31] ahh i know why ignore that ejegg [20:18:06] oh yeah, there's a patch in the fr-dev settings repo to add that to the URLs from the Civi UI: https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/dev/+/1011025?usp=dashboard [20:18:37] but.. it also removes the /recurUpgrade subpage, so it really goes along with the much later RecurUpgrade patch that removes the need for that [20:18:41] (03CR) 10Cstone: [C:03+2] "looks good!" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011014 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [20:19:48] thanks! [20:19:52] its ok ejegg I had the patch chedkout in DI not on donor wiki that was my issue [20:20:16] ahh yeah i keep getting into the wrong DI directory here too [20:21:06] (03CR) 10Cstone: [C:03+2] Update RecurUpgrade css [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011175 (https://phabricator.wikimedia.org/T356370) (owner: 10Ejegg) [20:21:25] (03CR) 10Cstone: [C:03+2] "ah hah I was confused by this earlier" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011176 (owner: 10Ejegg) [20:24:26] (03CR) 10Cstone: [C:03+2] Remove BAD_DATA_SESSION_KEY stuff from RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011018 (owner: 10Ejegg) [20:26:30] (03PS1) 10Eileen: Return handling for tags & groups to import classes [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011181 (https://phabricator.wikimedia.org/T357471) [20:26:54] (03CR) 10Cstone: [C:03+2] Fix some RecurUpgrade variable names [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011021 (owner: 10Ejegg) [20:27:18] (03Merged) 10jenkins-bot: Add wmf_* tracking fields to RecurUpgrade message [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011014 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [20:27:21] (03Merged) 10jenkins-bot: Update RecurUpgrade css [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011175 (https://phabricator.wikimedia.org/T356370) (owner: 10Ejegg) [20:27:26] (03Merged) 10jenkins-bot: Update title for RecurUpgrade page [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011176 (owner: 10Ejegg) [20:27:36] (03Merged) 10jenkins-bot: Remove BAD_DATA_SESSION_KEY stuff from RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011018 (owner: 10Ejegg) [20:28:41] (03Merged) 10jenkins-bot: Fix some RecurUpgrade variable names [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011021 (owner: 10Ejegg) [20:29:46] (03CR) 10Cstone: [C:03+2] Validate checksum and contact_id in RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011026 (owner: 10Ejegg) [20:31:23] (03PS1) 10Umherirrender: Change Maintenance::error to Maintenance::fatalError [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011182 [20:33:58] ejegg: is there a matching patch to remove the extra /recurUpgrade? [20:34:07] or just that we oculd do that? [20:34:10] could [20:34:18] cstone there's the fr-dev settings patch here: https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/dev/+/1011025?usp=dashboard [20:34:27] ahh ah okay in that one [20:34:28] and on prod it's got a UI setting [20:34:33] i see ok cool [20:35:40] 06Fundraising-Backlog: Explore whether we can activate Acoustic web tracking on our donation forms and thank you pages - https://phabricator.wikimedia.org/T360151 (10DBu-WMF) 03NEW [20:36:32] (03CR) 10Cstone: [C:03+2] "nice!" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011023 (owner: 10Ejegg) [20:36:47] :) [20:36:47] (03CR) 10Cstone: [C:03+2] Update default recurring upgrade options [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011177 (owner: 10Ejegg) [20:36:59] thanks so much cstone! [20:37:16] let me know if anything on the Civi side needs explanation [20:37:35] ejegg: do you have any reservations about this - https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/1011181 - I'm expecting a test battle so won't take it on if you don't think it's a good thing to do [20:38:09] there's some annoying noise in the first patch to add the activity types before they are used in the subtype extends [20:38:34] eileen: nope, I'm not too worried about the tags stuff moving [20:38:45] cool [20:39:19] eileen: has anyone every complained about how Civi stores the multiple subtype extends in the db? [20:39:28] it's atrocious [20:39:44] I want to extend activity types 165, 166, and 168 [20:39:50] and it stores 165166168 [20:39:57] lol - I expect Coleman would have an opinion about it! But I think most people don't see it very often [20:40:09] then does an RLIKE on the field to see if the activity type matches [20:40:12] - I presume it stores it with those hex(1) separators [20:40:23] ohhhh is there something in there? [20:40:31] gawd i hope so [20:40:51] yeah - you often can't see them depending on how you view the data [20:41:30] ok, whew [20:42:23] ahhh yeah, good old CRM_Core_DAO::VALUE_SEPARATOR [20:43:56] invisible separators?? [20:46:05] ejegg: with the first civi patch its ok that its not backwards compatible because we dont have any of these on live? [20:46:12] (03CR) 10CI reject: [V:04-1] Return handling for tags & groups to import classes [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011181 (https://phabricator.wikimedia.org/T357471) (owner: 10Eileen) [20:46:12] with the activites i mean [20:46:46] oh i think it should end up backwards compatible anyway! [20:46:55] The values are hard-coded [20:47:06] hmm all the activies are gone [20:47:07] it just moves where they get created [20:47:08] in the UI [20:47:12] oh really? [20:47:21] the thumbs up and down [20:47:31] ah dang, I had done a rebuild [20:47:48] oh, try running that cvapi command to sync them [20:47:51] ah does it work on a rebuild I can try that [20:47:56] new ones arent showing up either [20:48:09] Did you run the sync custom groups command? [20:48:50] yeah [20:49:33] ah dang [20:49:33] (03Merged) 10jenkins-bot: Validate checksum and contact_id in RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011026 (owner: 10Ejegg) [20:49:49] i see them in the db [20:50:07] oh weird, just not in the UI? [20:50:19] er sorry the fields got created lemme look in the activity [20:51:27] (03Merged) 10jenkins-bot: Remove subpage logic for RecurUpgrade [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011023 (owner: 10Ejegg) [20:51:29] (03Merged) 10jenkins-bot: Update default recurring upgrade options [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011177 (owner: 10Ejegg) [20:51:29] hmm, maybe I could keep the mgd files in there, if it deletes the entities when I delete that file [20:52:14] where would those mgd file ones live in the db [20:52:32] i think they are gone [21:01:46] the mgd files are in the filesystem [21:01:56] sorry, lemme do the rebuild locally [21:02:12] eileen: ejegg that getter patch fixes the language bug then? or does it need another patch on top? [21:02:25] cstone: I think that fixes the language bug [21:02:31] ok cool ill deploy that then [21:02:34] yeah it should do [21:02:49] I'm not sure if any other fields are inappropriately updated [21:02:59] those were the only ones I saw [21:03:28] sorry cstone, i'm rebuilding locally to try the upgrade with the mgd file gone and still there [21:06:51] (03PS1) 10Cstone: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1011184 [21:07:34] ejegg: where do they live in the db [21:09:21] they create civicrm_option_value entries [21:10:11] haha i just dont want to rebuild i guess i cant put it off any more [21:10:36] (03CR) 10Cstone: [C:03+2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1011184 (owner: 10Cstone) [21:10:56] (03CR) 10Cstone: [V:03+2 C:03+2] Add wmf_ params to recur upgrade URL, remove subpage [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/1011025 (owner: 10Ejegg) [21:11:27] (03Merged) 10jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1011184 (owner: 10Cstone) [21:18:16] !log civicrm upgraded from ee785ecd to e40ebb2a [21:18:19] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [21:23:56] the affected autorescue peeps and like 5 extra I need to remove are in a group called autorescue anon [21:26:18] ok ejegg got it back! [21:26:32] (03CR) 10Cstone: [C:03+2] Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [21:26:53] oh really cstone? how did it come back? [21:27:11] i rebuilt [21:27:25] ahhh, i guess I want to make sure they don't go away on prod [21:27:34] I might have to restore that mgd in a follow-on patch [21:27:51] ok, my pre-patch rebuild is done, trying the upgrade [21:28:08] ah i see sorry misread what you meant [21:36:23] hmmm now i dont seem to have the activity tracking table was i accidentally on the old branch when rebuilding [21:37:39] nuu haha [21:38:35] ejegg: ok yeah I think it is losing the thumbs up and down they are gone again for me (failed at rebuilding on the patch) [21:41:33] ugh, yeah, they're gone for me too [21:41:42] ok, I'm just going to put the mgd file back [21:42:36] it never actually merged want me to stop that? [21:42:40] its still zuuling [21:42:46] nah [21:42:50] ok [21:42:51] I'll do it in a follow-on patch [21:42:59] and just not deploy till both are in [21:43:41] (03PS1) 10Ejegg: Restore RecurUpgrade activity types in mgd [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011188 [21:44:15] (03CR) 10Cstone: [C:03+2] "looks good!" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [21:45:51] (03CR) 10Cstone: [C:03+2] "looks good!" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011178 (owner: 10Ejegg) [21:46:06] (03CR) 10Cstone: [C:03+2] Restore RecurUpgrade activity types in mgd [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011188 (owner: 10Ejegg) [21:48:06] (03Merged) 10jenkins-bot: Add custom fields for Activity tracking [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011009 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [21:48:50] ejegg: I think I got them all? I have a hard stop in like 40 mins [21:55:46] thanks so much cstone! [21:55:54] yep, i think that's all of [21:55:56] 'em [21:56:35] since im here an extra night we are going to a basketball game : [21:56:36] :P [22:02:07] (03Merged) 10jenkins-bot: Save Tracking fields for RecurUpgrade messages [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011019 (https://phabricator.wikimedia.org/T360047) (owner: 10Ejegg) [22:04:16] (03Merged) 10jenkins-bot: Return donor first name for RecurUpgrade page [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011178 (owner: 10Ejegg) [22:04:17] (03Merged) 10jenkins-bot: Restore RecurUpgrade activity types in mgd [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011188 (owner: 10Ejegg) [22:11:51] (03CR) 10Cstone: [C:03+2] "looks good, thanks!" [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1011164 (https://phabricator.wikimedia.org/T360140) (owner: 10Damilare Adedoyin) [22:12:21] (03Merged) 10jenkins-bot: Do not attempt to capture message from AutoRescue message, attempt capture for Authorisation message only. [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1011164 (https://phabricator.wikimedia.org/T360140) (owner: 10Damilare Adedoyin) [22:12:36] gona deploy that smashpig fix [22:15:08] (03PS1) 10Cstone: Merge branch 'master' into deployment [wikimedia/fundraising/SmashPig] (deployment) - 10https://gerrit.wikimedia.org/r/1011197 [22:15:20] thanks cstone [22:15:46] damilare: i didn [22:15:48] whops [22:15:54] i didn't look at the ach stuff at all hah [22:16:08] (03CR) 10Cstone: [C:03+2] Merge branch 'master' into deployment [wikimedia/fundraising/SmashPig] (deployment) - 10https://gerrit.wikimedia.org/r/1011197 (owner: 10Cstone) [22:16:23] no worries, I'd check it out tomorrow [22:16:33] (03Merged) 10jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/SmashPig] (deployment) - 10https://gerrit.wikimedia.org/r/1011197 (owner: 10Cstone) [22:17:54] !log SmashPig upgraded from e8dec926 to cc80c042 [22:17:56] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [22:18:39] confirmed language bug fixed for auto rescue woo! [22:30:04] (03PS2) 10Eileen: Return handling for tags & groups to import classes [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011181 (https://phabricator.wikimedia.org/T357471) [22:33:56] ok, after another rebuild-on-deployment and upgrade I'm satisfied that's not going to break the activity types on production [22:35:07] (03PS1) 10Ejegg: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1011198 [22:35:12] (03CR) 10Ejegg: [C:03+2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1011198 (owner: 10Ejegg) [22:40:07] (03Merged) 10jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1011198 (owner: 10Ejegg) [22:40:45] (03PS1) 10Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - 10https://gerrit.wikimedia.org/r/1011200 [22:41:02] (03CR) 10Ejegg: [C:03+2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - 10https://gerrit.wikimedia.org/r/1011200 (owner: 10Ejegg) [22:42:31] (03Merged) 10jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - 10https://gerrit.wikimedia.org/r/1011200 (owner: 10Ejegg) [22:44:52] !log donorwiki upgraded from 32789f89 to 6ea55e72 [22:44:55] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [22:45:21] !log fundraising civicrm upgraded from e40ebb2a to 87d72bd7 [22:45:23] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [22:47:26] (03CR) 10CI reject: [V:04-1] Return handling for tags & groups to import classes [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011181 (https://phabricator.wikimedia.org/T357471) (owner: 10Eileen) [22:49:03] (03PS3) 10Eileen: Return handling for tags & groups to import classes [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011181 (https://phabricator.wikimedia.org/T357471) [23:11:21] (03CR) 10CI reject: [V:04-1] Return handling for tags & groups to import classes [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1011181 (https://phabricator.wikimedia.org/T357471) (owner: 10Eileen) [23:27:15] 03Fundraising Sprint: explain($LikeImFive), 06Fundraising-Backlog, 10FR-donorservices, 10Recurring-Donations, 10MW-1.42-notes (1.42.0-wmf.23; 2024-03-19): Track which email people clicked to upgrade their recurring donation - https://phabricator.wikimedia.org/T360047#9632912 (10Ejegg) This is deployed to... [23:27:43] 14Fundraising Sprint: didAnyoneTryThis(), 06Fundraising-Backlog, 10FR-email-preferences, 10MW-1.42-notes (1.42.0-wmf.23; 2024-03-19): 14Create variant version of Recurring Upgrade landing page - 14https://phabricator.wikimedia.org/T356370#9632913 (10Ejegg) 14@ehughes thanks for the new CSS! I've just... [23:29:16] (03CR) 10Jforrester: [C:03+2] tests: Remove redundant MainCacheType assignment [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011022 (owner: 10Krinkle) [23:29:57] (03CR) 10Jforrester: [C:03+2] Change Maintenance::error to Maintenance::fatalError [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011182 (owner: 10Umherirrender) [23:36:46] (03Abandoned) 10Ejegg: Delete unreachable code [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/992216 (https://phabricator.wikimedia.org/T336024) (owner: 10Ejegg) [23:55:04] (03Merged) 10jenkins-bot: tests: Remove redundant MainCacheType assignment [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011022 (owner: 10Krinkle) [23:55:07] (03Merged) 10jenkins-bot: Change Maintenance::error to Maintenance::fatalError [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1011182 (owner: 10Umherirrender)