uploads api ext: (#970)
- also support collectionId filter on /all-crawls - update tests
This commit is contained in:
		
							parent
							
								
									f1bce310d0
								
							
						
					
					
						commit
						7d694754c6
					
				@ -486,6 +486,7 @@ def init_base_crawls_api(app, mdb, users, crawl_manager, orgs, user_dep):
 | 
				
			|||||||
        name: Optional[str] = None,
 | 
					        name: Optional[str] = None,
 | 
				
			||||||
        state: Optional[str] = None,
 | 
					        state: Optional[str] = None,
 | 
				
			||||||
        description: Optional[str] = None,
 | 
					        description: Optional[str] = None,
 | 
				
			||||||
 | 
					        collectionId: Optional[UUID4] = None,
 | 
				
			||||||
        sortBy: Optional[str] = "finished",
 | 
					        sortBy: Optional[str] = "finished",
 | 
				
			||||||
        sortDirection: Optional[int] = -1,
 | 
					        sortDirection: Optional[int] = -1,
 | 
				
			||||||
    ):
 | 
					    ):
 | 
				
			||||||
@ -495,6 +496,7 @@ def init_base_crawls_api(app, mdb, users, crawl_manager, orgs, user_dep):
 | 
				
			|||||||
            userid=userid,
 | 
					            userid=userid,
 | 
				
			||||||
            name=name,
 | 
					            name=name,
 | 
				
			||||||
            description=description,
 | 
					            description=description,
 | 
				
			||||||
 | 
					            collection_id=collectionId,
 | 
				
			||||||
            states=states,
 | 
					            states=states,
 | 
				
			||||||
            page_size=pageSize,
 | 
					            page_size=pageSize,
 | 
				
			||||||
            page=page,
 | 
					            page=page,
 | 
				
			||||||
 | 
				
			|||||||
@ -134,7 +134,6 @@ def test_collection_uploads(admin_auth_headers, default_org_id):
 | 
				
			|||||||
            "name": "My Test Coll",
 | 
					            "name": "My Test Coll",
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    print(r.json())
 | 
					 | 
				
			||||||
    assert r.status_code == 200
 | 
					    assert r.status_code == 200
 | 
				
			||||||
    data = r.json()
 | 
					    data = r.json()
 | 
				
			||||||
    coll_id = data["id"]
 | 
					    coll_id = data["id"]
 | 
				
			||||||
@ -151,6 +150,17 @@ def test_collection_uploads(admin_auth_headers, default_org_id):
 | 
				
			|||||||
    assert len(results["items"]) == 1
 | 
					    assert len(results["items"]) == 1
 | 
				
			||||||
    assert results["items"][0]["id"] == upload_id
 | 
					    assert results["items"][0]["id"] == upload_id
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Test all crawls filtered by collection
 | 
				
			||||||
 | 
					    r = requests.get(
 | 
				
			||||||
 | 
					        f"{API_PREFIX}/orgs/{default_org_id}/all-crawls?collectionId={coll_id}",
 | 
				
			||||||
 | 
					        headers=admin_auth_headers,
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    results = r.json()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    assert len(results["items"]) == 1
 | 
				
			||||||
 | 
					    assert results["items"][0]["id"] == upload_id
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Delete Collection
 | 
					    # Delete Collection
 | 
				
			||||||
    r = requests.delete(
 | 
					    r = requests.delete(
 | 
				
			||||||
        f"{API_PREFIX}/orgs/{default_org_id}/collections/{coll_id}",
 | 
					        f"{API_PREFIX}/orgs/{default_org_id}/collections/{coll_id}",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user