mirror of
				https://github.com/lingble/chatwoot.git
				synced 2025-10-30 18:47:51 +00:00 
			
		
		
		
	 b28c08059f
			
		
	
	b28c08059f
	
	
	
		
			
			# Pull Request Template ## Description This PR fixes the incorrect contact access in conversations listing API. Cause: - `undefined method 'conversations' for nil` error because `@contact` is not initialized Solution: - Using `@contact_inbox` to access `@contact` - `@contact_inbox` is properly set in the parent controller's `set_contact_inbox` method Fixes https://linear.app/chatwoot/issue/CW-4185/incorrect-contact-access-pattern-in ## Type of change Please delete options that are not relevant. - [x] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
		
			
				
	
	
		
			68 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::InboxesController
 | |
|   include Events::Types
 | |
|   before_action :set_conversation, only: [:toggle_typing, :update_last_seen, :show, :toggle_status]
 | |
| 
 | |
|   def index
 | |
|     @conversations = @contact_inbox.hmac_verified? ? @contact_inbox.contact.conversations : @contact_inbox.conversations
 | |
|   end
 | |
| 
 | |
|   def show; end
 | |
| 
 | |
|   def create
 | |
|     @conversation = create_conversation
 | |
|   end
 | |
| 
 | |
|   def toggle_status
 | |
|     # Check if the conversation is already resolved to prevent redundant operations
 | |
|     return if @conversation.resolved?
 | |
| 
 | |
|     # Assign the conversation's contact as the resolver
 | |
|     # This step attributes the resolution action to the contact involved in the conversation
 | |
|     # If this assignment is not made, the system implicitly becomes the resolver by default
 | |
|     Current.contact = @conversation.contact
 | |
| 
 | |
|     # Update the conversation's status to 'resolved' to reflect its closure
 | |
|     @conversation.status = :resolved
 | |
|     @conversation.save!
 | |
|   end
 | |
| 
 | |
|   def toggle_typing
 | |
|     case params[:typing_status]
 | |
|     when 'on'
 | |
|       trigger_typing_event(CONVERSATION_TYPING_ON)
 | |
|     when 'off'
 | |
|       trigger_typing_event(CONVERSATION_TYPING_OFF)
 | |
|     end
 | |
|     head :ok
 | |
|   end
 | |
| 
 | |
|   def update_last_seen
 | |
|     @conversation.contact_last_seen_at = DateTime.now.utc
 | |
|     @conversation.save!
 | |
|     ::Conversations::UpdateMessageStatusJob.perform_later(@conversation.id, @conversation.contact_last_seen_at)
 | |
|     head :ok
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def set_conversation
 | |
|     @conversation = if @contact_inbox.hmac_verified?
 | |
|                       @contact_inbox.contact.conversations.find_by!(display_id: params[:id])
 | |
|                     else
 | |
|                       @contact_inbox.conversations.find_by!(display_id: params[:id])
 | |
|                     end
 | |
|   end
 | |
| 
 | |
|   def create_conversation
 | |
|     ConversationBuilder.new(params: conversation_params, contact_inbox: @contact_inbox).perform
 | |
|   end
 | |
| 
 | |
|   def trigger_typing_event(event)
 | |
|     Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: @conversation.contact)
 | |
|   end
 | |
| 
 | |
|   def conversation_params
 | |
|     params.permit(custom_attributes: {})
 | |
|   end
 | |
| end
 |