[ADD] cdr history also by uniqeid

Author: shurshilov

const.py

@@ -1 +1 @@
-VERSION = "1.0.3"
+VERSION = "1.0.4"

routers/history_calls.py

@@ -8,19 +8,25 @@
 
 from dependencies.auth import verify_basic_auth
 from exceptions.exceptions import BusinessError
+from schemas.config_schema import Id
 from services.database import MysqlStrategy, PostgresqlStrategy, SqliteStrategy
 
 log = logging.getLogger("asterisk_agent")
 router = APIRouter(tags=["API"], dependencies=[Depends(verify_basic_auth)])
 
 
 @router.get("/api/calls/hisroty/")
-async def calls_history(req: Request, start_date: AwareDatetime, end_date: AwareDatetime):
-    """Return calls history
-
+async def calls_history(
+    req: Request,
+    start_date: AwareDatetime,
+    end_date: AwareDatetime,
+    uniqueid: Id = None,
+):
+    """
     Arguments:
         start_date -- start date
         end_date -- end date
+        uniqueid -- id of call in asterisk
 
     Raises:
         BusinessError: The start date cannot be greater than or equal to the end date
@@ -37,4 +43,4 @@ async def calls_history(req: Request, start_date: AwareDatetime, end_date: Aware
         req.app.state.connector_database
     )
 
-    return await connector_database.get_cdr(start_date, end_date)
+    return await connector_database.get_cdr(start_date, end_date, uniqueid)

schemas/config_schema.py

@@ -11,6 +11,7 @@
 HttpURL = Annotated[Url, UrlConstraints(allowed_schemes=["http", "https"], max_length=2048)]
 WsURL = Annotated[Url, UrlConstraints(allowed_schemes=["ws", "wss"], max_length=2048)]
 TcpPort = Annotated[int, Field(ge=0, le=65535)]
+Id = Annotated[int, Field(ge=1, le=4294967295)]
 
 
 class DbConfig(BaseModel):

services/database.py

@@ -42,12 +42,13 @@ def __init__(self, config: Config) -> None:
     async def check_cdr_old(self):
         """Check that Asterisk cdr have start column or not"""
 
-    async def get_cdr(self, start_date, end_date):
+    async def get_cdr(self, start_date, end_date, uniqueid=None):
         """Return calls history
 
         Arguments:
             start_date -- start date of calls
             end_date -- end date of calls
+            uniqueid -- id of call in asterisk
         """
 
     async def get_cel(self, start_date, end_date):
@@ -81,19 +82,27 @@ async def check_cdr_old(self):
                     self.cdr_start_field = "calldate"
                     return
 
-    async def get_cdr(self, start_date, end_date):
+    async def get_cdr(self, start_date, end_date, uniqueid=None):
         import aiosqlite
 
         # host==path "/var/lib/asterisk/astdb.sqlite3"
         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 {self.cdr_start_field} >= %s and {self.cdr_start_field} <= %s limit 100000;",
-                [start_date, end_date],
-            ) as cursor:
-                async for row in cursor:
-                    result.append(row)
+            if uniqueid:
+                async with database.execute(
+                    f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid= %s limit 1;",
+                    [uniqueid],
+                ) as cursor:
+                    async for row in cursor:
+                        result.append(row)
+            else:
+                async with database.execute(
+                    f"SELECT * FROM {self.config.db_table_cdr_name} where {self.cdr_start_field} >= %s and {self.cdr_start_field} <= %s limit 100000;",
+                    [start_date, end_date],
+                ) as cursor:
+                    async for row in cursor:
+                        result.append(row)
         return result
 
     async def get_cel(self, start_date, end_date):
@@ -171,12 +180,18 @@ async def check_cdr_old(self):
             self.cdr_start_field = "calldate"
             return
 
-    async def get_cdr(self, start_date, end_date):
+    async def get_cdr(self, start_date, end_date, uniqueid=None):
         conn, cur = await self.get_conn_cur()
-        await cur.execute(
-            f"SELECT * FROM {self.config.db_table_cdr_name} where {self.cdr_start_field} >= %s and {self.cdr_start_field} <= %s limit 100000;",
-            (start_date, end_date),
-        )
+        if uniqueid:
+            await cur.execute(
+                f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid = %s limit 1;",
+                (uniqueid),
+            )
+        else:
+            await cur.execute(
+                f"SELECT * FROM {self.config.db_table_cdr_name} where {self.cdr_start_field} >= %s and {self.cdr_start_field} <= %s limit 100000;",
+                (start_date, end_date),
+            )
         rows = await cur.fetchall()
         await cur.close()
         conn.close()
@@ -239,12 +254,18 @@ async def check_cdr_old(self):
             self.cdr_start_field = "calldate"
             return
 
-    async def get_cdr(self, start_date, end_date):
+    async def get_cdr(self, start_date, end_date, uniqueid=None):
         conn, cur = await self.get_conn_cur()
-        await cur.execute(
-            f"SELECT * FROM {self.config.db_table_cdr_name} where {self.cdr_start_field} >= %s and {self.cdr_start_field} <= %s limit 100000;",
-            (start_date, end_date),
-        )
+        if uniqueid:
+            await cur.execute(
+                f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid = %s limit 1;",
+                (uniqueid),
+            )
+        else:
+            await cur.execute(
+                f"SELECT * FROM {self.config.db_table_cdr_name} where {self.cdr_start_field} >= %s and {self.cdr_start_field} <= %s limit 100000;",
+                (start_date, end_date),
+            )
         rows = await cur.fetchall()
         await conn.close()
         return rows