global session to local session

resolvers/auth.py

@@ -6,7 +6,7 @@ from auth.identity import Identity
 from auth.password import Password
 from auth.validations import CreateUser
 from orm import User
-from orm.base import global_session
+from orm.base import local_session
 from resolvers.base import mutation, query
 from exceptions import InvalidPassword
 
@@ -44,7 +44,8 @@ async def register(*_, email: str, password: str = ""):
 
 @query.field("signIn")
 async def sign_in(_, info: GraphQLResolveInfo, email: str, password: str):
-	orm_user = global_session.query(User).filter(User.email == email).first()
+	with local_session() as session:
+		orm_user = session.query(User).filter(User.email == email).first()
 	if orm_user is None:
 		return {"error" : "invalid email"}
 
@@ -75,10 +76,12 @@ async def sign_out(_, info: GraphQLResolveInfo):
 async def get_user(_, info):
 	auth = info.context["request"].auth
 	user_id = auth.user_id
-	user = global_session.query(User).filter(User.id == user_id).first()
+	with local_session() as session:
+		user = session.query(User).filter(User.id == user_id).first()
 	return { "user": user }
 
 @query.field("isEmailFree")
 async def is_email_free(_, info, email):
-	user = global_session.query(User).filter(User.email == email).first()
+	with local_session() as session:
+		user = session.query(User).filter(User.email == email).first()
 	return user is None

resolvers/inbox.py

@@ -1,5 +1,5 @@
 from orm import Message, User
-from orm.base import global_session
+from orm.base import local_session
 
 from resolvers.base import mutation, query, subscription
 
@@ -37,12 +37,13 @@ async def get_messages(_, info, count, page):
 	auth = info.context["request"].auth
 	user_id = auth.user_id
 	
-	messages = global_session.query(Message).filter(Message.author == user_id)
+	with local_session() as session:
+		messages = session.query(Message).filter(Message.author == user_id)
 	
 	return messages
 
-def check_and_get_message(message_id, user_id) :
-	message = global_session.query(Message).filter(Message.id == message_id).first()
+def check_and_get_message(message_id, user_id, session) :
+	message = session.query(Message).filter(Message.id == message_id).first()
 	
 	if not message :
 		raise Exception("invalid id")
@@ -58,13 +59,14 @@ async def update_message(_, info, id, body):
 	auth = info.context["request"].auth
 	user_id = auth.user_id
 	
-	try:
-		message = check_and_get_message(id, user_id)
-	except Exception as err:
-		return {"error" : err}
+	with local_session() as session:
+		try:
+			message = check_and_get_message(id, user_id, session)
+		except Exception as err:
+			return {"error" : err}
 	
-	message.body = body
-	global_session.commit()
+		message.body = body
+		session.commit()
 	
 	MessageQueue.updated_message.put_nowait(message)
 	
@@ -76,13 +78,14 @@ async def delete_message(_, info, id):
 	auth = info.context["request"].auth
 	user_id = auth.user_id
 	
-	try:
-		message = check_and_get_message(id, user_id)
-	except Exception as err:
-		return {"error" : err}
+	with local_session() as session:
+		try:
+			message = check_and_get_message(id, user_id, session)
+		except Exception as err:
+			return {"error" : err}
 	
-	global_session.delete(message)
-	global_session.commit()
+		session.delete(message)
+		session.commit()
 	
 	MessageQueue.deleted_message.put_nowait(message)