Remove "participationStatus" from ConpherenceParticipant

Summary:
Pathway to D17685. This column is a very complicated cache of: is participant.messageCount equal to thread.messageCount?

We can just ask this question with a JOIN instead and simplify things dramatically.

Test Plan:
  - Ran migration.
  - Browsed around.
  - Sent a message, saw unread count go up.
  - Read the message, saw unread count go down.

Reviewers: chad

Reviewed By: chad

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

resources/sql/autopatches/20170419.thread.02.status.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_conpherence.conpherence_participant
+  DROP participationStatus;

src/__phutil_library_map__.php

@@ -305,7 +305,6 @@ phutil_register_library_map(array(
     'ConpherenceParticipantCountQuery' => 'applications/conpherence/query/ConpherenceParticipantCountQuery.php',
     'ConpherenceParticipantQuery' => 'applications/conpherence/query/ConpherenceParticipantQuery.php',
     'ConpherenceParticipantView' => 'applications/conpherence/view/ConpherenceParticipantView.php',
-    'ConpherenceParticipationStatus' => 'applications/conpherence/constants/ConpherenceParticipationStatus.php',
     'ConpherenceQueryThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php',
     'ConpherenceQueryTransactionConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php',
     'ConpherenceReplyHandler' => 'applications/conpherence/mail/ConpherenceReplyHandler.php',
@@ -5099,7 +5098,6 @@ phutil_register_library_map(array(
     'ConpherenceParticipantCountQuery' => 'PhabricatorOffsetPagedQuery',
     'ConpherenceParticipantQuery' => 'PhabricatorOffsetPagedQuery',
     'ConpherenceParticipantView' => 'AphrontView',
-    'ConpherenceParticipationStatus' => 'ConpherenceConstants',
     'ConpherenceQueryThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
     'ConpherenceQueryTransactionConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
     'ConpherenceReplyHandler' => 'PhabricatorMailReplyHandler',

src/applications/conpherence/constants/ConpherenceParticipationStatus.php

@@ -1,8 +0,0 @@
-<?php
-
-final class ConpherenceParticipationStatus extends ConpherenceConstants {
-
-  const UP_TO_DATE = 0;
-  const BEHIND     = 1;
-
-}

src/applications/conpherence/controller/ConpherenceNotificationPanelController.php

@@ -7,7 +7,6 @@ final class ConpherenceNotificationPanelController
     $user = $request->getUser();
     $conpherences = array();
     require_celerity_resource('conpherence-notification-css');
-    $unread_status = ConpherenceParticipationStatus::BEHIND;
 
     $participant_data = id(new ConpherenceParticipantQuery())
       ->withParticipantPHIDs(array($user->getPHID()))
@@ -37,7 +36,7 @@ final class ConpherenceNotificationPanelController
           'conpherence-notification',
         );
 
-        if ($p_data->getParticipationStatus() == $unread_status) {
+        if (!$p_data->isUpToDate($conpherence)) {
           $classes[] = 'phabricator-notification-unread';
         }
         $uri = $this->getApplicationURI($conpherence->getID().'/');
@@ -95,7 +94,7 @@ final class ConpherenceNotificationPanelController
 
     $unread = id(new ConpherenceParticipantCountQuery())
       ->withParticipantPHIDs(array($user->getPHID()))
-      ->withParticipationStatus($unread_status)
+      ->withUnread(true)
       ->execute();
     $unread_count = idx($unread, $user->getPHID(), 0);
 

src/applications/conpherence/editor/ConpherenceEditor.php

@@ -173,17 +173,14 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
           $phids = $this->getPHIDTransactionNewValue($xaction, array());
           foreach ($phids as $phid) {
             if ($phid == $this->getActor()->getPHID()) {
-              $status = ConpherenceParticipationStatus::UP_TO_DATE;
               $message_count = 1;
             } else {
-              $status = ConpherenceParticipationStatus::BEHIND;
               $message_count = 0;
             }
             $participants[$phid] =
               id(new ConpherenceParticipant())
               ->setConpherencePHID($object->getPHID())
               ->setParticipantPHID($phid)
-              ->setParticipationStatus($status)
               ->setDateTouched(time())
               ->setSeenMessageCount($message_count)
               ->save();
@@ -243,17 +240,14 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
         $add = array_keys(array_diff_key($new_map, $old_map));
         foreach ($add as $phid) {
           if ($phid == $this->getActor()->getPHID()) {
-            $status = ConpherenceParticipationStatus::UP_TO_DATE;
             $message_count = $object->getMessageCount();
           } else {
-            $status = ConpherenceParticipationStatus::BEHIND;
             $message_count = 0;
           }
           $participants[$phid] =
             id(new ConpherenceParticipant())
             ->setConpherencePHID($object->getPHID())
             ->setParticipantPHID($phid)
-            ->setParticipationStatus($status)
             ->setDateTouched(time())
             ->setSeenMessageCount($message_count)
             ->save();
@@ -279,22 +273,18 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
 
           // update everyone's participation status on a message -only-
           $xaction_phid = $xaction->getPHID();
-          $behind = ConpherenceParticipationStatus::BEHIND;
-          $up_to_date = ConpherenceParticipationStatus::UP_TO_DATE;
           $participants = $object->getParticipants();
           $user = $this->getActor();
           $time = time();
           foreach ($participants as $phid => $participant) {
             if ($phid != $user->getPHID()) {
-              if ($participant->getParticipationStatus() != $behind) {
+              if ($participant->isUpToDate($object)) {
                 $participant->setSeenMessageCount(
                   $object->getMessageCount() - $message_count);
               }
-              $participant->setParticipationStatus($behind);
               $participant->setDateTouched($time);
             } else {
               $participant->setSeenMessageCount($object->getMessageCount());
-              $participant->setParticipationStatus($up_to_date);
               $participant->setDateTouched($time);
             }
             $participant->save();

src/applications/conpherence/query/ConpherenceParticipantCountQuery.php

@@ -1,73 +1,69 @@
 <?php
 
-/**
- * Query class that answers the question:
- *
- * - Q: How many unread conpherences am I participating in?
- * - A:
- *     id(new ConpherenceParticipantCountQuery())
- *     ->withParticipantPHIDs(array($my_phid))
- *     ->withParticipationStatus(ConpherenceParticipationStatus::BEHIND)
- *     ->execute();
- */
 final class ConpherenceParticipantCountQuery
   extends PhabricatorOffsetPagedQuery {
 
   private $participantPHIDs;
-  private $participationStatus;
+  private $unread;
 
   public function withParticipantPHIDs(array $phids) {
     $this->participantPHIDs = $phids;
     return $this;
   }
 
-  public function withParticipationStatus($participation_status) {
+  public function withUnread($unread) {
-    $this->participationStatus = $participation_status;
+    $this->unread = $unread;
     return $this;
   }
 
   public function execute() {
+    $thread = new ConpherenceThread();
     $table = new ConpherenceParticipant();
-    $conn_r = $table->establishConnection('r');
+    $conn = $table->establishConnection('r');
 
     $rows = queryfx_all(
-      $conn_r,
+      $conn,
-      'SELECT COUNT(*) as count, participantPHID '.
+      'SELECT COUNT(*) as count, participantPHID
-      'FROM %T participant %Q %Q %Q',
+        FROM %T participant JOIN %T thread
+        ON participant.conpherencePHID = thread.phid %Q %Q %Q',
       $table->getTableName(),
-      $this->buildWhereClause($conn_r),
+      $thread->getTableName(),
-      $this->buildGroupByClause($conn_r),
+      $this->buildWhereClause($conn),
-      $this->buildLimitClause($conn_r));
+      $this->buildGroupByClause($conn),
+      $this->buildLimitClause($conn));
 
     return ipull($rows, 'count', 'participantPHID');
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
+  protected function buildWhereClause(AphrontDatabaseConnection $conn) {
     $where = array();
 
-    if ($this->participantPHIDs) {
+    if ($this->participantPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
-        'participantPHID IN (%Ls)',
+        'participant.participantPHID IN (%Ls)',
         $this->participantPHIDs);
     }
 
-    if ($this->participationStatus !== null) {
+    if ($this->unread !== null) {
-      $where[] = qsprintf(
+      if ($this->unread) {
-        $conn_r,
+        $where[] = qsprintf(
-        'participationStatus = %d',
+          $conn,
-        $this->participationStatus);
+          'participant.seenMessageCount < thread.messageCount');
+      } else {
+        $where[] = qsprintf(
+          $conn,
+          'participant.seenMessageCount >= thread.messageCount');
+      }
     }
 
     return $this->formatWhereClause($where);
   }
 
-  private function buildGroupByClause(AphrontDatabaseConnection $conn_r) {
+  private function buildGroupByClause(AphrontDatabaseConnection $conn) {
-    $group_by = qsprintf(
+    return qsprintf(
-      $conn_r,
+      $conn,
       'GROUP BY participantPHID');
-
-    return $group_by;
   }
 
 }

src/applications/conpherence/storage/ConpherenceParticipant.php

@@ -4,7 +4,6 @@ final class ConpherenceParticipant extends ConpherenceDAO {
 
   protected $participantPHID;
   protected $conpherencePHID;
-  protected $participationStatus;
   protected $seenMessageCount;
   protected $dateTouched;
   protected $settings = array();
@@ -15,7 +14,6 @@ final class ConpherenceParticipant extends ConpherenceDAO {
         'settings' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
-        'participationStatus' => 'uint32',
         'dateTouched' => 'epoch',
         'seenMessageCount' => 'uint64',
       ),
@@ -24,12 +22,12 @@ final class ConpherenceParticipant extends ConpherenceDAO {
           'columns' => array('conpherencePHID', 'participantPHID'),
           'unique' => true,
         ),
-        'unreadCount' => array(
-          'columns' => array('participantPHID', 'participationStatus'),
-        ),
         'participationIndex' => array(
           'columns' => array('participantPHID', 'dateTouched', 'id'),
         ),
+        'key_thread' => array(
+          'columns' => array('participantPHID', 'conpherencePHID'),
+        ),
       ),
     ) + parent::getConfiguration();
   }
@@ -41,8 +39,8 @@ final class ConpherenceParticipant extends ConpherenceDAO {
   public function markUpToDate(
     ConpherenceThread $conpherence,
     ConpherenceTransaction $xaction) {
+
     if (!$this->isUpToDate($conpherence)) {
-      $this->setParticipationStatus(ConpherenceParticipationStatus::UP_TO_DATE);
       $this->setSeenMessageCount($conpherence->getMessageCount());
       $this->save();
 
@@ -55,11 +53,7 @@ final class ConpherenceParticipant extends ConpherenceDAO {
   }
 
   public function isUpToDate(ConpherenceThread $conpherence) {
-    return
+    return ($this->getSeenMessageCount() == $conpherence->getMessageCount());
-      ($this->getSeenMessageCount() == $conpherence->getMessageCount())
-        &&
-      ($this->getParticipationStatus() ==
-       ConpherenceParticipationStatus::UP_TO_DATE);
   }
 
 }

src/applications/people/cache/PhabricatorUserMessageCountCacheType.php

@@ -28,10 +28,9 @@ final class PhabricatorUserMessageCountCacheType
 
     $user_phids = mpull($users, 'getPHID');
 
-    $unread_status = ConpherenceParticipationStatus::BEHIND;
     $unread = id(new ConpherenceParticipantCountQuery())
       ->withParticipantPHIDs($user_phids)
-      ->withParticipationStatus($unread_status)
+      ->withUnread(true)
       ->execute();
 
     $empty = array_fill_keys($user_phids, 0);