Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions entities/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,23 @@
router = Router()

@router.get("/entities", response=List[EntityOut])
def list_entities(request):
qs = services.list_entities()
def list_entities(
request,
name: str = None,
name_op: str = "contains",
description: str = None,
description_op: str = "contains",
type: str = None,
type_op: str = "contains",
):
qs = services.list_entities(
name=name,
name_op=name_op,
description=description,
description_op=description_op,
type=type,
type_op=type_op,
)
return list(qs)

@router.get("/entities/{entity_id}", response=EntityOut)
Expand Down
30 changes: 28 additions & 2 deletions entities/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,34 @@
from django.db import transaction
from .models import Entity

def list_entities():
return Entity.objects.all().order_by("-created_at")
def list_entities(
name: str = None,
name_op: str = "contains",
description: str = None,
description_op: str = "contains",
type: str = None,
type_op: str = "contains",
):
qs = Entity.objects.all()
op_map = {
"equals": "exact",
"contains": "icontains",
"startswith": "istartswith",
"endswith": "iendswith",
}

def apply(qs, field, value, op):
if not value:
return qs
if op == "notcontains":
return qs.exclude(**{f"{field}__icontains": value})
lookup = op_map.get(op, "icontains")
return qs.filter(**{f"{field}__{lookup}": value})

qs = apply(qs, "name", name, name_op)
qs = apply(qs, "description", description, description_op)
qs = apply(qs, "type", type, type_op)
return qs.order_by("-created_at")

def get_entity(entity_id: int) -> Entity:
return Entity.objects.get(pk=entity_id)
Expand Down