trigdep

main.py

@@ -18,7 +18,7 @@ from resolvers.auth import confirm_email_handler
 from services.main import storages_init
 from services.stat.viewed import ViewedStorage
 from services.zine.gittask import GitTask
-from settings import DEV_SERVER_STATUS_FILE_NAME
+from settings import DEV_SERVER_STATUS_FILE_NAME, SENTRY_ID
 
 import_module("resolvers")
 schema = make_executable_schema(load_schema_from_path("schema.graphql"), resolvers)  # type: ignore
@@ -37,6 +37,8 @@ async def start_up():
     print(views_stat_task)
     git_task = asyncio.create_task(GitTask.git_task_worker())
     print(git_task)
+    import sentry_sdk
+    sentry_sdk.init("https://%s@testsentry.discours.io/2" % SENTRY_ID)
 
 
 async def dev_start_up():

requirements.txt

@@ -26,3 +26,4 @@ asyncio~=3.4.3
 python-dateutil~=2.8.2
 beautifulsoup4~=4.11.1
 lxml
+sentry-sdk>=0.10.2

resolvers/inbox/chats.py

@@ -51,20 +51,20 @@ async def update_chat(_, info, chat_new: dict):
 async def create_chat(_, info, title="", members=[]):
     auth: AuthCredentials = info.context["request"].auth
     chat = {}
-
+    print('create_chat members: %r' % members)
     if auth.user_id not in members:
-        members.append(auth.user_id)
+        members.append(int(auth.user_id))
 
     # reuse chat craeted before if exists
     if len(members) == 2 and title == "":
-        chats1 = await redis.execute("SMEMBERS", f"chats_by_user/{members[0].slug}")
-        chats2 = await redis.execute("SMEMBERS", f"chats_by_user/{members[1].slug}")
+        chats1 = await redis.execute("SMEMBERS", f"chats_by_user/{members[0]}")
+        chats2 = await redis.execute("SMEMBERS", f"chats_by_user/{members[1]}")
         chat = None
         for c in chats1.intersection(chats2):
             chat = await redis.execute("GET", f"chats/{c.decode('utf-8')}")
             if chat:
                 chat = json.loads(chat)
-                if chat.title == "":
+                if chat['title'] == "":
                     break
         if chat:
             return {

resolvers/inbox/load.py

@@ -6,7 +6,7 @@ from auth.credentials import AuthCredentials
 from base.redis import redis
 from base.orm import local_session
 from base.resolvers import query
-from base.exceptions import ObjectNotExist, Unauthorized
+from base.exceptions import ObjectNotExist
 from orm.user import User
 from resolvers.zine.profile import followed_authors
 from .unread import get_unread_counter
@@ -48,15 +48,17 @@ async def load_chats(_, info, limit: int = 50, offset: int = 0):
             c['unread'] = await get_unread_counter(cid, auth.user_id)
             with local_session() as session:
                 c['members'] = []
-                for userslug in c["users"]:
-                    a = session.query(User).where(User.slug == userslug).first().dict()
-                    c['members'].append({
-                        "slug": userslug,
-                        "userpic": a["userpic"],
-                        "name": a["name"],
-                        "lastSeen": a["lastSeen"],
-                    })
-            chats.append(c)
+                for uid in c["users"]:
+                    a = session.query(User).where(User.id == uid).first()
+                    if a:
+                        c['members'].append({
+                            "id": a.id,
+                            "slug": a.slug,
+                            "userpic": a.userpic,
+                            "name": a.name,
+                            "lastSeen": a.lastSeen,
+                        })
+                        chats.append(c)
     return {
         "chats": chats,
         "error": None

resolvers/zine/reactions.py

@@ -256,8 +256,7 @@ async def load_reactions_by(_, _info, by, limit=50, offset=0):
         q = q.filter(Reaction.createdAt > after)
 
     order_way = asc if by.get("sort", "").startswith("-") else desc
-    # replace "-" -> "" ?
-    order_field = by.get("sort") or Reaction.createdAt
+    order_field = by.get("sort", "").replace('-', '') or Reaction.createdAt
 
     q = q.group_by(
         Reaction.id, CreatedByUser.id, ReactedShout.id

schema.graphql

@@ -151,7 +151,7 @@ enum FollowingEntity {
 
 type Mutation {
   # inbox
-  createChat(title: String, members: [String]!): Result!
+  createChat(title: String, members: [Int]!): Result!
   updateChat(chat: ChatInput!): Result!
   deleteChat(chatId: String!): Result!
 

server.py

@@ -79,7 +79,7 @@ if __name__ == "__main__":
             host="localhost",
             port=8080,
             headers=local_headers,
-            # log_config=LOGGING_CONFIG,
+            # log_config=log_settings,
             log_level=None,
             access_log=False,
             reload=want_reload

settings.py

@@ -28,3 +28,4 @@ SESSION_TOKEN_HEADER = "Authorization"
 
 # for local development
 DEV_SERVER_STATUS_FILE_NAME = 'dev-server-status.txt'
+SENTRY_ID = environ.get("SENTRY_ID")