klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-09 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #577 from khoj-ai/fix/user-subscription-email-not-exists

Browse Source 
Fix null exception when user does not exist for subscription
This commit is contained in:
sabaimran
2023-12-03 15:14:31 -08:00
committed by GitHub
parent c5d297a9ed cc064ea57d
commit 62a89f79b7
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/khoj/database/adapters/__init__.py
View File

@@ -85,6 +85,15 @@ async def get_or_create_user(token: dict) -> KhojUser:
return user return user
async def get_or_create_user_by_email(email: str) -> KhojUser:
user, _ = await KhojUser.objects.filter(email=email).aupdate_or_create(defaults={"username": email, "email": email})
await user.asave()
await Subscription.objects.acreate(user=user, type="trial")
return user
async def create_user_by_google_token(token: dict) -> KhojUser: async def create_user_by_google_token(token: dict) -> KhojUser:
user, _ = await KhojUser.objects.filter(email=token.get("email")).aupdate_or_create( user, _ = await KhojUser.objects.filter(email=token.get("email")).aupdate_or_create(
defaults={"username": token.get("email"), "email": token.get("email")} defaults={"username": token.get("email"), "email": token.get("email")}
@@ -115,7 +124,10 @@ def get_user_subscription(email: str) -> Optional[Subscription]:
async def set_user_subscription( async def set_user_subscription(
email: str, is_recurring=None, renewal_date=None, type="standard" email: str, is_recurring=None, renewal_date=None, type="standard"
) -> Optional[Subscription]: ) -> Optional[Subscription]:
user_subscription = await Subscription.objects.filter(user__email=email).afirst() # Get or create the user object
user = await get_or_create_user_by_email(email)
user_subscription = await Subscription.objects.filter(user=user).afirst()
if not user_subscription: if not user_subscription:
user = await get_user_by_email(email) user = await get_user_by_email(email)
if not user: if not user: