From b7a000b2b695cf5d504b287c0ce7b5125cb3a80f Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 20 Jun 2023 17:10:02 +0000
Subject: Fix conflicts

---
 gn3/auth/authorisation/users/collections/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gn3/auth/authorisation/users')

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, ...]:
-- 
cgit v1.2.3