[ADD] history uniqueid as diff route

Author: shurshilov

const.py

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

routers/history_calls.py

@@ -15,18 +15,26 @@
 router = APIRouter(tags=["API"], dependencies=[Depends(verify_basic_auth)])
 
 
-@router.get("/api/calls/hisroty/")
-async def calls_history(
+@router.get("/api/calls/hisroty/uniqueid")
+async def calls_history_uniqueid(
     req: Request,
-    start_date: AwareDatetime,
-    end_date: AwareDatetime,
-    uniqueid: Id = None,
+    uniqueid: Id,
 ):
+    log.info("HISTORY UNIQUEID")
+
+    connector_database: PostgresqlStrategy | MysqlStrategy | SqliteStrategy = (
+        req.app.state.connector_database
+    )
+
+    return await connector_database.get_cdr_uniqueid(uniqueid)
+
+
+@router.get("/api/calls/hisroty/")
+async def calls_history(req: Request, start_date: AwareDatetime, end_date: AwareDatetime):
     """
     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
@@ -43,4 +51,4 @@ async def calls_history(
         req.app.state.connector_database
     )
 
-    return await connector_database.get_cdr(start_date, end_date, uniqueid)
+    return await connector_database.get_cdr(start_date, end_date)

schemas/config_schema.py

@@ -11,7 +11,8 @@
 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)]
+# Id = Annotated[int, Field(ge=1, le=4294967295)]
+Id = Annotated[str, Field(max_length=128, min_length=3)]
 
 
 class DbConfig(BaseModel):

services/database.py

@@ -42,13 +42,19 @@ 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_uniqueid(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
 
         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):
@@ -82,27 +88,32 @@ async def check_cdr_old(self):
                     self.cdr_start_field = "calldate"
                     return
 
-    async def get_cdr(self, start_date, end_date, uniqueid=None):
+    async def get_cdr_uniqueid(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 limit 1;",
+                [uniqueid],
+            ) as cursor:
+                async for row in cursor:
+                    result.append(row)
+        return result
+
+    async def get_cdr(self, start_date, end_date):
         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
-            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)
+            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):
@@ -180,18 +191,23 @@ async def check_cdr_old(self):
             self.cdr_start_field = "calldate"
             return
 
-    async def get_cdr(self, start_date, end_date, uniqueid=None):
+    async def get_cdr_uniqueid(self, uniqueid):
         conn, cur = await self.get_conn_cur()
-        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),
-            )
+        await cur.execute(
+            f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid = %s limit 1;",
+            (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(
+            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()
@@ -254,18 +270,22 @@ async def check_cdr_old(self):
             self.cdr_start_field = "calldate"
             return
 
-    async def get_cdr(self, start_date, end_date, uniqueid=None):
+    async def get_cdr_uniqueid(self, uniqueid):
         conn, cur = await self.get_conn_cur()
-        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),
-            )
+        await cur.execute(
+            f"SELECT * FROM {self.config.db_table_cdr_name} where uniqueid = %s limit 1;",
+            (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(
+            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