fix(clients_and_providers): include 'both' type in client or provider filtering
This commit is contained in:
@@ -9,6 +9,7 @@ from fastapi import HTTPException
|
||||
from sqlalchemy import or_
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session, joinedload
|
||||
from .models import ClientOrProviderEnum
|
||||
|
||||
from .dto import (
|
||||
ClientProviderBasicDTO,
|
||||
@@ -56,8 +57,12 @@ class ClientProviderService:
|
||||
)
|
||||
)
|
||||
if filters.get("client_or_provider"):
|
||||
|
||||
query = query.filter(
|
||||
ClientProvider.client_or_provider == filters["client_or_provider"]
|
||||
or_(
|
||||
ClientProvider.client_or_provider == filters["client_or_provider"],
|
||||
ClientProvider.client_or_provider == ClientOrProviderEnum.BOTH
|
||||
)
|
||||
)
|
||||
if filters.get("status"):
|
||||
enabled = 1 if filters["status"] == "enabled" else 0
|
||||
@@ -345,8 +350,12 @@ class ClientProviderService:
|
||||
)
|
||||
|
||||
if client_or_provider:
|
||||
from .models import ClientOrProviderEnum
|
||||
query = query.filter(
|
||||
ClientProvider.client_or_provider == client_or_provider
|
||||
or_(
|
||||
ClientProvider.client_or_provider == client_or_provider,
|
||||
ClientProvider.client_or_provider == ClientOrProviderEnum.BOTH
|
||||
)
|
||||
)
|
||||
|
||||
if enabled_only:
|
||||
|
||||
Reference in New Issue
Block a user