add 4 new relation signales, add 4 new aggr methods, wip to cleanup
This commit is contained in:
collerek
182
tests/test_aggr_functions.py
Normal file
182
tests/test_aggr_functions.py
Normal file
@ -0,0 +1,182 @@
|
||||
from typing import Optional
|
||||
|
||||
import databases
|
||||
import pytest
|
||||
import sqlalchemy
|
||||
|
||||
import ormar
|
||||
from tests.settings import DATABASE_URL
|
||||
|
||||
database = databases.Database(DATABASE_URL)
|
||||
metadata = sqlalchemy.MetaData()
|
||||
|
||||
|
||||
class BaseMeta(ormar.ModelMeta):
|
||||
metadata = metadata
|
||||
database = database
|
||||
|
||||
|
||||
class Author(ormar.Model):
|
||||
class Meta(BaseMeta):
|
||||
tablename = "authors"
|
||||
order_by = ["-name"]
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
name: str = ormar.String(max_length=100)
|
||||
|
||||
|
||||
class Book(ormar.Model):
|
||||
class Meta(BaseMeta):
|
||||
tablename = "books"
|
||||
order_by = ["year", "-ranking"]
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
author: Optional[Author] = ormar.ForeignKey(Author)
|
||||
title: str = ormar.String(max_length=100)
|
||||
year: int = ormar.Integer(nullable=True)
|
||||
ranking: int = ormar.Integer(nullable=True)
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True, scope="module")
|
||||
def create_test_database():
|
||||
engine = sqlalchemy.create_engine(DATABASE_URL)
|
||||
metadata.drop_all(engine)
|
||||
metadata.create_all(engine)
|
||||
yield
|
||||
metadata.drop_all(engine)
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True, scope="function")
|
||||
async def cleanup():
|
||||
yield
|
||||
async with database:
|
||||
await Book.objects.delete(each=True)
|
||||
await Author.objects.delete(each=True)
|
||||
|
||||
|
||||
async def sample_data():
|
||||
author = await Author(name="Author 1").save()
|
||||
await Book(title="Book 1", year=1920, ranking=3, author=author).save()
|
||||
await Book(title="Book 2", year=1930, ranking=1, author=author).save()
|
||||
await Book(title="Book 3", year=1923, ranking=5, author=author).save()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_min_method():
|
||||
async with database:
|
||||
await sample_data()
|
||||
assert await Book.objects.min("year") == 1920
|
||||
result = await Book.objects.min(["year", "ranking"])
|
||||
assert result == (1920, 1)
|
||||
assert dict(result) == dict(year=1920, ranking=1)
|
||||
|
||||
assert await Book.objects.min("title") == "Book 1"
|
||||
|
||||
assert await Author.objects.select_related("books").min("books__year") == 1920
|
||||
result = await Author.objects.select_related("books").min(
|
||||
["books__year", "books__ranking"]
|
||||
)
|
||||
assert result == (1920, 1)
|
||||
assert dict(result) == dict(books__year=1920, books__ranking=1)
|
||||
|
||||
assert (
|
||||
await Author.objects.select_related("books")
|
||||
.filter(books__year__gt=1925)
|
||||
.min("books__year")
|
||||
== 1930
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_max_method():
|
||||
async with database:
|
||||
await sample_data()
|
||||
assert await Book.objects.max("year") == 1930
|
||||
result = await Book.objects.max(["year", "ranking"])
|
||||
assert result == (1930, 5)
|
||||
assert dict(result) == dict(year=1930, ranking=5)
|
||||
|
||||
assert await Book.objects.max("title") == "Book 3"
|
||||
|
||||
assert await Author.objects.select_related("books").max("books__year") == 1930
|
||||
result = await Author.objects.select_related("books").max(
|
||||
["books__year", "books__ranking"]
|
||||
)
|
||||
assert result == (1930, 5)
|
||||
assert dict(result) == dict(books__year=1930, books__ranking=5)
|
||||
|
||||
assert (
|
||||
await Author.objects.select_related("books")
|
||||
.filter(books__year__lt=1925)
|
||||
.max("books__year")
|
||||
== 1923
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_sum_method():
|
||||
async with database:
|
||||
await sample_data()
|
||||
assert await Book.objects.sum("year") == 5773
|
||||
result = await Book.objects.sum(["year", "ranking"])
|
||||
assert result == (5773, 9)
|
||||
assert dict(result) == dict(year=5773, ranking=9)
|
||||
|
||||
assert await Book.objects.sum("title") == 0.0
|
||||
|
||||
assert await Author.objects.select_related("books").sum("books__year") == 5773
|
||||
result = await Author.objects.select_related("books").sum(
|
||||
["books__year", "books__ranking"]
|
||||
)
|
||||
assert result == (5773, 9)
|
||||
assert dict(result) == dict(books__year=5773, books__ranking=9)
|
||||
|
||||
assert (
|
||||
await Author.objects.select_related("books")
|
||||
.filter(books__year__lt=1925)
|
||||
.sum("books__year")
|
||||
== 3843
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_avg_method():
|
||||
async with database:
|
||||
await sample_data()
|
||||
assert round(await Book.objects.avg("year"), 2) == 1924.33
|
||||
result = await Book.objects.avg(["year", "ranking"])
|
||||
assert (round(result[0], 2), result[1]) == (1924.33, 3.0)
|
||||
result_dict = dict(result)
|
||||
assert round(result_dict.get("year"), 2) == 1924.33
|
||||
assert result_dict.get("ranking") == 3.0
|
||||
|
||||
assert await Book.objects.avg("title") == 0.0
|
||||
|
||||
result = await Author.objects.select_related("books").avg("books__year")
|
||||
assert round(result, 2) == 1924.33
|
||||
result = await Author.objects.select_related("books").avg(
|
||||
["books__year", "books__ranking"]
|
||||
)
|
||||
assert (round(result[0], 2), result[1]) == (1924.33, 3.0)
|
||||
result_dict = dict(result)
|
||||
assert round(result_dict.get("books__year"), 2) == 1924.33
|
||||
assert result_dict.get("books__ranking") == 3.0
|
||||
|
||||
assert (
|
||||
await Author.objects.select_related("books")
|
||||
.filter(books__year__lt=1925)
|
||||
.avg("books__year")
|
||||
== 1921.5
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_queryset_method():
|
||||
async with database:
|
||||
await sample_data()
|
||||
author = await Author.objects.select_related("books").get()
|
||||
assert await author.books.min("year") == 1920
|
||||
assert await author.books.max("year") == 1930
|
||||
assert await author.books.sum("ranking") == 9
|
||||
assert await author.books.avg("ranking") == 3.0
|
||||
assert await author.books.max(["year", "title"]) == (1930, "Book 3")
|
||||
@ -48,8 +48,10 @@ def create_test_database():
|
||||
|
||||
@pytest.fixture(autouse=True, scope="function")
|
||||
async def cleanup():
|
||||
await Book.objects.delete(each=True)
|
||||
await Author.objects.delete(each=True)
|
||||
yield
|
||||
async with database:
|
||||
await Book.objects.delete(each=True)
|
||||
await Author.objects.delete(each=True)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
|
||||
217
tests/test_signals_for_relations.py
Normal file
217
tests/test_signals_for_relations.py
Normal file
@ -0,0 +1,217 @@
|
||||
from typing import Optional
|
||||
|
||||
import databases
|
||||
import pytest
|
||||
import sqlalchemy
|
||||
|
||||
import ormar
|
||||
from ormar import (
|
||||
post_relation_add,
|
||||
post_relation_remove,
|
||||
pre_relation_add,
|
||||
pre_relation_remove,
|
||||
)
|
||||
import pydantic
|
||||
from tests.settings import DATABASE_URL
|
||||
|
||||
database = databases.Database(DATABASE_URL, force_rollback=True)
|
||||
metadata = sqlalchemy.MetaData()
|
||||
|
||||
|
||||
class AuditLog(ormar.Model):
|
||||
class Meta:
|
||||
tablename = "audits"
|
||||
metadata = metadata
|
||||
database = database
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
event_type: str = ormar.String(max_length=100)
|
||||
event_log: pydantic.Json = ormar.JSON()
|
||||
|
||||
|
||||
class Cover(ormar.Model):
|
||||
class Meta:
|
||||
tablename = "covers"
|
||||
metadata = metadata
|
||||
database = database
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
title: str = ormar.String(max_length=100)
|
||||
|
||||
|
||||
class Artist(ormar.Model):
|
||||
class Meta:
|
||||
tablename = "artists"
|
||||
metadata = metadata
|
||||
database = database
|
||||
|
||||
id: int = ormar.Integer(name="artist_id", primary_key=True)
|
||||
name: str = ormar.String(name="fname", max_length=100)
|
||||
|
||||
|
||||
class Album(ormar.Model):
|
||||
class Meta:
|
||||
tablename = "albums"
|
||||
metadata = metadata
|
||||
database = database
|
||||
|
||||
id: int = ormar.Integer(primary_key=True)
|
||||
title: str = ormar.String(max_length=100)
|
||||
cover: Optional[Cover] = ormar.ForeignKey(Cover)
|
||||
artists = ormar.ManyToMany(Artist)
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True, scope="module")
|
||||
def create_test_database():
|
||||
engine = sqlalchemy.create_engine(DATABASE_URL)
|
||||
metadata.drop_all(engine)
|
||||
metadata.create_all(engine)
|
||||
yield
|
||||
metadata.drop_all(engine)
|
||||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
async def cleanup():
|
||||
yield
|
||||
async with database:
|
||||
await AuditLog.objects.delete(each=True)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_relation_signal_functions():
|
||||
async with database:
|
||||
async with database.transaction(force_rollback=True):
|
||||
|
||||
@pre_relation_add([Album, Cover, Artist])
|
||||
async def before_relation_add(
|
||||
sender, instance, child, relation_name, passed_kwargs, **kwargs
|
||||
):
|
||||
await AuditLog.objects.create(
|
||||
event_type="RELATION_PRE_ADD",
|
||||
event_log=dict(
|
||||
class_affected=sender.get_name(),
|
||||
parent_id=instance.pk,
|
||||
child_id=child.pk,
|
||||
relation_name=relation_name,
|
||||
kwargs=passed_kwargs,
|
||||
),
|
||||
)
|
||||
|
||||
passed_kwargs.pop("dummy", None)
|
||||
|
||||
@post_relation_add([Album, Cover, Artist])
|
||||
async def after_relation_add(
|
||||
sender, instance, child, relation_name, passed_kwargs, **kwargs
|
||||
):
|
||||
await AuditLog.objects.create(
|
||||
event_type="RELATION_POST_ADD",
|
||||
event_log=dict(
|
||||
class_affected=sender.get_name(),
|
||||
parent_id=instance.pk,
|
||||
child_id=child.pk,
|
||||
relation_name=relation_name,
|
||||
kwargs=passed_kwargs,
|
||||
),
|
||||
)
|
||||
|
||||
@pre_relation_remove([Album, Cover, Artist])
|
||||
async def before_relation_remove(
|
||||
sender, instance, child, relation_name, **kwargs
|
||||
):
|
||||
await AuditLog.objects.create(
|
||||
event_type="RELATION_PRE_REMOVE",
|
||||
event_log=dict(
|
||||
class_affected=sender.get_name(),
|
||||
parent_id=instance.pk,
|
||||
child_id=child.pk,
|
||||
relation_name=relation_name,
|
||||
kwargs=kwargs,
|
||||
),
|
||||
)
|
||||
|
||||
@post_relation_remove([Album, Cover, Artist])
|
||||
async def after_relation_remove(
|
||||
sender, instance, child, relation_name, **kwargs
|
||||
):
|
||||
await AuditLog.objects.create(
|
||||
event_type="RELATION_POST_REMOVE",
|
||||
event_log=dict(
|
||||
class_affected=sender.get_name(),
|
||||
parent_id=instance.pk,
|
||||
child_id=child.pk,
|
||||
relation_name=relation_name,
|
||||
kwargs=kwargs,
|
||||
),
|
||||
)
|
||||
|
||||
cover = await Cover(title="New").save()
|
||||
artist = await Artist(name="Artist").save()
|
||||
album = await Album(title="New Album").save()
|
||||
|
||||
await cover.albums.add(album, index=0)
|
||||
log = await AuditLog.objects.get(event_type="RELATION_PRE_ADD")
|
||||
assert log.event_log.get("parent_id") == cover.pk
|
||||
assert log.event_log.get("child_id") == album.pk
|
||||
assert log.event_log.get("relation_name") == "albums"
|
||||
assert log.event_log.get("kwargs") == dict(index=0)
|
||||
|
||||
log2 = await AuditLog.objects.get(event_type="RELATION_POST_ADD")
|
||||
assert log2.event_log.get("parent_id") == cover.pk
|
||||
assert log2.event_log.get("child_id") == album.pk
|
||||
assert log2.event_log.get("relation_name") == "albums"
|
||||
assert log2.event_log.get("kwargs") == dict(index=0)
|
||||
|
||||
await album.artists.add(artist, dummy="test")
|
||||
|
||||
log3 = await AuditLog.objects.filter(
|
||||
event_type="RELATION_PRE_ADD", id__gt=log2.pk
|
||||
).get()
|
||||
assert log3.event_log.get("parent_id") == album.pk
|
||||
assert log3.event_log.get("child_id") == artist.pk
|
||||
assert log3.event_log.get("relation_name") == "artists"
|
||||
assert log3.event_log.get("kwargs") == dict(dummy="test")
|
||||
|
||||
log4 = await AuditLog.objects.get(
|
||||
event_type="RELATION_POST_ADD", id__gt=log3.pk
|
||||
)
|
||||
assert log4.event_log.get("parent_id") == album.pk
|
||||
assert log4.event_log.get("child_id") == artist.pk
|
||||
assert log4.event_log.get("relation_name") == "artists"
|
||||
assert log4.event_log.get("kwargs") == dict()
|
||||
|
||||
assert album.cover == cover
|
||||
assert len(album.artists) == 1
|
||||
|
||||
await cover.albums.remove(album)
|
||||
log = await AuditLog.objects.get(event_type="RELATION_PRE_REMOVE")
|
||||
assert log.event_log.get("parent_id") == cover.pk
|
||||
assert log.event_log.get("child_id") == album.pk
|
||||
assert log.event_log.get("relation_name") == "albums"
|
||||
assert log.event_log.get("kwargs") == dict()
|
||||
|
||||
log2 = await AuditLog.objects.get(event_type="RELATION_POST_REMOVE")
|
||||
assert log2.event_log.get("parent_id") == cover.pk
|
||||
assert log2.event_log.get("child_id") == album.pk
|
||||
assert log2.event_log.get("relation_name") == "albums"
|
||||
assert log2.event_log.get("kwargs") == dict()
|
||||
|
||||
await album.artists.remove(artist)
|
||||
log3 = await AuditLog.objects.filter(
|
||||
event_type="RELATION_PRE_REMOVE", id__gt=log2.pk
|
||||
).get()
|
||||
assert log3.event_log.get("parent_id") == album.pk
|
||||
assert log3.event_log.get("child_id") == artist.pk
|
||||
assert log3.event_log.get("relation_name") == "artists"
|
||||
assert log3.event_log.get("kwargs") == dict()
|
||||
|
||||
log4 = await AuditLog.objects.get(
|
||||
event_type="RELATION_POST_REMOVE", id__gt=log3.pk
|
||||
)
|
||||
assert log4.event_log.get("parent_id") == album.pk
|
||||
assert log4.event_log.get("child_id") == artist.pk
|
||||
assert log4.event_log.get("relation_name") == "artists"
|
||||
assert log4.event_log.get("kwargs") == dict()
|
||||
|
||||
await album.load_all()
|
||||
assert len(album.artists) == 0
|
||||
assert album.cover is None
|
||||
Reference in New Issue
Block a user