More groups WIP
This commit is contained in:
Darren Clarke
parent
f20cd5a53c
commit
7be5cb1478
8 changed files with 488 additions and 261 deletions
|
|
@ -154,8 +154,10 @@ class ChannelsCdrSignalController < ApplicationController
|
|||
# Note: We can't rely on UUID format alone because users with privacy settings
|
||||
# may have UUID identifiers instead of phone numbers
|
||||
is_group_message = params[:isGroup] == true || params[:is_group] == true
|
||||
# If it's a group message, the 'to' field contains the group ID
|
||||
group_id = is_group_message ? params[:to] : nil
|
||||
# Group ID is now sent as a separate field to avoid 422 errors
|
||||
# when 'to' contains a UUID instead of a phone number
|
||||
group_id = params[:group_id] || (is_group_message ? params[:to] : nil)
|
||||
|
||||
|
||||
customer = User.find_by(phone: sender_phone_number)
|
||||
customer ||= User.find_by(mobile: sender_phone_number)
|
||||
|
|
@ -209,15 +211,66 @@ class ChannelsCdrSignalController < ApplicationController
|
|||
# find ticket or create one
|
||||
state_ids = Ticket::State.where(name: %w[closed merged removed]).pluck(:id)
|
||||
|
||||
# For group messages, find ticket by group_id in preferences
|
||||
if is_group_message
|
||||
ticket = Ticket.joins("LEFT JOIN tickets AS t2 ON t2.preferences::jsonb -> 'cdr_signal' ->> 'group_id' = '#{group_id}'")
|
||||
.where(customer_id: customer.id)
|
||||
.where.not(state_id: state_ids)
|
||||
.where("tickets.preferences::jsonb -> 'cdr_signal' ->> 'group_id' = ?", group_id)
|
||||
.order(:updated_at)
|
||||
.first
|
||||
# For group messages, find ticket by group_id (either UUID or internal_id)
|
||||
# Signal uses two different IDs for the same group:
|
||||
# - UUID (management ID): returned when creating groups via API
|
||||
# - internal_id (base64): used in message envelopes
|
||||
if is_group_message && group_id
|
||||
Rails.logger.info "=== SIGNAL GROUP TICKET LOOKUP ==="
|
||||
Rails.logger.info "Looking for ticket with group_id: #{group_id}"
|
||||
Rails.logger.info "Customer ID: #{customer.id}"
|
||||
Rails.logger.info "Channel ID: #{channel.id}"
|
||||
|
||||
begin
|
||||
# Find ticket using Ruby filtering to match group_id or internal_group_id
|
||||
all_tickets = Ticket.where(customer_id: customer.id)
|
||||
.where.not(state_id: state_ids)
|
||||
.order(:updated_at)
|
||||
|
||||
Rails.logger.info "Found #{all_tickets.count} active tickets for customer"
|
||||
|
||||
ticket = all_tickets.find do |t|
|
||||
begin
|
||||
has_preferences = t.preferences.is_a?(Hash)
|
||||
has_cdr_signal = has_preferences && t.preferences['cdr_signal'].is_a?(Hash)
|
||||
|
||||
if has_cdr_signal
|
||||
stored_group_id = t.preferences['cdr_signal']['group_id']
|
||||
stored_internal_id = t.preferences['cdr_signal']['internal_group_id']
|
||||
stored_channel_id = t.preferences['channel_id']
|
||||
|
||||
Rails.logger.info "Ticket ##{t.number} (ID: #{t.id}):"
|
||||
Rails.logger.info " - stored_group_id: #{stored_group_id}"
|
||||
Rails.logger.info " - stored_internal_id: #{stored_internal_id}"
|
||||
Rails.logger.info " - stored_channel_id: #{stored_channel_id}"
|
||||
Rails.logger.info " - incoming_group_id: #{group_id}"
|
||||
|
||||
# Match on either the UUID or the internal_id
|
||||
matches = group_id == stored_group_id || group_id == stored_internal_id
|
||||
Rails.logger.info " - MATCH: #{matches}"
|
||||
|
||||
matches
|
||||
else
|
||||
Rails.logger.info "Ticket ##{t.number} has no cdr_signal preferences"
|
||||
false
|
||||
end
|
||||
rescue => e
|
||||
Rails.logger.error "Error checking ticket #{t.id}: #{e.message}"
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
if ticket
|
||||
Rails.logger.info "=== FOUND MATCHING TICKET: ##{ticket.number} ==="
|
||||
else
|
||||
Rails.logger.info "=== NO MATCHING TICKET FOUND - WILL CREATE NEW ==="
|
||||
end
|
||||
rescue ActiveRecord::StatementInvalid => e
|
||||
Rails.logger.error "Error finding ticket by group_id: #{e.message}"
|
||||
ticket = nil
|
||||
end
|
||||
else
|
||||
Rails.logger.info "Not a group message or no group_id, finding most recent ticket"
|
||||
ticket = Ticket.where(customer_id: customer.id).where.not(state_id: state_ids).order(:updated_at).first
|
||||
end
|
||||
|
||||
|
|
@ -230,37 +283,54 @@ class ChannelsCdrSignalController < ApplicationController
|
|||
# Set up chat_id based on whether this is a group message
|
||||
chat_id = is_group_message ? group_id : sender_phone_number
|
||||
|
||||
# Build preferences with group_id included if needed
|
||||
cdr_signal_prefs = {
|
||||
bot_token: channel.options[:bot_token], # change to bot id
|
||||
chat_id: chat_id
|
||||
}
|
||||
|
||||
# Add group_id to preferences if this is a group message
|
||||
if is_group_message && group_id
|
||||
cdr_signal_prefs[:group_id] = group_id
|
||||
# Also store internal_group_id if provided
|
||||
cdr_signal_prefs[:internal_group_id] = params[:internal_group_id] if params[:internal_group_id].present?
|
||||
|
||||
Rails.logger.info "Creating ticket with group preferences: group_id=#{group_id}, internal_group_id=#{params[:internal_group_id]}"
|
||||
end
|
||||
|
||||
Rails.logger.info "=== CREATING NEW TICKET ==="
|
||||
Rails.logger.info "Preferences to be stored:"
|
||||
Rails.logger.info " - channel_id: #{channel.id}"
|
||||
Rails.logger.info " - cdr_signal: #{cdr_signal_prefs.inspect}"
|
||||
|
||||
ticket = Ticket.new(
|
||||
group_id: channel.group_id,
|
||||
title: title,
|
||||
customer_id: customer.id,
|
||||
preferences: {
|
||||
channel_id: channel.id,
|
||||
cdr_signal: {
|
||||
bot_token: channel.options[:bot_token], # change to bot id
|
||||
chat_id: chat_id
|
||||
}
|
||||
cdr_signal: cdr_signal_prefs
|
||||
}
|
||||
)
|
||||
|
||||
# Store group_id if this is a group message
|
||||
if is_group_message
|
||||
ticket.preferences[:cdr_signal][:group_id] = group_id
|
||||
end
|
||||
end
|
||||
|
||||
ticket.save!
|
||||
|
||||
# Check if this is a system message
|
||||
is_system_message = params[:system_message] == true || params[:from] == 'system'
|
||||
|
||||
article_params = {
|
||||
from: sender_phone_number,
|
||||
to: receiver_phone_number,
|
||||
sender_id: Ticket::Article::Sender.find_by(name: 'Customer').id,
|
||||
sender_id: is_system_message ?
|
||||
Ticket::Article::Sender.find_by(name: 'System').id :
|
||||
Ticket::Article::Sender.find_by(name: 'Customer').id,
|
||||
subject: title,
|
||||
body: body,
|
||||
content_type: 'text/plain',
|
||||
message_id: "cdr_signal.#{message_id}",
|
||||
ticket_id: ticket.id,
|
||||
internal: false,
|
||||
internal: params[:internal] == true || is_system_message,
|
||||
preferences: {
|
||||
cdr_signal: {
|
||||
timestamp: sent_at,
|
||||
|
|
@ -287,7 +357,9 @@ class ChannelsCdrSignalController < ApplicationController
|
|||
|
||||
ticket.with_lock do
|
||||
ta = article_create(ticket, article_params)
|
||||
ta.update!(type_id: Ticket::Article::Type.find_by(name: 'cdr_signal').id)
|
||||
# Use 'note' type for system messages, 'cdr_signal' for regular messages
|
||||
article_type = is_system_message ? 'note' : 'cdr_signal'
|
||||
ta.update!(type_id: Ticket::Article::Type.find_by(name: article_type).id)
|
||||
end
|
||||
|
||||
ticket.update!(create_article_type_id: Ticket::Article::Type.find_by(name: 'cdr_signal').id)
|
||||
|
|
@ -333,11 +405,9 @@ class ChannelsCdrSignalController < ApplicationController
|
|||
end
|
||||
|
||||
# Find the ticket by ID or number
|
||||
ticket = if params[:conversation_id].to_s.match?(/^\d+$/)
|
||||
Ticket.find_by(id: params[:conversation_id])
|
||||
else
|
||||
Ticket.find_by(number: params[:conversation_id])
|
||||
end
|
||||
# Try to find by both ID and number since ticket numbers can be numeric
|
||||
ticket = Ticket.find_by(id: params[:conversation_id]) ||
|
||||
Ticket.find_by(number: params[:conversation_id])
|
||||
|
||||
unless ticket
|
||||
Rails.logger.error "Signal group update: Ticket not found for conversation_id #{params[:conversation_id]}"
|
||||
|
|
@ -349,6 +419,7 @@ class ChannelsCdrSignalController < ApplicationController
|
|||
ticket.preferences ||= {}
|
||||
ticket.preferences[:cdr_signal] ||= {}
|
||||
ticket.preferences[:cdr_signal][:group_id] = params[:group_id]
|
||||
ticket.preferences[:cdr_signal][:internal_group_id] = params[:internal_group_id] if params[:internal_group_id].present?
|
||||
ticket.preferences[:cdr_signal][:chat_id] = params[:group_id]
|
||||
ticket.preferences[:cdr_signal][:original_recipient] = params[:original_recipient] if params[:original_recipient].present?
|
||||
ticket.preferences[:cdr_signal][:group_created_at] = params[:timestamp] if params[:timestamp].present?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue