Chore: Fix presence for current user (#1001)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>

app/channels/room_channel.rb

@@ -4,17 +4,22 @@ class RoomChannel < ApplicationCable::Channel
     current_user
     current_account
     update_subscription
+    broadcast_presence
   end
 
   def update_presence
     update_subscription
+    broadcast_presence
+  end
+
+  private
+
+  def broadcast_presence
     data = { account_id: @current_account.id, users: ::OnlineStatusTracker.get_available_users(@current_account.id) }
     data[:contacts] = ::OnlineStatusTracker.get_available_contacts(@current_account.id) if @current_user.is_a? User
     ActionCable.server.broadcast(@pubsub_token, { event: 'presence.update', data: data })
   end
 
-  private
-
   def ensure_stream
     @pubsub_token = params[:pubsub_token]
     stream_from @pubsub_token

app/javascript/dashboard/helper/actionCable.js

@@ -33,6 +33,7 @@ class ActionCableConnector extends BaseActionCableConnector {
   onPresenceUpdate = data => {
     this.app.$store.dispatch('contacts/updatePresence', data.contacts);
     this.app.$store.dispatch('agents/updatePresence', data.users);
+    this.app.$store.dispatch('setCurrentUserAvailabilityStatus', data.users);
   };
 
   onConversationContactChange = payload => {

app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue

@@ -163,6 +163,7 @@ export default {
     ...mapGetters({
       currentUser: 'getCurrentUser',
       currentUserId: 'getCurrentUserID',
+      currentAvailabilityStatus: 'getCurrentUserAvailabilityStatus',
     }),
   },
   watch: {
@@ -171,6 +172,11 @@ export default {
         this.initializeUser();
       }
     },
+    currentAvailabilityStatus(newStatus, oldStatus) {
+      if (newStatus !== oldStatus) {
+        this.availability = newStatus;
+      }
+    },
   },
   mounted() {
     if (this.currentUserId) {

app/javascript/dashboard/store/index.js

@@ -5,7 +5,6 @@ import accounts from './modules/accounts';
 import agents from './modules/agents';
 import auth from './modules/auth';
 import cannedResponse from './modules/cannedResponse';
-import Channel from './modules/channels';
 import contactConversations from './modules/contactConversations';
 import contacts from './modules/contacts';
 import conversationLabels from './modules/conversationLabels';
@@ -30,7 +29,6 @@ export default new Vuex.Store({
     agents,
     auth,
     cannedResponse,
-    Channel,
     contactConversations,
     contacts,
     conversationLabels,

app/javascript/dashboard/store/modules/auth.js

@@ -34,6 +34,10 @@ export const getters = {
     return _state.currentUser.id;
   },
 
+  getCurrentUserAvailabilityStatus(_state) {
+    return _state.currentUser.availability_status;
+  },
+
   getCurrentAccountId(_state) {
     return _state.currentAccountId;
   },
@@ -104,10 +108,22 @@ export const actions = {
   setCurrentAccountId({ commit }, accountId) {
     commit(types.default.SET_CURRENT_ACCOUNT_ID, accountId);
   },
+
+  setCurrentUserAvailabilityStatus({ commit, state: $state }, data) {
+    if (data[$state.currentUser.id]) {
+      commit(
+        types.default.SET_CURRENT_USER_AVAILABILITY,
+        data[$state.currentUser.id]
+      );
+    }
+  },
 };
 
 // mutations
 const mutations = {
+  [types.default.SET_CURRENT_USER_AVAILABILITY](_state, status) {
+    Vue.set(_state.currentUser, 'availability_status', status);
+  },
   [types.default.CLEAR_USER](_state) {
     _state.currentUser.id = null;
   },

app/javascript/dashboard/store/modules/channels.js

@@ -1,14 +0,0 @@
-/* eslint no-console: 0 */
-/* eslint no-param-reassign: 0 */
-
-// const chatType = 'all';
-// initial state
-const state = {};
-
-// actions
-const actions = {};
-
-export default {
-  state,
-  actions,
-};

app/javascript/dashboard/store/modules/specs/auth/actions.spec.js

@@ -67,4 +67,30 @@ describe('#actions', () => {
       expect(dispatch).toHaveBeenCalledTimes(0);
     });
   });
+
+  describe('#setCurrentUserAvailabilityStatus', () => {
+    it('sends correct mutations if user id is available', async () => {
+      actions.setCurrentUserAvailabilityStatus(
+        {
+          commit,
+          state: { currentUser: { id: 1 } },
+        },
+        { 1: 'online' }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CURRENT_USER_AVAILABILITY, 'online'],
+      ]);
+    });
+
+    it('does not send correct mutations if user id is not available', async () => {
+      actions.setCurrentUserAvailabilityStatus(
+        {
+          commit,
+          state: { currentUser: { id: 1 } },
+        },
+        {}
+      );
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
 });

app/javascript/dashboard/store/modules/specs/auth/getters.spec.js

@@ -17,4 +17,12 @@ describe('#getters', () => {
       getters.getCurrentUser({ currentUser: { id: 1, name: 'Pranav' } })
     ).toEqual({ id: 1, name: 'Pranav' });
   });
+
+  it('get', () => {
+    expect(
+      getters.getCurrentUserAvailabilityStatus({
+        currentUser: { id: 1, name: 'Pranav', availability_status: 'busy' },
+      })
+    ).toEqual('busy');
+  });
 });

app/javascript/dashboard/store/mutation-types.js

@@ -3,7 +3,7 @@ export default {
   CLEAR_USER: 'LOGOUT',
   SET_CURRENT_USER: 'SET_CURRENT_USER',
   SET_CURRENT_ACCOUNT_ID: 'SET_CURRENT_ACCOUNT_ID',
-
+  SET_CURRENT_USER_AVAILABILITY: 'SET_CURRENT_USER_AVAILABILITY',
   // Chat List
   RECEIVE_CHAT_LIST: 'RECEIVE_CHAT_LIST',
   SET_ALL_CONVERSATION: 'SET_ALL_CONVERSATION',

app/models/concerns/availability_statusable.rb

@@ -2,19 +2,29 @@ module AvailabilityStatusable
   extend ActiveSupport::Concern
 
   def online_presence?
+    return if user_profile_page_context?
+
     ::OnlineStatusTracker.get_presence(availability_account_id, self.class.name, id)
   end
 
   def availability_status
+    return availability if user_profile_page_context?
     return 'offline' unless online_presence?
     return 'online' if is_a? Contact
 
     ::OnlineStatusTracker.get_status(availability_account_id, id) || 'online'
   end
 
+  def user_profile_page_context?
+    # at the moment profile pages aren't account scoped
+    # hence we will return availability attribute instead of true presence
+    # we will revisit this later
+    is_a?(User) && Current.account.blank?
+  end
+
   def availability_account_id
     return account_id if is_a? Contact
 
-    Current.account.present? ? Current.account.id : accounts.first.id
+    Current.account.id
   end
 end

lib/online_status_tracker.rb

@@ -44,6 +44,8 @@ module OnlineStatusTracker
 
   def self.get_available_users(account_id)
     user_ids = ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'User'), (Time.zone.now - PRESENCE_DURATION).to_i, Time.now.to_i)
+    return {} if user_ids.blank?
+
     user_availabilities = ::Redis::Alfred.hmget(status_key(account_id), user_ids)
     user_ids.map.with_index { |id, index| [id, (user_availabilities[index] || 'online')] }.to_h
   end