fix(observables): Fix QuerySubscription to check for clientId's in result set

- See TODO comments
- Fixes #680
- Fixes #681

src/flux/models/query-subscription.coffee

@@ -125,7 +125,15 @@ class QuerySubscription
       endItem: @_lastResultSet[@_limit - 1]
 
     for item in items
-      idx = _.findIndex @_lastResultSet, ({id}) -> id is item.id
+      # TODO
+      # This logic is duplicated across DatabaseView#invalidate and
+      # ModelView#indexOf
+      #
+      # This duplication should go away when we refactor/replace DatabaseView
+      # for using observables
+      idx = _.findIndex @_lastResultSet, ({id, clientId}) ->
+        id is item.id or item.clientId is clientId
+
       itemIsInSet = idx isnt -1
       itemShouldBeInSet = item.matches(@_query.matchers())
 

src/flux/stores/database-view.coffee

@@ -206,6 +206,13 @@ class DatabaseView extends ModelView
       # of the `id` then we would erroneously say that the item isn't in
       # the set. This happens frequently in the DraftListStore when Draft
       # items persist on the server and/or turn into Message items.
+      #
+      # TODO
+      # This logic is duplicated across QuerySubscription#_optimisticallyUpdateModels
+      # and ModelView#indexOf
+      #
+      # This duplication should go away when we refactor/replace DatabaseView
+      # for using observables
       idx = @indexOfId(item.clientId)
 
       itemIsInSet = idx isnt -1