From e432fc984c8f8ece66663dce13c0e04a8059728c Mon Sep 17 00:00:00 2001 From: Alix JEUDI--LEMOINE Date: Tue, 3 Dec 2024 10:15:56 +0100 Subject: [PATCH] :sparkles: Added pin serialize & fixed friend serializer if status is not null (was not displaying) --- app/serializers/friend_serializer.py | 15 +++++++++------ app/serializers/pin_serializer.py | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/serializers/friend_serializer.py b/app/serializers/friend_serializer.py index f1d1d93..838689b 100644 --- a/app/serializers/friend_serializer.py +++ b/app/serializers/friend_serializer.py @@ -1,3 +1,6 @@ +from app.models.friend import Friend + + def friends_serialize(friends: list, external_friends: list) -> dict: serialized_friends: dict = { 'friends': [], @@ -5,23 +8,23 @@ def friends_serialize(friends: list, external_friends: list) -> dict: } for friend in friends: - status = friend.status if hasattr(friend, 'status') else 'null' + status = friend['status'] if 'status' in friend else 'null' - serialized_friends["friends"].append({ + serialized_friends["friends"].append(Friend(**{ "id": str(friend["_id"]), "user_id": friend["user_id"], "friend_user_id": friend["friend_user_id"], "status": status - }) + })) for external_friend in external_friends: - status = external_friend.status if hasattr(external_friend, 'status') else 'null' + status = external_friend['status'] if 'status' in external_friend else 'null' - serialized_friends["external_friends"].append({ + serialized_friends["external_friends"].append(Friend(**{ "id": str(external_friend["_id"]), "user_id": external_friend["user_id"], "friend_user_id": external_friend["friend_user_id"], "status": status - }) + })) return serialized_friends \ No newline at end of file diff --git a/app/serializers/pin_serializer.py b/app/serializers/pin_serializer.py index a6af7cb..11447b0 100644 --- a/app/serializers/pin_serializer.py +++ b/app/serializers/pin_serializer.py @@ -1,10 +1,16 @@ +from app.models.pin import Pin + + +def pin_serialize(pin: list) -> Pin: + return Pin(**{ + "id": str(pin["_id"]), + "title": pin["title"], + "description": pin["description"] + }) + def pins_serialize(pins: list) -> list: serialized_pins: list = [] for pin in pins: - serialized_pins.append({ - "id": str(pin["_id"]), - "title": pin["title"], - "description": pin["description"] - - }) + serialized_pins.append(pin_serialize(pin)) + return serialized_pins \ No newline at end of file