diff --git a/tests/database/filters/test_plate_filters.py b/tests/database/filters/test_plate_filters.py index 28ad560..80bf02c 100644 --- a/tests/database/filters/test_plate_filters.py +++ b/tests/database/filters/test_plate_filters.py @@ -4,7 +4,6 @@ from sqlalchemy.orm import Query from genotype_api.database.filters.plate_filters import ( - apply_plate_filter, filter_plates_by_id, filter_plates_by_plate_id, ) @@ -18,10 +17,7 @@ async def test_filter_plates_by_id(base_store: Store, test_plate: Plate): # WHEN filtering plates by id query: Query = select(Plate) - filter_functions = filter_plates_by_id(entry_id=test_plate.id, plates=query) - filtered_query = apply_plate_filter( - plates=query, filter_functions=filter_functions, entry_id=test_plate.id - ) + filtered_query = filter_plates_by_id(entry_id=test_plate.id, plates=query) plate: Plate = await base_store.fetch_first_row(filtered_query) # THEN the plate is returned @@ -35,10 +31,7 @@ async def test_filter_plates_by_plate_id(base_store: Store, test_plate: Plate): # WHEN filtering plates by plate id query: Query = select(Plate) - filter_functions = filter_plates_by_plate_id(plate_id=test_plate.id, plates=query) - filtered_query = apply_plate_filter( - plates=query, filter_functions=filter_functions, plate_id=test_plate.id - ) + filtered_query = filter_plates_by_plate_id(plate_id=test_plate.id, plates=query) plate: Plate = await base_store.fetch_first_row(filtered_query) # THEN the plate is returned diff --git a/tests/database/filters/test_sample_filters.py b/tests/database/filters/test_sample_filters.py index b7391ab..1b99840 100644 --- a/tests/database/filters/test_sample_filters.py +++ b/tests/database/filters/test_sample_filters.py @@ -37,10 +37,7 @@ async def test_filter_samples_contain_id(base_store: Store, test_sample: Sample) # WHEN filtering samples by id query: Query = select(Sample) - filter_functions = filter_samples_contain_id(sample_id=test_sample.id, samples=query) - filtered_query = apply_sample_filter( - samples=query, filter_functions=filter_functions, sample_id=test_sample.id - ) + filtered_query = filter_samples_contain_id(sample_id=test_sample.id, samples=query) sample: Sample = await base_store.fetch_first_row(filtered_query) # THEN the sample is returned @@ -56,10 +53,7 @@ async def test_filter_samples_contain_id_when_no_id(base_store: Store, test_samp assert len(samples) == 2 # WHEN filtering samples by id - filter_functions = filter_samples_contain_id(sample_id=None, samples=query) - filtered_query = apply_sample_filter( - samples=query, filter_functions=filter_functions, sample_id=None - ) + filtered_query = filter_samples_contain_id(sample_id=None, samples=query) samples: list[Sample] = await base_store.fetch_all_rows(filtered_query) # THEN all samples are returned @@ -80,8 +74,7 @@ async def test_filter_samples_having_comment( await helpers.ensure_sample(store=base_store, sample=sample_without_comment) # WHEN filtering samples by having comment - filter_functions = filter_samples_having_comment(samples=query, is_commented=True) - filtered_query = apply_sample_filter(samples=query, filter_functions=filter_functions) + filtered_query = filter_samples_having_comment(samples=query, is_commented=True) samples: list[Sample] = await base_store.fetch_all_rows(filtered_query) # THEN samples with comments are returned @@ -98,8 +91,7 @@ async def test_filter_samples_having_comment_none_provided(base_store: Store, te assert len(samples) == 2 # WHEN filtering samples by having comment - filter_functions = filter_samples_having_comment(samples=query, is_commented=None) - filtered_query = apply_sample_filter(samples=query, filter_functions=filter_functions) + filtered_query = filter_samples_having_comment(samples=query, is_commented=None) samples: list[Sample] = await base_store.fetch_all_rows(filtered_query) # THEN the sample is returned @@ -136,8 +128,7 @@ async def test_filter_samples_without_status_none_provided(base_store: Store, te # WHEN filtering samples by having a status query: Query = select(Sample) - filter_functions = filter_samples_without_status(samples=query, is_missing=None) - filtered_query = apply_sample_filter(samples=query, filter_functions=filter_functions) + filtered_query = filter_samples_without_status(samples=query, is_missing=None) samples: list[Sample] = await base_store.fetch_all_rows(filtered_query) # THEN all samples are returned diff --git a/tests/database/filters/test_snp_filters.py b/tests/database/filters/test_snp_filters.py index 85c0ada..1d7d106 100644 --- a/tests/database/filters/test_snp_filters.py +++ b/tests/database/filters/test_snp_filters.py @@ -19,10 +19,7 @@ async def test_filter_snps_by_id(base_store: Store, test_snp: SNP): # WHEN filtering a SNP by id query: Query = select(SNP) - filter_functions = filter_snps_by_id(snp_id=test_snp.id, snps=query) - filtered_query = apply_snp_filter( - snps=query, filter_functions=filter_functions, snp_id=test_snp.id - ) + filtered_query = filter_snps_by_id(snp_id=test_snp.id, snps=query) snp: SNP = base_store.fetch_first_row(filtered_query) # THEN the SNP is returned