sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Groups WIP #2

Browse source
This commit is contained in:
Darren Clarke 2025-07-08 18:03:01 +02:00
parent 7be5cb1478
commit a55e939592
4 changed files with 265 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

99
packages/zammad-addon-bridge/src/app/controllers/channels_cdr_signal_controller.rb
View file

@ -147,17 +147,11 @@ class ChannelsCdrSignalController < ApplicationController
receiver_phone_number = params[:to].strip
sender_phone_number = params[:from].strip
# Check if this is a group message using the isGroup flag from bridge-worker
# Check if this is a group message using the is_group flag from bridge-worker
# This flag is set when:
# 1. The original message came from a Signal group
# 2. Bridge-worker created a new group for the conversation
# 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
# 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)
is_group_message = params[:is_group].to_s == 'true' || params[:is_group].to_s == 'true'
customer = User.find_by(phone: sender_phone_number)
customer ||= User.find_by(mobile: sender_phone_number)
@ -211,47 +205,38 @@ 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 (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
if is_group_message
Rails.logger.info "=== SIGNAL GROUP TICKET LOOKUP ==="
Rails.logger.info "Looking for ticket with group_id: #{group_id}"
Rails.logger.info "Looking for ticket with group_id: #{receiver_phone_number}"
Rails.logger.info "Customer ID: #{customer.id}"
Rails.logger.info "Customer Phone: #{sender_phone_number}"
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)
.order(updated_at: :desc)
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
has_channel_id = has_preferences && t.preferences['channel_id'] == channel.id
if has_cdr_signal && has_channel_id
stored_chat_id = t.preferences['cdr_signal']['chat_id']
Rails.logger.info " - stored_chat_id: #{stored_chat_id}"
Rails.logger.info " - incoming_group_id: #{receiver_phone_number}"
matches = receiver_phone_number == chat_id
Rails.logger.info " - MATCH: #{matches}"
matches
else
Rails.logger.info "Ticket ##{t.number} has no cdr_signal preferences"
Rails.logger.info "Ticket ##{t.number} has no cdr_signal preferences or wrong channel"
false
end
rescue => e
@ -259,15 +244,15 @@ class ChannelsCdrSignalController < ApplicationController
false
end
end
if ticket
Rails.logger.info "=== FOUND MATCHING TICKET: ##{ticket.number} ==="
Rails.logger.info "=== FOUND MATCHING TICKET BY GROUP ID: ##{ticket.number} ==="
else
Rails.logger.info "=== NO MATCHING TICKET FOUND - WILL CREATE NEW ==="
Rails.logger.info "=== NO MATCHING TICKET BY GROUP ID - CHECKING BY PHONE NUMBER ==="
end
rescue ActiveRecord::StatementInvalid => e
Rails.logger.error "Error finding ticket by group_id: #{e.message}"
ticket = nil
rescue => e
Rails.logger.error "Error during group ticket lookup: #{e.message}"
Rails.logger.error e.backtrace.join("\n")
end
else
Rails.logger.info "Not a group message or no group_id, finding most recent ticket"
@ -281,28 +266,19 @@ class ChannelsCdrSignalController < ApplicationController
ticket.state = Ticket::State.find_by(default_follow_up: true) if ticket.state_id != new_state.id
else
# Set up chat_id based on whether this is a group message
chat_id = is_group_message ? group_id : sender_phone_number
chat_id = is_group_message ? receiver_phone_number : 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,
@ -316,21 +292,16 @@ class ChannelsCdrSignalController < ApplicationController
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: is_system_message ?
Ticket::Article::Sender.find_by(name: 'System').id :
Ticket::Article::Sender.find_by(name: 'Customer').id,
sender_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: params[:internal] == true || is_system_message,
internal: params[:internal] == true,
preferences: {
cdr_signal: {
timestamp: sent_at,
@ -357,9 +328,7 @@ class ChannelsCdrSignalController < ApplicationController
ticket.with_lock do
ta = article_create(ticket, article_params)
# 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)
ta.update!(type_id: Ticket::Article::Type.find_by(name: 'cdr_signal').id)
end
ticket.update!(create_article_type_id: Ticket::Article::Type.find_by(name: 'cdr_signal').id)
@ -406,7 +375,7 @@ class ChannelsCdrSignalController < ApplicationController
# Find the ticket by ID or number
# Try to find by both ID and number since ticket numbers can be numeric
ticket = Ticket.find_by(id: params[:conversation_id]) ||
ticket = Ticket.find_by(id: params[:conversation_id]) ||
Ticket.find_by(number: params[:conversation_id])
unless ticket
@ -418,8 +387,6 @@ class ChannelsCdrSignalController < ApplicationController
# Update ticket preferences with the group information
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?