Add org check

Author: tw4l

backend/btrixcloud/basecrawls.py

@@ -602,10 +602,12 @@ async def bulk_presigned_files(
 
         return resources, pages_optimized
 
-    async def validate_all_crawls_successful(self, crawl_ids: List[str]):
+    async def validate_all_crawls_successful(
+        self, crawl_ids: List[str], org: Organization
+    ):
         """Validate that crawls in list exist and are successful or else raise exception"""
         for crawl_id in crawl_ids:
-            crawl = await self.get_base_crawl(crawl_id)
+            crawl = await self.get_base_crawl(crawl_id, org)
             if crawl.state in FAILED_STATES:
                 raise HTTPException(status_code=400, detail="invalid_failed_crawl")
 

backend/btrixcloud/colls.py

@@ -121,10 +121,10 @@ async def init_index(self):
             [("oid", pymongo.ASCENDING), ("description", pymongo.ASCENDING)]
         )
 
-    async def add_collection(self, oid: UUID, coll_in: CollIn):
+    async def add_collection(self, org: Organization, coll_in: CollIn):
         """Add new collection"""
         crawl_ids = coll_in.crawlIds if coll_in.crawlIds else []
-        await self.crawl_ops.validate_all_crawls_successful(crawl_ids)
+        await self.crawl_ops.validate_all_crawls_successful(crawl_ids, org)
 
         coll_id = uuid4()
         created = dt_now()
@@ -133,7 +133,7 @@ async def add_collection(self, oid: UUID, coll_in: CollIn):
 
         coll = Collection(
             id=coll_id,
-            oid=oid,
+            oid=org.id,
             name=coll_in.name,
             slug=slug,
             description=coll_in.description,
@@ -146,7 +146,6 @@ async def add_collection(self, oid: UUID, coll_in: CollIn):
         )
         try:
             await self.collections.insert_one(coll.to_dict())
-            org = await self.orgs.get_org_by_id(oid)
             await self.clear_org_previous_slugs_matching_slug(slug, org)
 
             if crawl_ids:
@@ -231,7 +230,7 @@ async def add_crawls_to_collection(
         headers: Optional[dict] = None,
     ) -> CollOut:
         """Add crawls to collection"""
-        await self.crawl_ops.validate_all_crawls_successful(crawl_ids)
+        await self.crawl_ops.validate_all_crawls_successful(crawl_ids, org)
 
         modified = dt_now()
         result = await self.collections.find_one_and_update(
@@ -1023,7 +1022,7 @@ def init_collections_api(
     async def add_collection(
         new_coll: CollIn, org: Organization = Depends(org_crawl_dep)
     ):
-        return await colls.add_collection(org.id, new_coll)
+        return await colls.add_collection(org, new_coll)
 
     @app.get(
         "/orgs/{oid}/collections",