fix: address PR review feedback for group conversations

- Fix nil safety in group_invites and group_join_requests controllers
  by replacing group_conversation.inbox.channel with @contact.group_channel
- Add before_action guard in group_members_controller to validate
  contact is a group with identifier before create/update/destroy
- Persist metadata locally in group_metadata_controller after
  provider calls (subject -> name, description -> additional_attributes)
- Add server-side allow_group_creation? check in groups_controller
- Add word boundary to mention regex to prevent matching inside words
- Remove useless catch clauses in groupMembers store (try/finally only)
- Default groupType to [] in customViewsHelper to prevent crash
- Fix swagger parameter name mismatch (contact_id -> id) across
  all group endpoint YML files for consistency

Author: CayoPOliveira

app/controllers/api/v1/accounts/contacts/group_invites_controller.rb

@@ -18,13 +18,7 @@ def revoke
   private
 
   def channel
-    @channel ||= group_conversation.inbox.channel
-  end
-
-  def group_conversation
-    @group_conversation ||= Current.account.conversations
-                                   .where(contact_id: @contact.id, group_type: :group, status: %i[open pending])
-                                   .first
+    @channel ||= @contact.group_channel
   end
 
   def invite_response(code)

app/controllers/api/v1/accounts/contacts/group_join_requests_controller.rb

@@ -18,12 +18,6 @@ def handle
   private
 
   def channel
-    @channel ||= group_conversation.inbox.channel
-  end
-
-  def group_conversation
-    @group_conversation ||= Current.account.conversations
-                                   .where(contact_id: @contact.id, group_type: :group, status: %i[open pending])
-                                   .first
+    @channel ||= @contact.group_channel
   end
 end

app/controllers/api/v1/accounts/contacts/group_members_controller.rb

@@ -1,6 +1,8 @@
 class Api::V1::Accounts::Contacts::GroupMembersController < Api::V1::Accounts::Contacts::BaseController
   DEFAULT_PER_PAGE = 10
 
+  before_action :ensure_group_contact, only: %i[create update destroy]
+
   def index
     authorize @contact, :show?
 
@@ -59,6 +61,12 @@ def destroy
 
   private
 
+  def ensure_group_contact
+    return if @contact.group_type_group? && @contact.identifier.present?
+
+    render json: { error: 'Contact is not a valid group' }, status: :unprocessable_entity
+  end
+
   def group_members
     GroupMember.where(group_contact: @contact)
   end

app/controllers/api/v1/accounts/contacts/group_metadata_controller.rb

@@ -12,10 +12,13 @@ def update
 
   def update_subject
     channel.update_group_subject(@contact.identifier, params[:subject])
+    @contact.update!(name: params[:subject])
   end
 
   def update_description
     channel.update_group_description(@contact.identifier, params[:description])
+    attrs = @contact.additional_attributes.merge('description' => params[:description])
+    @contact.update!(additional_attributes: attrs)
   end
 
   def channel

app/controllers/api/v1/accounts/groups_controller.rb

@@ -17,6 +17,6 @@ def create
   private
 
   def inbox_accessible?(inbox)
-    inbox.present? && Current.user.assigned_inboxes.exists?(id: inbox.id)
+    inbox.present? && Current.user.assigned_inboxes.exists?(id: inbox.id) && inbox.channel.try(:allow_group_creation?)
   end
 end

app/javascript/dashboard/helper/customViewsHelper.js

@@ -88,7 +88,7 @@ export const getValuesForFilter = (filter, params) => {
     campaigns,
     labels,
     priority,
-    group_type: groupType,
+    group_type: groupType = [],
   } = params;
   switch (attribute_key) {
     case 'status':

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

@@ -44,8 +44,6 @@ export const actions = {
     try {
       const { data } = await GroupMembersAPI.createGroup(params);
       return data;
-    } catch (error) {
-      throw new Error(error);
     } finally {
       commit(types.SET_GROUP_MEMBERS_UI_FLAG, { isCreating: false });
     }
@@ -68,8 +66,6 @@ export const actions = {
         });
       }
       commit(types.SET_GROUP_MEMBERS_META, { contactId, meta: data.meta });
-    } catch (error) {
-      throw new Error(error);
     } finally {
       commit(
         types.SET_GROUP_MEMBERS_UI_FLAG,
@@ -94,8 +90,6 @@ export const actions = {
     try {
       await GroupMembersAPI.addMembers(contactId, participants);
       await dispatch('fetch', { contactId });
-    } catch (error) {
-      throw new Error(error);
     } finally {
       commit(types.SET_GROUP_MEMBERS_UI_FLAG, { isUpdating: false });
     }
@@ -115,8 +109,6 @@ export const actions = {
     commit(types.SET_GROUP_MEMBERS_UI_FLAG, { isUpdating: true });
     try {
       await GroupMembersAPI.updateGroupMetadata(contactId, params);
-    } catch (error) {
-      throw new Error(error);
     } finally {
       commit(types.SET_GROUP_MEMBERS_UI_FLAG, { isUpdating: false });
     }

app/services/whatsapp/mention_converter_service.rb

@@ -1,7 +1,7 @@
 class Whatsapp::MentionConverterService
   MENTION_REGEX = %r{\[@([^\]]+)\]\(mention://contact/(\d+)/([^)]+)\)}
   ALL_MENTION_REGEX = %r{\[@[^\]]*\]\(mention://contact/0/all\)}
-  INCOMING_ALL_PATTERNS = /@(all|todos|everyone)/i
+  INCOMING_ALL_PATTERNS = /@(all|todos|everyone)\b/i
 
   class << self
     def extract_mentions_for_whatsapp(content, account)

spec/controllers/api/v1/accounts/groups_controller_spec.rb

@@ -12,6 +12,11 @@
     create(:inbox_member, inbox: inbox, user: agent)
     allow(Groups::CreateService).to receive(:new).and_return(create_service)
     allow(create_service).to receive(:perform)
+    Channel::WebWidget.define_method(:allow_group_creation?) { true }
+  end
+
+  after do
+    Channel::WebWidget.remove_method(:allow_group_creation?) if Channel::WebWidget.method_defined?(:allow_group_creation?)
   end
 
   describe 'POST /api/v1/accounts/{account.id}/groups' do

swagger/paths/application/contacts/group_invite.yml

@@ -1,6 +1,6 @@
 parameters:
   - $ref: '#/components/parameters/account_id'
-  - name: contact_id
+  - name: id
     in: path
     required: true
     schema: