From d902dd6589658dd565092fd1851dde08801d0711 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 31 Jul 2015 09:14:33 -0700
Subject: [PATCH] Update Nuance for handleRequest

Summary: Updates Nuance controllers

Test Plan: Read carefully, lint.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13762
---
 .../controller/NuanceItemEditController.php   | 29 ++++---------------
 .../controller/NuanceItemViewController.php   | 25 ++++------------
 .../NuanceRequestorEditController.php         | 29 ++++---------------
 .../NuanceRequestorViewController.php         | 25 ++++------------
 4 files changed, 22 insertions(+), 86 deletions(-)

diff --git a/src/applications/nuance/controller/NuanceItemEditController.php b/src/applications/nuance/controller/NuanceItemEditController.php
index b5e02cbda6..89bfbda5c9 100644
--- a/src/applications/nuance/controller/NuanceItemEditController.php
+++ b/src/applications/nuance/controller/NuanceItemEditController.php
@@ -2,33 +2,16 @@
 
 final class NuanceItemEditController extends NuanceController {
 
-  private $itemID;
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('id');
 
-  public function setItemID($item_id) {
-    $this->itemID = $item_id;
-    return $this;
-  }
-  public function getItemID() {
-    return $this->itemID;
-  }
-
-  public function willProcessRequest(array $data) {
-    $this->setItemID(idx($data, 'id'));
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
-
-    $item_id = $this->getItemID();
-    $is_new = !$item_id;
-
-    if ($is_new) {
+    if (!$id) {
       $item = new NuanceItem();
     } else {
       $item = id(new NuanceItemQuery())
-        ->setViewer($user)
-        ->withIDs(array($item_id))
+        ->setViewer($viewer)
+        ->withIDs(array($id))
         ->executeOne();
     }
 
diff --git a/src/applications/nuance/controller/NuanceItemViewController.php b/src/applications/nuance/controller/NuanceItemViewController.php
index e0ba457e89..9c7401cafe 100644
--- a/src/applications/nuance/controller/NuanceItemViewController.php
+++ b/src/applications/nuance/controller/NuanceItemViewController.php
@@ -2,28 +2,13 @@
 
 final class NuanceItemViewController extends NuanceController {
 
-  private $itemID;
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('id');
 
-  public function setItemID($item_id) {
-    $this->itemID = $item_id;
-    return $this;
-  }
-  public function getItemID() {
-    return $this->itemID;
-  }
-
-  public function willProcessRequest(array $data) {
-    $this->setItemID($data['id']);
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
-
-    $item_id = $this->getItemID();
     $item = id(new NuanceItemQuery())
-      ->setViewer($user)
-      ->withIDs(array($item_id))
+      ->setViewer($viewer)
+      ->withIDs(array($id))
       ->executeOne();
 
     if (!$item) {
diff --git a/src/applications/nuance/controller/NuanceRequestorEditController.php b/src/applications/nuance/controller/NuanceRequestorEditController.php
index 42405a227f..2efc49f711 100644
--- a/src/applications/nuance/controller/NuanceRequestorEditController.php
+++ b/src/applications/nuance/controller/NuanceRequestorEditController.php
@@ -2,34 +2,17 @@
 
 final class NuanceRequestorEditController extends NuanceController {
 
-  private $requestorID;
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('id');
 
-  public function setRequestorID($requestor_id) {
-    $this->requestorID = $requestor_id;
-    return $this;
-  }
-  public function getRequestorID() {
-    return $this->requestorID;
-  }
-
-  public function willProcessRequest(array $data) {
-    $this->setRequestorID(idx($data, 'id'));
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
-
-    $requestor_id = $this->getRequestorID();
-    $is_new = !$requestor_id;
-
-    if ($is_new) {
+    if (!$id) {
       $requestor = new NuanceRequestor();
 
     } else {
       $requestor = id(new NuanceRequestorQuery())
-        ->setViewer($user)
-        ->withIDs(array($requestor_id))
+        ->setViewer($viewer)
+        ->withIDs(array($id))
         ->executeOne();
     }
 
diff --git a/src/applications/nuance/controller/NuanceRequestorViewController.php b/src/applications/nuance/controller/NuanceRequestorViewController.php
index 08dcedb62a..8f6912c4d7 100644
--- a/src/applications/nuance/controller/NuanceRequestorViewController.php
+++ b/src/applications/nuance/controller/NuanceRequestorViewController.php
@@ -2,28 +2,13 @@
 
 final class NuanceRequestorViewController extends NuanceController {
 
-  private $requestorID;
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('id');
 
-  public function setRequestorID($requestor_id) {
-    $this->requestorID = $requestor_id;
-    return $this;
-  }
-  public function getRequestorID() {
-    return $this->requestorID;
-  }
-
-  public function willProcessRequest(array $data) {
-    $this->setRequestorID($data['id']);
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
-
-    $requestor_id = $this->getRequestorID();
     $requestor = id(new NuanceRequestorQuery())
-      ->setViewer($user)
-      ->withIDs(array($requestor_id))
+      ->setViewer($viewer)
+      ->withIDs(array($id))
       ->executeOne();
 
     if (!$requestor) {