Remove isQA from model, duplicative of qaRunId

Author: tw4l

backend/btrixcloud/crawl_logs.py

@@ -35,31 +35,31 @@ async def init_index(self):
             [
                 ("crawl_id", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
-                ("isQA", pymongo.ASCENDING),
+                ("qaRunId", pymongo.ASCENDING),
                 ("timestamp", pymongo.ASCENDING),
             ]
         )
         await self.logs.create_index(
             [
                 ("crawl_id", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
-                ("isQA", pymongo.ASCENDING),
+                ("qaRunId", pymongo.ASCENDING),
                 ("logLevel", pymongo.ASCENDING),
             ]
         )
         await self.logs.create_index(
             [
                 ("crawl_id", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
-                ("isQA", pymongo.ASCENDING),
+                ("qaRunId", pymongo.ASCENDING),
                 ("context", pymongo.ASCENDING),
             ]
         )
         await self.logs.create_index(
             [
                 ("crawl_id", pymongo.HASHED),
                 ("oid", pymongo.ASCENDING),
-                ("isQA", pymongo.ASCENDING),
+                ("qaRunId", pymongo.ASCENDING),
                 ("message", pymongo.ASCENDING),
             ]
         )
@@ -68,7 +68,6 @@ async def add_log_line(
         self,
         crawl_id: str,
         oid: UUID,
-        is_qa: bool,
         log_line: str,
         qa_run_id: Optional[str] = None,
     ) -> bool:
@@ -90,7 +89,6 @@ async def add_log_line(
                 id=uuid4(),
                 crawl_id=crawl_id,
                 oid=oid,
-                isQA=is_qa,
                 qaRunId=qa_run_id,
                 timestamp=log_dict["timestamp"],
                 logLevel=log_dict["logLevel"],
@@ -118,6 +116,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]:
         """list all logs for particular crawl"""
         # pylint: disable=too-many-locals, duplicate-code
@@ -129,8 +128,7 @@ async def get_crawl_logs(
         match_query: Dict[str, Any] = {
             "oid": org.id,
             "crawl_id": crawl_id,
-            # For now, only return non-QA crawl logs
-            "isQA": False,
+            "qaRunId": qa_run_id,
         }
 
         if contexts:

backend/btrixcloud/crawls.py

@@ -1707,6 +1707,7 @@ async def get_crawl_errors(
             sort_by=sortBy,
             sort_direction=sortDirection,
             log_levels=["error", "fatal"],
+            qa_run_id=None,
         )
         return paginated_format(log_lines, total, page, pageSize)
 
@@ -1731,6 +1732,7 @@ async def get_crawl_behavior_logs(
             sort_by=sortBy,
             sort_direction=sortDirection,
             contexts=["behavior", "behaviorScript", "behaviorScriptCustom"],
+            qa_run_id=None,
         )
         return paginated_format(log_lines, total, page, pageSize)
 

backend/btrixcloud/migrations/migration_0050_crawl_logs.py

@@ -43,7 +43,6 @@ async def migrate_up(self):
                     await self.crawl_log_ops.add_log_line(
                         crawl_id=crawl_id,
                         oid=crawl_dict["oid"],
-                        is_qa=False,
                         log_line=error_log,
                         qa_run_id=None,
                     )
@@ -53,7 +52,6 @@ async def migrate_up(self):
                     await self.crawl_log_ops.add_log_line(
                         crawl_id=crawl_id,
                         oid=crawl_dict["oid"],
-                        is_qa=False,
                         log_line=behavior_log,
                         qa_run_id=None,
                     )
@@ -95,7 +93,6 @@ async def migrate_up(self):
                         await self.crawl_log_ops.add_log_line(
                             crawl_id=crawl_id,
                             oid=crawl_with_qa["oid"],
-                            is_qa=True,
                             log_line=qa_error_log,
                             qa_run_id=qa_run_id,
                         )
@@ -105,7 +102,6 @@ async def migrate_up(self):
                         await self.crawl_log_ops.add_log_line(
                             crawl_id=crawl_id,
                             oid=crawl_with_qa["oid"],
-                            is_qa=True,
                             log_line=qa_behavior_log,
                             qa_run_id=qa_run_id,
                         )

backend/btrixcloud/models.py

@@ -1154,7 +1154,6 @@ class CrawlLogLine(BaseMongoModel):
     crawl_id: str
     oid: UUID
 
-    isQA: bool = False
     qaRunId: Optional[str] = None
 
     timestamp: datetime
@@ -1163,6 +1162,11 @@ class CrawlLogLine(BaseMongoModel):
     message: str
     details: Optional[Dict[str, Any]] = None
 
+    @property
+    def is_qa(self) -> bool:
+        """return true if log line is from qa run"""
+        return bool(self.qaRunId)
+
 
 # ============================================================================
 

backend/btrixcloud/operator/crawls.py

@@ -1021,7 +1021,6 @@ async def sync_crawl_state(
                 await self.crawl_log_ops.add_log_line(
                     crawl.db_crawl_id,
                     crawl.oid,
-                    is_qa=crawl.is_qa,
                     log_line=crawl_error,
                     qa_run_id=qa_run_id,
                 )
@@ -1032,7 +1031,6 @@ async def sync_crawl_state(
                 await self.crawl_log_ops.add_log_line(
                     crawl.db_crawl_id,
                     crawl.oid,
-                    is_qa=crawl.is_qa,
                     log_line=behavior_log,
                     qa_run_id=qa_run_id,
                 )