Remove crawl_id to crawlId

Author: tw4l

backend/btrixcloud/crawl_logs.py

@@ -33,31 +33,31 @@ async def init_index(self):
         """init index for crawl logs"""
         await self.logs.create_index(
             [
-                ("crawl_id", pymongo.HASHED),
+                ("crawlId", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
                 ("qaRunId", pymongo.ASCENDING),
                 ("timestamp", pymongo.ASCENDING),
             ]
         )
         await self.logs.create_index(
             [
-                ("crawl_id", pymongo.HASHED),
+                ("crawlId", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
                 ("qaRunId", pymongo.ASCENDING),
                 ("logLevel", pymongo.ASCENDING),
             ]
         )
         await self.logs.create_index(
             [
-                ("crawl_id", pymongo.HASHED),
+                ("crawlId", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
                 ("qaRunId", pymongo.ASCENDING),
                 ("context", pymongo.ASCENDING),
             ]
         )
         await self.logs.create_index(
             [
-                ("crawl_id", pymongo.HASHED),
+                ("crawlId", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
                 ("qaRunId", pymongo.ASCENDING),
                 ("message", pymongo.ASCENDING),
@@ -87,7 +87,7 @@ async def add_log_line(
 
             log_to_add = CrawlLogLine(
                 id=uuid4(),
-                crawl_id=crawl_id,
+                crawlId=crawl_id,
                 oid=oid,
                 qaRunId=qa_run_id,
                 timestamp=log_dict["timestamp"],
@@ -127,7 +127,7 @@ async def get_crawl_logs(
 
         match_query: Dict[str, Any] = {
             "oid": org.id,
-            "crawl_id": crawl_id,
+            "crawlId": crawl_id,
             "qaRunId": qa_run_id,
         }
 

backend/btrixcloud/crawls.py

@@ -1128,6 +1128,7 @@ async def get_crawl_logs(
         sort_direction: int = -1,
         contexts: Optional[List[str]] = None,
         log_levels: Optional[List[str]] = None,
+        qa_run_id: Optional[str] = None,
     ) -> Tuple[list[CrawlLogLine], int]:
         """get crawl logs"""
         return await self.log_ops.get_crawl_logs(
@@ -1139,6 +1140,7 @@ async def get_crawl_logs(
             sort_direction=sort_direction,
             contexts=contexts,
             log_levels=log_levels,
+            qa_run_id=qa_run_id,
         )
 
 

backend/btrixcloud/models.py

@@ -1151,7 +1151,7 @@ class CrawlLogLine(BaseMongoModel):
 
     id: UUID
 
-    crawl_id: str
+    crawlId: str
     oid: UUID
 
     qaRunId: Optional[str] = None