diff --git a/genotype_api/database/crud/create.py b/genotype_api/database/crud/create.py index ffdda32..aaa9735 100644 --- a/genotype_api/database/crud/create.py +++ b/genotype_api/database/crud/create.py @@ -1,10 +1,9 @@ import logging -from sqlalchemy.future import select +from sqlalchemy.orm import Query from genotype_api.database.base_handler import BaseHandler from genotype_api.database.models import SNP, Analysis, Genotype, Plate, Sample, User -from genotype_api.dto.user import UserRequest from genotype_api.exceptions import SampleExistsError LOG = logging.getLogger(__name__) @@ -27,9 +26,9 @@ async def create_plate(self, plate: Plate) -> Plate: async def create_sample(self, sample: Sample) -> Sample: """Creates a sample in the database.""" - sample_in_db_query = self._get_query(Analysis).filter(Sample.id == sample.id) - result = await self.session.execute(sample_in_db_query) - if sample_in_db := result.one_or_none(): + sample_in_db: Query = self._get_query(Analysis).filter(Sample.id == sample.id) + result = await self.session.execute(sample_in_db) + if result.one_or_none(): raise SampleExistsError self.session.add(sample) await self.session.commit() diff --git a/genotype_api/database/crud/read.py b/genotype_api/database/crud/read.py index 589ce61..60fd18a 100644 --- a/genotype_api/database/crud/read.py +++ b/genotype_api/database/crud/read.py @@ -1,5 +1,5 @@ import logging -from datetime import date, timedelta +from datetime import date from sqlalchemy import asc, desc, func from sqlalchemy.future import select