Merge pull request #49 from bugout-dev/fix-get-journals

Fix permission requests.

Author: Andrey Dolgolev

spire/journal/actions.py

@@ -159,7 +159,14 @@ async def find_journals(
     Return list of journals for requested user.
     """
     query = (
-        db_session.query(Journal)
+        db_session.query(
+            Journal.id,
+            Journal.bugout_user_id,
+            func.array_agg(JournalPermissions.holder_id).label("holders_ids"),
+            Journal.name,
+            Journal.created_at,
+            Journal.updated_at,
+        )
         .join(JournalPermissions, JournalPermissions.journal_id == Journal.id)
         .join(SpireOAuthScopes, JournalPermissions.permission == SpireOAuthScopes.scope)
         .filter(SpireOAuthScopes.api == "journals", Journal.deleted == False)
@@ -171,6 +178,13 @@ async def find_journals(
                 JournalPermissions.holder_id == user_id,
             )
         )
+        .group_by(
+            Journal.id,
+            Journal.bugout_user_id,
+            Journal.name,
+            Journal.created_at,
+            Journal.updated_at,
+        )
     )
 
     journals = query.all()

spire/journal/api.py

@@ -460,7 +460,7 @@ async def list_journals(
             JournalResponse(
                 id=journal.id,
                 bugout_user_id=journal.bugout_user_id,
-                holder_ids={holder.holder_id for holder in journal.permissions},
+                holder_ids=journal.holders_ids,
                 name=journal.name,
                 created_at=journal.created_at,
                 updated_at=journal.updated_at,