Skip to content

Fixed db query filter #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
einfachMel merged 3 commits into from
Dec 16, 2021
Merged

Fixed db query filter #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69b956e
Fixed db query filter
V3lop5 Dec 16, 2021
dc03d2f
Changed tests - always use the same dataset
V3lop5 Dec 16, 2021
eff3816
Fixed flake8 linting
V3lop5 Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ensysmod/crud/base_depends_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ def get_multi_by_dataset(

def get_by_dataset_and_name(self, db: Session, *, dataset_id: int, name: str) -> Optional[ModelType]:
return db.query(self.model) \
.filter(self.model.name == name and self.model.ref_dataset == dataset_id) \
.filter(self.model.name == name) \
.filter(self.model.ref_dataset == dataset_id) \
.first()
3 changes: 2 additions & 1 deletion ensysmod/crud/base_depends_timeseries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def get_by_component(self, db: Session, *, component_id: int) -> Optional[List[M

def get_by_component_and_region(self, db: Session, *, component_id: int, region_id: int) -> Optional[ModelType]:
return db.query(self.model) \
.filter(self.model.ref_component == component_id and self.model.ref_region == region_id) \
.filter(self.model.ref_component == component_id) \
.filter(self.model.ref_region == region_id) \
.first()

def create(self, db: Session, *, obj_in: CreateSchemaType) -> ModelType:
Expand Down
9 changes: 4 additions & 5 deletions tests/utils/data_generator/energy_conversions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
from ensysmod import crud
from ensysmod.model import EnergyConversion
from ensysmod.schemas import EnergyConversionCreate
from tests.utils.data_generator.datasets import random_existing_dataset, fixed_existing_dataset
from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity, \
fixed_existing_energy_commodity
from tests.utils.data_generator.datasets import fixed_existing_dataset
from tests.utils.data_generator.energy_commodities import fixed_existing_energy_commodity
from tests.utils.utils import random_lower_string


def random_energy_conversion_create(db: Session) -> EnergyConversionCreate:
"""
Generate a random EnergyConversionCreate object.
"""
dataset = random_existing_dataset(db)
commodity = random_existing_energy_commodity(db)
dataset = fixed_existing_dataset(db)
commodity = fixed_existing_energy_commodity(db)
return EnergyConversionCreate(
ref_dataset=dataset.id,
name=f"EnergyConversion-{dataset.id}-{random_lower_string()}",
Expand Down
9 changes: 4 additions & 5 deletions tests/utils/data_generator/energy_sinks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
from ensysmod import crud
from ensysmod.model import EnergySink
from ensysmod.schemas import EnergySinkCreate
from tests.utils.data_generator.datasets import random_existing_dataset, fixed_existing_dataset
from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity, \
fixed_existing_energy_commodity
from tests.utils.data_generator.datasets import fixed_existing_dataset
from tests.utils.data_generator.energy_commodities import fixed_existing_energy_commodity
from tests.utils.utils import random_lower_string


def random_energy_sink_create(db: Session) -> EnergySinkCreate:
dataset = random_existing_dataset(db)
commodity = random_existing_energy_commodity(db)
dataset = fixed_existing_dataset(db)
commodity = fixed_existing_energy_commodity(db)
return EnergySinkCreate(
ref_dataset=dataset.id,
name=f"EnergySink-{dataset.id}-{random_lower_string()}",
Expand Down
6 changes: 2 additions & 4 deletions tests/utils/data_generator/energy_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
from ensysmod.model import EnergySource
from ensysmod.schemas import EnergySourceCreate
from tests.utils.data_generator import fixed_existing_dataset, fixed_existing_energy_commodity
from tests.utils.data_generator.datasets import random_existing_dataset
from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity
from tests.utils.utils import random_lower_string


def random_energy_source_create(db: Session) -> EnergySourceCreate:
dataset = random_existing_dataset(db)
commodity = random_existing_energy_commodity(db)
dataset = fixed_existing_dataset(db)
commodity = fixed_existing_energy_commodity(db)
return EnergySourceCreate(
ref_dataset=dataset.id,
name=f"EnergySource-{dataset.id}-{random_lower_string()}",
Expand Down
6 changes: 2 additions & 4 deletions tests/utils/data_generator/energy_storages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
from ensysmod.model import EnergyStorage
from ensysmod.schemas import EnergyStorageCreate
from tests.utils.data_generator import fixed_existing_dataset, fixed_existing_energy_commodity
from tests.utils.data_generator.datasets import random_existing_dataset
from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity
from tests.utils.utils import random_lower_string


def random_energy_storage_create(db: Session) -> EnergyStorageCreate:
dataset = random_existing_dataset(db)
commodity = random_existing_energy_commodity(db)
dataset = fixed_existing_dataset(db)
commodity = fixed_existing_energy_commodity(db)
return EnergyStorageCreate(
ref_dataset=dataset.id,
name=f"EnergyStorage-{dataset.id}-{random_lower_string()}",
Expand Down
6 changes: 2 additions & 4 deletions tests/utils/data_generator/energy_transmissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
from ensysmod.model import EnergyTransmission
from ensysmod.schemas import EnergyTransmissionCreate
from tests.utils.data_generator import fixed_existing_dataset, fixed_existing_energy_commodity
from tests.utils.data_generator.datasets import random_existing_dataset
from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity
from tests.utils.utils import random_lower_string


def random_energy_transmission_create(db: Session) -> EnergyTransmissionCreate:
dataset = random_existing_dataset(db)
commodity = random_existing_energy_commodity(db)
dataset = fixed_existing_dataset(db)
commodity = fixed_existing_energy_commodity(db)
return EnergyTransmissionCreate(
ref_dataset=dataset.id,
name=f"EnergyTransmission-{dataset.id}-{random_lower_string()}",
Expand Down