aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2023-06-20 17:10:02 +0000
committerzsloan2023-06-20 17:10:02 +0000
commitb7a000b2b695cf5d504b287c0ce7b5125cb3a80f (patch)
treeeeb1397ff712c618f6b8b82656317fb70fe107c3
parent4e40d4e48a2d41602647832f659ec1f43f991b7a (diff)
downloadgenenetwork3-b7a000b2b695cf5d504b287c0ce7b5125cb3a80f.tar.gz
Fix conflicts
-rw-r--r--gn3/auth/authorisation/users/collections/models.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gn3/auth/authorisation/users/collections/models.py b/gn3/auth/authorisation/users/collections/models.py
index 8e37ef9..b6598a6 100644
--- a/gn3/auth/authorisation/users/collections/models.py
+++ b/gn3/auth/authorisation/users/collections/models.py
@@ -107,8 +107,8 @@ def user_collections(rconn: Redis, user: User) -> tuple[dict, ...]:
__toggle_boolean_field__(rconn, user.email, "collections-migrated")
rconn.hset(
__COLLECTIONS_DOC__,
- key=user.user_id,
- value=json.dumps(collections))
+ key=str(user.user_id),
+ value=json.dumps(collections, cls=CollectionJSONEncoder))
return collections
def save_collections(rconn: Redis, user: User, collections: tuple[dict, ...]) -> tuple[dict, ...]: