Skip to content

Commit d1704f0

Browse files
author
epriestley
committedJun 24, 2019
(stable) 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
1 parent 09ecf49 commit d1704f0

File tree

1 file changed

+23
-1
lines changed

1 file changed

+23
-1
lines changed
 

‎src/applications/phortune/worker/PhortuneSubscriptionWorker.php

+23-1
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,15 @@ protected function doWork() {
4848
->withPHIDs($account->getMemberPHIDs())
4949
->execute();
5050
$actor = null;
51+
52+
$any_disabled = false;
5153
foreach ($members as $member) {
5254

5355
// Don't act as a disabled user. If all of the users on the account are
5456
// disabled this means we won't charge the subscription, but that's
5557
// probably correct since it means no one can cancel or pay it anyway.
5658
if ($member->getIsDisabled()) {
59+
$any_disabled = true;
5760
continue;
5861
}
5962

@@ -63,7 +66,26 @@ protected function doWork() {
6366
}
6467

6568
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);
6789
}
6890

6991
$cart = $account->newCart($actor, $cart_implementation, $merchant);

0 commit comments

Comments
 (0)
Failed to load comments.