Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Implemented issue #2703 - Added new placetel outbound support for call logging.

Browse source
This commit is contained in:
Martin Edenhofer 2019-08-16 14:10:36 +02:00
parent 93c5708ba8
commit b0a806e886
2 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/models/cti/driver/placetel.rb
View file

@ -12,14 +12,13 @@ class Cti::Driver::Placetel < Cti::Driver::Base
params['event'] = 'newCall'
elsif params['event'] == 'HungUp'
params['event'] = 'hangup'
elsif params['event'] == 'OutgoingCall'
params['direction'] = 'out'
params['event'] = 'newCall'
elsif params['event'] == 'CallAccepted'
params['event'] = 'answer'
end
if params['user'].blank? && params['peer'].present?
params['user'] = get_voip_user_by_peer(params['peer'])
end
# lookup current direction if not given
if params['direction'].blank?
entry = Cti::Log.find_by(call_id: params[:call_id])
@ -28,6 +27,19 @@ class Cti::Driver::Placetel < Cti::Driver::Base
end
end
# lookup caller if not given
if params['user'].blank?
# by from parameter for outgoing calls
if params['direction'] == 'out' && params['from']&.include?('@')
params['user'] = get_voip_user_by_peer(params['from'])
end
# by peer parameter for incoming calls
if params['direction'] == 'in' && params['peer'].present?
params['user'] = get_voip_user_by_peer(params['peer'])
end
end
# do case mapping
if params['type'] == 'missed'
params['cause'] = 'cancel'

40
spec/requests/integration/placetel_spec.rb
View file

@ -111,7 +111,7 @@ RSpec.describe 'Integration Placetel', type: :request do
expect(reason).to eq('busy')
# outbound - I - set default_caller_id
params = 'event=newCall&direction=out&from=030600000000&to=01114100300&call_id=8621106404543334274-3'
params = 'event=OutgoingCall&direction=out&from=030600000000&to=01114100300&call_id=8621106404543334274-3'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
@ -128,7 +128,7 @@ RSpec.describe 'Integration Placetel', type: :request do
expect(number_to_dail).to eq('01114100300')
# outbound - II - set caller_id based on routing_table by explicite number
params = 'event=newCall&direction=out&from=030600000000&to=491714000000&call_id=8621106404543334274-4'
params = 'event=OutgoingCall&direction=out&from=030600000000&to=491714000000&call_id=8621106404543334274-4'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
@ -145,7 +145,7 @@ RSpec.describe 'Integration Placetel', type: :request do
expect(number_to_dail).to eq('491714000000')
# outbound - III - set caller_id based on routing_table by 41*
params = 'event=newCall&direction=out&from=030600000000&to=4147110000000&call_id=8621106404543334274-5'
params = 'event=OutgoingCall&direction=out&from=030600000000&to=4147110000000&call_id=8621106404543334274-5'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
@ -179,7 +179,7 @@ RSpec.describe 'Integration Placetel', type: :request do
token = Setting.get('placetel_token')
# outbound - I - new call
params = 'event=newCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-1'
params = 'event=OutgoingCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-1'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
log = Cti::Log.find_by(call_id: '1234567890-1')
@ -223,7 +223,7 @@ RSpec.describe 'Integration Placetel', type: :request do
travel 1.second
# outbound - II - new call
params = 'event=newCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-2'
params = 'event=OutgoingCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-2'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
log = Cti::Log.find_by(call_id: '1234567890-2')
@ -543,7 +543,7 @@ RSpec.describe 'Integration Placetel', type: :request do
token = Setting.get('placetel_token')
# outbound - I - new call
params = 'event=newCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-1&peer=something@example.com'
params = 'event=OutgoingCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-1&peer=something@example.com'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
log = Cti::Log.find_by(call_id: '1234567890-1')
@ -564,18 +564,19 @@ RSpec.describe 'Integration Placetel', type: :request do
config = Setting.get('placetel_config')
config[:api_token] = '123'
config[:outbound][:default_caller_id] = ''
Setting.set('placetel_config', config)
stub_request(:post, 'https://api.placetel.de/api/getVoIPUsers.json')
.to_return(status: 200, body: [{ 'callerid' => '03055571600', 'did' => 10, 'name' => 'Bob Smith', 'stype' => 3, 'uid' => '777008478072@example.com', 'uid2' => nil }, { 'callerid' => '03055571600', 'did' => 12, 'name' => 'Josef Müller', 'stype' => 3, 'uid' => '777042617425@example.com', 'uid2' => nil }].to_json)
params = 'event=newCall&direction=out&from=030600000000&to=01114100300&call_id=1234567890-2&peer=777008478072@example.com'
params = 'event=OutgoingCall&direction=out&to=099999222222&call_id=1234567890-2&from=777008478072@example.com'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
log = Cti::Log.find_by(call_id: '1234567890-2')
expect(log).to be_truthy
expect(log.from).to eq('4930777000000')
expect(log.to).to eq('01114100300')
expect(log.from).to eq('777008478072@example.com')
expect(log.to).to eq('099999222222')
expect(log.direction).to eq('out')
expect(log.from_comment).to eq('Bob Smith')
expect(log.to_comment).to eq('CallerId Customer1')
@ -591,6 +592,27 @@ RSpec.describe 'Integration Placetel', type: :request do
# check if cache is filled
expect(Cache.get('placetelGetVoipUsers')['777008478072@example.com']).to eq('Bob Smith')
params = 'event=IncomingCall&direction=in&to=030600000000&from=012345&call_id=1234567890-3&peer=777008478072@example.com'
post "/api/v1/placetel/#{token}", params: params
expect(response).to have_http_status(:ok)
log = Cti::Log.find_by(call_id: '1234567890-3')
expect(log).to be_truthy
expect(log.from).to eq('012345')
expect(log.to).to eq('030600000000')
expect(log.direction).to eq('in')
expect(log.from_comment).to eq(nil)
expect(log.to_comment).to eq('Bob Smith')
expect(log.comment).to be_nil
expect(log.state).to eq('newCall')
expect(log.done).to eq(false)
expect(log.initialized_at).to be_truthy
expect(log.start_at).to be_nil
expect(log.end_at).to be_nil
expect(log.duration_waiting_time).to be_nil
expect(log.duration_talking_time).to be_nil
# check if cache is filled
expect(Cache.get('placetelGetVoipUsers')['777008478072@example.com']).to eq('Bob Smith')
end
end
end