#741 Исправил проблемы логирования истории звонков.

mikopbx · Nov 12, 2024 · eae7a01 · eae7a01
1 parent 8e32cf3
commit eae7a01
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/Core/Workers/Libs/WorkerCallEvents/ActionHangupChan.php b/src/Core/Workers/Libs/WorkerCallEvents/ActionHangupChan.php
@@ -218,7 +218,7 @@ private static function regMissedCall(array $data, int $tmpCdrCount): void
         $data['start'] = date("Y-m-d H:i:s.v", $time);
         $data['endtime'] = $data['end'];
 
-        InsertDataToDB::execute($data);
+        InsertDataToDB::execute($data, $data['agi_channel']);
     }
 
     /**

diff --git a/src/Core/Workers/Libs/WorkerCallEvents/ActionTransferDialHangup.php b/src/Core/Workers/Libs/WorkerCallEvents/ActionTransferDialHangup.php
@@ -128,7 +128,7 @@ private static function fillNotAnsweredCdr(WorkerCallEvents $worker, array $data
             'bind' => [
                 'linkedid' => $data['linkedid'],
                 'src_chan' => $data['TRANSFERERNAME'],
-                'dst_chan' => $data['dst_chan'],
+                'dst_chan' => empty($data['dst_chan'])?$data['agi_channel']:$data['dst_chan'],
             ],
         ];
         /** @var CallDetailRecordsTmp $m_data */

diff --git a/src/Core/Workers/Libs/WorkerCallEvents/InsertDataToDB.php b/src/Core/Workers/Libs/WorkerCallEvents/InsertDataToDB.php
@@ -36,26 +36,30 @@ class InsertDataToDB
      * Execute the insertion of data into the database.
      *
      * @param array $data The data to be inserted.
+     * @param string $channel Channel data, additional filter.
      * @return void
      */
-    public static function execute($data): void
+    public static function execute($data, string $channel = ''): void
     {
         if (empty($data['UNIQUEID'])) {
             SystemMessages::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty ' . json_encode($data), LOG_DEBUG);
             return;
         }
 
         $is_new = false;
+        $filter = [
+            "UNIQUEID=:id: AND linkedid=:linkedid:",
+            'bind' => [
+                'id' => $data['UNIQUEID'],
+                'linkedid' => $data['linkedid']
+            ],
+        ];
+        if($channel !== ''){
+            $filter[0].=  " AND (src_chan = :chan: OR dst_chan = :chan: )";
+            $filter['bind']['chan'] = $channel;
+        }
         /** @var CallDetailRecordsTmp $m_data */
-        $m_data = CallDetailRecordsTmp::findFirst(
-            [
-                "UNIQUEID=:id: AND linkedid=:linkedid:",
-                'bind' => [
-                    'id' => $data['UNIQUEID'],
-                    'linkedid' => $data['linkedid']
-                ],
-            ]
-        );
+        $m_data = CallDetailRecordsTmp::findFirst($filter);
         if ($m_data === null) {
             // Create a new call record.
             $m_data = new CallDetailRecordsTmp();