From 2f5c6541fc8efba09a08e7979a08c0c6de060f99 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 10:41:59 -0700
Subject: [PATCH] Add an "Activated Epoch" and an "Acquired Epoch" to Drydock
 Leases

Summary: Ref T13189. See PHI690. When a lease is first acquired or activated, note the time. This supports better visibility into queue lengths. For now, this is only queryable via DB and visible in the UI, but can be more broadly exposed in the future.

Test Plan: Landed a revision, saw the leases get sensible timestamps for acquisition/activation.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19613
---
 .../20180827.drydock.01.acquired.sql          |  2 ++
 .../20180827.drydock.02.activated.sql         |  2 ++
 .../controller/DrydockLeaseViewController.php | 24 +++++++++++++++++++
 .../drydock/storage/DrydockLease.php          | 20 ++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 resources/sql/autopatches/20180827.drydock.01.acquired.sql
 create mode 100644 resources/sql/autopatches/20180827.drydock.02.activated.sql

diff --git a/resources/sql/autopatches/20180827.drydock.01.acquired.sql b/resources/sql/autopatches/20180827.drydock.01.acquired.sql
new file mode 100644
index 0000000000..55948391c9
--- /dev/null
+++ b/resources/sql/autopatches/20180827.drydock.01.acquired.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_drydock.drydock_lease
+  ADD acquiredEpoch INT UNSIGNED;
diff --git a/resources/sql/autopatches/20180827.drydock.02.activated.sql b/resources/sql/autopatches/20180827.drydock.02.activated.sql
new file mode 100644
index 0000000000..552f7b6b24
--- /dev/null
+++ b/resources/sql/autopatches/20180827.drydock.02.activated.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_drydock.drydock_lease
+  ADD activatedEpoch INT UNSIGNED;
diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
index 91a911277f..18e1d0088d 100644
--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -163,6 +163,30 @@ final class DrydockLeaseViewController extends DrydockLeaseController {
     }
     $view->addProperty(pht('Expires'), $until_display);
 
+    $acquired_epoch = $lease->getAcquiredEpoch();
+    $activated_epoch = $lease->getActivatedEpoch();
+
+    if ($acquired_epoch) {
+      $acquired_display = phabricator_datetime($acquired_epoch, $viewer);
+    } else {
+      if ($activated_epoch) {
+        $acquired_display = phutil_tag(
+          'em',
+          array(),
+          pht('Activated on Acquisition'));
+      } else {
+        $acquired_display = phutil_tag('em', array(), pht('Not Acquired'));
+      }
+    }
+    $view->addProperty(pht('Acquired'), $acquired_display);
+
+    if ($activated_epoch) {
+      $activated_display = phabricator_datetime($activated_epoch, $viewer);
+    } else {
+      $activated_display = phutil_tag('em', array(), pht('Not Activated'));
+    }
+    $view->addProperty(pht('Activated'), $activated_display);
+
     $attributes = $lease->getAttributes();
     if ($attributes) {
       $view->addSectionHeader(
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index 4cee7a5f17..866bb21b37 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -10,6 +10,8 @@ final class DrydockLease extends DrydockDAO
   protected $authorizingPHID;
   protected $attributes = array();
   protected $status = DrydockLeaseStatus::STATUS_PENDING;
+  protected $acquiredEpoch;
+  protected $activatedEpoch;
 
   private $resource = self::ATTACHABLE;
   private $unconsumedCommands = self::ATTACHABLE;
@@ -62,6 +64,22 @@ final class DrydockLease extends DrydockDAO
     $this->scheduleUpdate();
   }
 
+  public function setStatus($status) {
+    if ($status == DrydockLeaseStatus::STATUS_ACQUIRED) {
+      if (!$this->getAcquiredEpoch()) {
+        $this->setAcquiredEpoch(PhabricatorTime::getNow());
+      }
+    }
+
+    if ($status == DrydockLeaseStatus::STATUS_ACTIVE) {
+      if (!$this->getActivatedEpoch()) {
+        $this->setActivatedEpoch(PhabricatorTime::getNow());
+      }
+    }
+
+    return parent::setStatus($status);
+  }
+
   public function getLeaseName() {
     return pht('Lease %d', $this->getID());
   }
@@ -78,6 +96,8 @@ final class DrydockLease extends DrydockDAO
         'resourceType' => 'text128',
         'ownerPHID' => 'phid?',
         'resourcePHID' => 'phid?',
+        'acquiredEpoch' => 'epoch?',
+        'activatedEpoch' => 'epoch?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_resource' => array(