sarlink/sarlink-portal-api
7
0
Fork 0
mirror of https://github.com/i701/sarlink-portal-api.git synced 2025-10-05 13:35:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(user): enhance user filtering logic to support combined ID card and mobile queries
All checks were successful
Build and Push Docker Images / Build and Push Docker Images (push) Successful in 6m11s
Details

Browse Source
This commit is contained in:
i701
2025-07-31 19:23:12 +05:00
parent fbc8a17e6a
commit 64bba25fb9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/views.py
View File

@@ -515,12 +515,14 @@ def filter_user(request):
return Response({"ok": False}) return Response({"ok": False})
filters = Q() filters = Q()
if id_card is not None: if id_card and mobile:
filters |= Q(id_card=id_card) filters = Q(id_card=id_card) & Q(mobile=mobile)
if mobile is not None: elif id_card:
filters |= Q(mobile=mobile) filters = Q(id_card=id_card)
elif mobile:
filters = Q(mobile=mobile)
user = User.objects.filter(filters).first() user = User.objects.only("id", "verified").filter(filters).first()
print(f"Querying with filters: {filters}") print(f"Querying with filters: {filters}")
print(f"Found user: {user}") print(f"Found user: {user}")
@@ -541,12 +543,14 @@ def filter_temporary_user(request):
return Response({"ok": False}) return Response({"ok": False})
filters = Q() filters = Q()
if id_card is not None: if id_card and mobile:
filters |= Q(t_id_card=id_card) & Q(t_mobile=mobile)
elif id_card:
filters |= Q(t_id_card=id_card) filters |= Q(t_id_card=id_card)
if mobile is not None: elif mobile:
filters |= Q(t_mobile=mobile) filters |= Q(t_mobile=mobile)
user = TemporaryUser.objects.filter(filters).first() user = TemporaryUser.objects.only("t_id", "otp_verified").filter(filters).first()
print(f"Querying with filters: {filters}") print(f"Querying with filters: {filters}")
print(f"Found temporary user: {user}") print(f"Found temporary user: {user}")