|
|
@@ -24,7 +24,8 @@ from src.core.callcenter.esl.constant.esl_constant import BRIDGE_VARIABLES, BRID
|
|
|
import src.core.callcenter.esl.utils.esl_event_util as EslEventUtil
|
|
|
import src.core.callcenter.esl.handler as event_handler
|
|
|
from src.core.callcenter.esl.constant.sip_header_constant import sipHeaderHoldMusic, profile1, profile2
|
|
|
-from src.core.callcenter.enumeration import CallCause, DeviceType, DelayActionEnum, HangupDir, CallType, NextType
|
|
|
+from src.core.callcenter.enumeration import CallCause, DeviceType, DelayActionEnum, HangupDir, CallType, NextType, \
|
|
|
+ Direction, CdrType
|
|
|
from src.core.callcenter.esl.handler.default_esl_event_handler import DefaultEslEventHandler
|
|
|
from src.core.callcenter.snowflake import Snowflake
|
|
|
from src.core.datasource import SERVE_HOST
|
|
|
@@ -520,6 +521,7 @@ class OutboundClient:
|
|
|
destination = self.server.agent.register(**kwargs)
|
|
|
self.server.logger.info("device_id=%s, destination=%s, kwargs=%s", device_id, destination, json.dumps(kwargs))
|
|
|
|
|
|
+ self.build_call_info(call_id, device_id, new_device_id, destination, **kwargs)
|
|
|
Cache.add_device_user_part(device_id, destination)
|
|
|
con.execute("bridge", "{sip_h_P-LIBRA-CallId=%s,sip_h_P-LIBRA-DeviceId=%s,origination_uuid=%s}user/%s"%(call_id, new_device_id, new_device_id, destination), device_id)
|
|
|
|
|
|
@@ -548,20 +550,28 @@ class OutboundClient:
|
|
|
def build_call_info(self, call_id, device_id, new_device_id, destination, **kwargs):
|
|
|
agent = Cache.get_agent_info(saasId, destination)
|
|
|
route_gateway = Cache.get_route_gateway(saasId)
|
|
|
- # call_info = CallInfo(cti_flow_id=request.cti_flow_id, call_id=call_id, agent_key=agent.agent_number,
|
|
|
- # sip_server=agent.sip_server,
|
|
|
- # caller=agent.agent_number, called=request.called, direction=Direction.INBOUND.code,
|
|
|
- # caller_display=request.caller_display, called_display=request.called_display,
|
|
|
- # call_type=request.call_type.code, call_time=now, follow_data=request.follow_data,
|
|
|
- # uuid1=request.uuid1, uuid2=request.uuid2, saas_id=saasId)
|
|
|
- # device_info = DeviceInfo(cti_flow_id=request.cti_flow_id, device_id=device_id, call_time=now,
|
|
|
- # call_id=call_id, device_type=DeviceType.AGENT.code,
|
|
|
- # agent_key=agent.agent_number, caller_display=route_gateway.name,
|
|
|
- # cdr_type=CdrType.INBOUND.code)
|
|
|
- # call_info.device_list.append(device_id)
|
|
|
+ caller = kwargs.get('Channel-Caller-ID-Number')
|
|
|
+ called = destination
|
|
|
+ now = datetime.utcnow().timestamp()
|
|
|
+
|
|
|
+ call_info = CallInfo(call_id=call_id, agent_key=agent.agent_number, sip_server=agent.sip_server,
|
|
|
+ caller=caller, called=called, direction=Direction.INBOUND.code,
|
|
|
+ call_type=CallType.BOOT_CALL.code, call_time=now,
|
|
|
+ uuid1=call_id, uuid2=device_id, saas_id=saasId)
|
|
|
+ device_custom = DeviceInfo(device_id=device_id, call_time=now,
|
|
|
+ call_id=call_id, device_type=DeviceType.CUSTOMER.code,
|
|
|
+ agent_key=agent.agent_number, caller_display=route_gateway.name,
|
|
|
+ cdr_type=CdrType.INBOUND.code)
|
|
|
+ device_bot = DeviceInfo(device_id=new_device_id, call_time=now,
|
|
|
+ call_id=call_id, device_type=DeviceType.ROBOT.code,
|
|
|
+ agent_key=agent.agent_number, caller_display=route_gateway.name,
|
|
|
+ cdr_type=CdrType.INBOUND.code)
|
|
|
+
|
|
|
+ call_info.device_list.append(device_id)
|
|
|
+ call_info.device_list.append(new_device_id)
|
|
|
# call_info.next_commands.append(NextCommand(device_id, NextType.NEXT_CALL_OTHER.code))
|
|
|
- # call_info.device_info_map = {device_id: device_info}
|
|
|
- # Cache.add_call_info(call_info)
|
|
|
+ call_info.device_info_map = {device_id: device_custom, new_device_id: device_bot}
|
|
|
+ Cache.add_call_info(call_info)
|
|
|
|
|
|
|
|
|
class CustomTCPServer(socketserver.TCPServer):
|
