scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

server/pools: serialize pools as micro resource within post resources

Browse Source 
Fixes #348
This commit is contained in:
Shyam Sunder
2020-09-19 09:23:26 -04:00
parent 802051399f
commit 1ef0419dc2
4 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/szurubooru/func/pools.py
View File

@ -152,6 +152,12 @@ def serialize_pool(
return PoolSerializer(pool).serialize(options)
def serialize_micro_pool(pool: model.Pool) -> Optional[rest.Response]:
return serialize_pool(
pool, options=["id", "names", "category", "description", "postCount"]
)
def try_get_pool_by_id(pool_id: int) -> Optional[model.Pool]:
return (
db.session.query(model.Pool)

2
server/szurubooru/func/posts.py
View File

@ -334,7 +334,7 @@ class PostSerializer(serialization.BaseSerializer):
def serialize_pools(self) -> List[Any]:
return [
pools.serialize_pool(pool)
pools.serialize_micro_pool(pool)
for pool in sorted(
self.post.pools, key=lambda pool: pool.creation_time
)

20
server/szurubooru/tests/func/test_posts.py
View File

@ -247,16 +247,6 @@ def test_serialize_post(
"description": "desc",
"category": "test-cat1",
"postCount": 1,
"posts": [
{
"id": 1,
"thumbnailUrl": "http://example.com/"
"generated-thumbnails/1_244c8840887984c4.jpg",
}
],
"version": 1,
"creationTime": datetime(1996, 1, 1),
"lastEditTime": datetime(1998, 1, 1),
},
{
"id": 2,
@ -264,16 +254,6 @@ def test_serialize_post(
"description": "desc2",
"category": "test-cat2",
"postCount": 1,
"posts": [
{
"id": 1,
"thumbnailUrl": "http://example.com/"
"generated-thumbnails/1_244c8840887984c4.jpg",
}
],
"version": 1,
"creationTime": datetime(1996, 1, 1),
"lastEditTime": datetime(1998, 1, 1),
},
],
"user": "post author",