recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Consider "all account members are disabled" to be a permanent failure when billing a Phortune subscription

Summary:
Fixes T13327. Currently, when we try to bill an account and all members are disabled, we fail temporarily and the task retries forever.

At least for now, just treat this as a permanent failure.

Test Plan:
- Used `bin/phortune invoice` to generate a normal invoice for a regular subscription.
- Disabled all the account members, then tried again. Got a helpful permanent failure:

```
$ ./bin/phortune invoice --subscription PHID-PSUB-kbedwt5cyepoc6tohjq5 --auto-range
Set current time to Mon, Jun 24, 2:47 PM.
Preparing to invoice subscription "localb.phacility.com" from Fri, May 31, 10:14 AM to Sun, Jun 30, 10:14 AM.
WARNING
Manually invoicing will double bill payment accounts if the range overlaps an
existing or future invoice. This script is intended for testing and
development, and should not be part of routine billing operations. If you
continue, you may incorrectly overcharge customers.

Really invoice this subscription? [y/N] y

[2019-06-24 14:47:57] EXCEPTION: (PhabricatorWorkerPermanentFailureException) All members of the account ("PHID-ACNT-qp54y3unedoaxgkkjpj4") for this subscription ("PHID-PSUB-kbedwt5cyepoc6tohjq5") are disabled. at [<phabricator>/src/applications/phortune/worker/PhortuneSubscriptionWorker.php:88]
arcanist(head=experimental, ref.master=d92fa96366c0, ref.experimental=db4cd55d4673), corgi(head=master, ref.master=6371578c9d32), instances(head=stable, ref.master=ba9e4a19df1c, ref.stable=37fb1f4917c7), libcore(), phabricator(head=master, ref.master=65bc481c91de, custom=11), phutil(head=master, ref.master=7adfe4e4f4a3), services(head=master, ref.master=5424383159ac)
#0 PhortuneSubscriptionWorker::doWork() called at [<phabricator>/src/infrastructure/daemon/workers/PhabricatorWorker.php:124]
#1 PhabricatorWorker::executeTask() called at [<phabricator>/src/infrastructure/daemon/workers/PhabricatorWorker.php:163]
#2 PhabricatorWorker::scheduleTask(string, array, array) called at [<phabricator>/src/applications/phortune/management/PhabricatorPhortuneManagementInvoiceWorkflow.php:169]
#3 PhabricatorPhortuneManagementInvoiceWorkflow::execute(PhutilArgumentParser) called at [<phutil>/src/parser/argument/PhutilArgumentParser.php:457]
#4 PhutilArgumentParser::parseWorkflowsFull(array) called at [<phutil>/src/parser/argument/PhutilArgumentParser.php:349]
#5 PhutilArgumentParser::parseWorkflows(array) called at [<phabricator>/scripts/setup/manage_phortune.php:21]
$
```

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13327

Differential Revision: https://secure.phabricator.com/D20613

epriestley a3397fb8 65bc481c

+23 -1
+23 -1
src/applications/phortune/worker/PhortuneSubscriptionWorker.php
··· 48 48 ->withPHIDs($account->getMemberPHIDs()) 49 49 ->execute(); 50 50 $actor = null; 51 + 52 + $any_disabled = false; 51 53 foreach ($members as $member) { 52 54 53 55 // Don't act as a disabled user. If all of the users on the account are 54 56 // disabled this means we won't charge the subscription, but that's 55 57 // probably correct since it means no one can cancel or pay it anyway. 56 58 if ($member->getIsDisabled()) { 59 + $any_disabled = true; 57 60 continue; 58 61 } 59 62 ··· 63 66 } 64 67 65 68 if (!$actor) { 66 - throw new Exception(pht('Failed to load actor to bill subscription!')); 69 + if ($any_disabled) { 70 + $message = pht( 71 + 'All members of the account ("%s") for this subscription ("%s") '. 72 + 'are disabled.', 73 + $account->getPHID(), 74 + $subscription->getPHID()); 75 + } else if ($account->getMemberPHIDs()) { 76 + $message = pht( 77 + 'Unable to load any of the members of the account ("%s") for this '. 78 + 'subscription ("%s").', 79 + $account->getPHID(), 80 + $subscription->getPHID()); 81 + } else { 82 + $message = pht( 83 + 'The account ("%s") for this subscription ("%s") has no '. 84 + 'members.', 85 + $account->getPHID(), 86 + $subscription->getPHID()); 87 + } 88 + throw new PhabricatorWorkerPermanentFailureException($message); 67 89 } 68 90 69 91 $cart = $account->newCart($actor, $cart_implementation, $merchant);