[ADD] search uniqeid or linkedid

Author: shurshilov

README.md

@@ -64,7 +64,7 @@ uvicorn main:app --host 127.0.0.1 --port 8082 --log-level debug
 ```
 or
 ```bash
-python3 -m uvicorn main:app --host 127.0.0.1 --port 8082 --log-level debug
+python3 -m uvicorn main:app --host 127.0.0.1 --port 8082 --log-level debug --workers 2
 ```
 
 ### 2 Variant. Start on docker.

const.py

@@ -1 +1 @@
-VERSION = "1.0.9"
+VERSION = "1.1.0"

routers/history_calls.py

@@ -26,7 +26,7 @@ async def calls_history_uniqueid(
         req.app.state.connector_database
     )
 
-    return await connector_database.get_cdr_uniqueid(uniqueid)
+    return await connector_database.get_cdr_uniqueid_or_linkedid(uniqueid)
 
 
 @router.get("/api/calls/hisroty/")

services/database.py

@@ -49,6 +49,13 @@ async def get_cdr_uniqueid(self, uniqueid):
             uniqueid -- id of call in asterisk
         """
 
+    async def get_cdr_uniqueid_or_linkedid(self, uniqueid):
+        """Return calls history
+
+        Arguments:
+            uniqueid -- id of call in asterisk
+        """
+
     async def get_cdr(self, start_date, end_date, uniqueid=None):
         """Return calls history
 
@@ -102,6 +109,20 @@ async def get_cdr_uniqueid(self, uniqueid):
                     result.append(row)
         return result
 
+    async def get_cdr_uniqueid_or_linkedid(self, uniqueid):
+        import aiosqlite
+
+        result = []
+        async with aiosqlite.connect(self.config.db_host) as database:
+            database.row_factory = aiosqlite.Row
+            async with database.execute(
+                f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid= %s or linkedid = %s;",
+                [uniqueid, uniqueid],
+            ) as cursor:
+                async for row in cursor:
+                    result.append(row)
+        return result
+
     async def get_cdr(self, start_date, end_date):
         import aiosqlite
 
@@ -202,6 +223,17 @@ async def get_cdr_uniqueid(self, uniqueid):
         conn.close()
         return rows
 
+    async def get_cdr_uniqueid_or_linkedid(self, uniqueid):
+        conn, cur = await self.get_conn_cur()
+        await cur.execute(
+            f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid = %s or linkedid = %s;",
+            (uniqueid, uniqueid),
+        )
+        rows = await cur.fetchall()
+        await cur.close()
+        conn.close()
+        return rows
+
     async def get_cdr(self, start_date, end_date):
         conn, cur = await self.get_conn_cur()
         await cur.execute(
@@ -280,6 +312,16 @@ async def get_cdr_uniqueid(self, uniqueid):
         await conn.close()
         return rows
 
+    async def get_cdr_uniqueid_or_linkedid(self, uniqueid):
+        conn, cur = await self.get_conn_cur()
+        await cur.execute(
+            f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid = %s or linkedid = %s;",
+            (uniqueid, uniqueid),
+        )
+        rows = await cur.fetchall()
+        await conn.close()
+        return rows
+
     async def get_cdr(self, start_date, end_date):
         conn, cur = await self.get_conn_cur()
         await cur.execute(