Reduce code duplication in Phortune account controllers

Summary:
Ref T12451. This is a GREAT comment (A++) but we only need one copy of it.

This uses a pattern similar to Projects, which is a little weird but works well enough.

Test Plan:
  - Viewed all four tabs of an account.
  - Viewed a page with a bad account ID which 404'd properly.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12451

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

src/__phutil_library_map__.php

@@ -4338,6 +4338,7 @@ phutil_register_library_map(array(
     'PhortuneAccountAddManagerController' => 'applications/phortune/controller/account/PhortuneAccountAddManagerController.php',
     'PhortuneAccountBillingController' => 'applications/phortune/controller/account/PhortuneAccountBillingController.php',
     'PhortuneAccountChargeListController' => 'applications/phortune/controller/account/PhortuneAccountChargeListController.php',
+    'PhortuneAccountController' => 'applications/phortune/controller/account/PhortuneAccountController.php',
     'PhortuneAccountEditController' => 'applications/phortune/controller/account/PhortuneAccountEditController.php',
     'PhortuneAccountEditEngine' => 'applications/phortune/editor/PhortuneAccountEditEngine.php',
     'PhortuneAccountEditor' => 'applications/phortune/editor/PhortuneAccountEditor.php',
@@ -9815,6 +9816,7 @@ phutil_register_library_map(array(
     'PhortuneAccountAddManagerController' => 'PhortuneController',
     'PhortuneAccountBillingController' => 'PhortuneAccountProfileController',
     'PhortuneAccountChargeListController' => 'PhortuneController',
+    'PhortuneAccountController' => 'PhortuneController',
     'PhortuneAccountEditController' => 'PhortuneController',
     'PhortuneAccountEditEngine' => 'PhabricatorEditEngine',
     'PhortuneAccountEditor' => 'PhabricatorApplicationTransactionEditor',
@@ -9823,7 +9825,7 @@ phutil_register_library_map(array(
     'PhortuneAccountManagerController' => 'PhortuneAccountProfileController',
     'PhortuneAccountNameTransaction' => 'PhortuneAccountTransactionType',
     'PhortuneAccountPHIDType' => 'PhabricatorPHIDType',
-    'PhortuneAccountProfileController' => 'PhortuneController',
+    'PhortuneAccountProfileController' => 'PhortuneAccountController',
     'PhortuneAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhortuneAccountSubscriptionController' => 'PhortuneAccountProfileController',
     'PhortuneAccountTransaction' => 'PhabricatorModularTransaction',

src/applications/phortune/controller/account/PhortuneAccountBillingController.php

@@ -4,29 +4,12 @@ final class PhortuneAccountBillingController
   extends PhortuneAccountProfileController {
 
   public function handleRequest(AphrontRequest $request) {
-    $viewer = $this->getViewer();
+    $response = $this->loadAccount();
-
+    if ($response) {
-    // TODO: Currently, you must be able to edit an account to view the detail
+      return $response;
-    // page, because the account must be broadly visible so merchants can
-    // process orders but merchants should not be able to see all the details
-    // of an account. Ideally this page should be visible to merchants, too,
-    // just with less information.
-    $can_edit = true;
-
-    $account = id(new PhortuneAccountQuery())
-      ->setViewer($viewer)
-      ->withIDs(array($request->getURIData('id')))
-      ->requireCapabilities(
-        array(
-          PhabricatorPolicyCapability::CAN_VIEW,
-          PhabricatorPolicyCapability::CAN_EDIT,
-        ))
-      ->executeOne();
-    if (!$account) {
-      return new Aphront404Response();
     }
 
-    $this->setAccount($account);
+    $account = $this->getAccount();
     $title = $account->getName();
 
     $crumbs = $this->buildApplicationCrumbs();

src/applications/phortune/controller/account/PhortuneAccountController.php

@@ -0,0 +1,64 @@
+<?php
+
+abstract class PhortuneAccountController
+  extends PhortuneController {
+
+  private $account;
+
+  protected function getAccount() {
+    return $this->account;
+  }
+
+  protected function buildApplicationCrumbs() {
+    $crumbs = parent::buildApplicationCrumbs();
+
+    $account = $this->getAccount();
+    if ($account) {
+      $crumbs->addTextCrumb($account->getName(), $account->getURI());
+    }
+
+    return $crumbs;
+  }
+
+  protected function loadAccount() {
+    // TODO: Currently, you must be able to edit an account to view the detail
+    // page, because the account must be broadly visible so merchants can
+    // process orders but merchants should not be able to see all the details
+    // of an account. Ideally the profile pages should be visible to merchants,
+    // too, just with less information.
+    return $this->loadAccountForEdit();
+  }
+
+
+  protected function loadAccountForEdit() {
+    $viewer = $this->getViewer();
+    $request = $this->getRequest();
+
+    $account_id = $request->getURIData('accountID');
+    if (!$account_id) {
+      $account_id = $request->getURIData('id');
+    }
+
+    if (!$account_id) {
+      return new Aphront404Response();
+    }
+
+    $account = id(new PhortuneAccountQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($account_id))
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->executeOne();
+    if (!$account) {
+      return new Aphront404Response();
+    }
+
+    $this->account = $account;
+
+    return null;
+  }
+
+}

src/applications/phortune/controller/account/PhortuneAccountManagerController.php

@@ -4,29 +4,12 @@ final class PhortuneAccountManagerController
   extends PhortuneAccountProfileController {
 
   public function handleRequest(AphrontRequest $request) {
-    $viewer = $this->getViewer();
+    $response = $this->loadAccount();
-
+    if ($response) {
-    // TODO: Currently, you must be able to edit an account to view the detail
+      return $response;
-    // page, because the account must be broadly visible so merchants can
-    // process orders but merchants should not be able to see all the details
-    // of an account. Ideally this page should be visible to merchants, too,
-    // just with less information.
-    $can_edit = true;
-
-    $account = id(new PhortuneAccountQuery())
-      ->setViewer($viewer)
-      ->withIDs(array($request->getURIData('id')))
-      ->requireCapabilities(
-        array(
-          PhabricatorPolicyCapability::CAN_VIEW,
-          PhabricatorPolicyCapability::CAN_EDIT,
-        ))
-      ->executeOne();
-    if (!$account) {
-      return new Aphront404Response();
     }
 
-    $this->setAccount($account);
+    $account = $this->getAccount();
     $title = $account->getName();
 
     $crumbs = $this->buildApplicationCrumbs();
@@ -66,6 +49,7 @@ final class PhortuneAccountManagerController
       ->setText(pht('New Manager'))
       ->setIcon('fa-plus')
       ->setWorkflow(true)
+      ->setDisabled(!$can_edit)
       ->setHref("/phortune/account/manager/add/{$id}/");
 
     $header = id(new PHUIHeaderView())

src/applications/phortune/controller/account/PhortuneAccountProfileController.php

@@ -1,18 +1,7 @@
 <?php
 
 abstract class PhortuneAccountProfileController
-  extends PhortuneController {
+  extends PhortuneAccountController {
-
-  private $account;
-
-  public function setAccount(PhortuneAccount $account) {
-    $this->account = $account;
-    return $this;
-  }
-
-  public function getAccount() {
-    return $this->account;
-  }
 
   public function buildApplicationMenu() {
     return $this->buildSideNavView()->getMenu();
@@ -34,12 +23,6 @@ abstract class PhortuneAccountProfileController
   protected function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
     $crumbs->setBorder(true);
-
-    $account = $this->getAccount();
-    if ($account) {
-      $crumbs->addTextCrumb($account->getName(), $account->getURI());
-    }
-
     return $crumbs;
   }
 

src/applications/phortune/controller/account/PhortuneAccountSubscriptionController.php

@@ -4,29 +4,12 @@ final class PhortuneAccountSubscriptionController
   extends PhortuneAccountProfileController {
 
   public function handleRequest(AphrontRequest $request) {
-    $viewer = $this->getViewer();
+    $response = $this->loadAccount();
-
+    if ($response) {
-    // TODO: Currently, you must be able to edit an account to view the detail
+      return $response;
-    // page, because the account must be broadly visible so merchants can
-    // process orders but merchants should not be able to see all the details
-    // of an account. Ideally this page should be visible to merchants, too,
-    // just with less information.
-    $can_edit = true;
-
-    $account = id(new PhortuneAccountQuery())
-      ->setViewer($viewer)
-      ->withIDs(array($request->getURIData('id')))
-      ->requireCapabilities(
-        array(
-          PhabricatorPolicyCapability::CAN_VIEW,
-          PhabricatorPolicyCapability::CAN_EDIT,
-        ))
-      ->executeOne();
-    if (!$account) {
-      return new Aphront404Response();
     }
 
-    $this->setAccount($account);
+    $account = $this->getAccount();
     $title = $account->getName();
 
     $crumbs = $this->buildApplicationCrumbs();

src/applications/phortune/controller/account/PhortuneAccountViewController.php

@@ -4,32 +4,16 @@ final class PhortuneAccountViewController
   extends PhortuneAccountProfileController {
 
   public function handleRequest(AphrontRequest $request) {
-    $viewer = $this->getViewer();
+    $response = $this->loadAccount();
-    $id = $request->getURIData('accountID');
+    if ($response) {
-
+      return $response;
-    // TODO: Currently, you must be able to edit an account to view the detail
-    // page, because the account must be broadly visible so merchants can
-    // process orders but merchants should not be able to see all the details
-    // of an account. Ideally this page should be visible to merchants, too,
-    // just with less information.
-    $can_edit = true;
-
-    $account = id(new PhortuneAccountQuery())
-      ->setViewer($viewer)
-      ->withIDs(array($id))
-      ->requireCapabilities(
-        array(
-          PhabricatorPolicyCapability::CAN_VIEW,
-          PhabricatorPolicyCapability::CAN_EDIT,
-        ))
-      ->executeOne();
-    if (!$account) {
-      return new Aphront404Response();
     }
 
-    $this->setAccount($account);
+    $account = $this->getAccount();
     $title = $account->getName();
 
+    $viewer = $this->getViewer();
+
     $invoices = id(new PhortuneCartQuery())
       ->setViewer($viewer)
       ->withAccountPHIDs(array($account->getPHID()))