Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Sebastian Diaz <[email protected]>
Co-authored-by: Isak Ohlsson Ångnell <[email protected]>
  • Loading branch information
3 people authored Apr 11, 2024
1 parent 169e200 commit c9dc68d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion genotype_api/database/filters/sample_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def filter_samples_by_id(sample_id: str, samples: Query, **kwargs) -> Query:


def filter_samples_having_comment(samples: Query, is_commented: bool | None, **kwargs) -> Query:
"""Return sample with a comment."""
"""Return samples with a comment."""
return samples.filter(Sample.comment.isnot(None)) if is_commented else samples


Expand Down
10 changes: 5 additions & 5 deletions tests/database/filters/test_sample_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_filter_samples_having_comment(base_store: Store, test_sample: Sample):

def test_filter_samples_having_comment_none_provided(base_store: Store, test_sample: Sample):
"""Test filtering samples by having comment."""
# GIVEN a store with a sample
# GIVEN a store with two samples

# WHEN filtering samples by having comment
query: Query = base_store._get_query(Sample)
Expand Down Expand Up @@ -97,7 +97,7 @@ def test_filter_samples_without_status_none_provided(base_store: Store, test_sam
query: Query = base_store._get_query(Sample)
samples: list[Sample] = filter_samples_without_status(samples=query, is_missing=None).all()

# THEN no sample is returned
# THEN all samples are returned
assert len(samples) == 2


Expand All @@ -111,7 +111,7 @@ def test_filter_samples_analysed_on_plate(
query: Query = base_store._get_join_analysis_on_sample()
sample: Sample = filter_samples_analysed_on_plate(samples=query, plate_id=test_plate.id).first()

# THEN no sample is returned
# THEN one sample is returned
assert sample.analyses[0].plate_id == test_plate.id


Expand All @@ -126,7 +126,7 @@ def test_filter_samples_analysed_on_plate_none_provided(
query: Query = base_store._get_join_analysis_on_sample()
samples: list[Sample] = filter_samples_analysed_on_plate(samples=query, plate_id=None).all()

# THEN no sample is returned
# THEN all samples are returned
assert len(samples) == 2


Expand All @@ -139,6 +139,6 @@ def test_add_skip_and_limit(base_store: Store, test_sample: Sample):
query: Query = base_store._get_query(Sample)
samples: list[Sample] = add_skip_and_limit(query, skip=0, limit=1).all()

# THEN one SNP is returned
# THEN one sample is returned
assert samples
assert len(samples) == 1

0 comments on commit c9dc68d

Please sign in to comment.