From 4fe84dbfb6130f757627347080015fca93f6119a Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Mon, 10 Apr 2023 09:40:24 -0600 Subject: [PATCH] Correct Username search in get token view --- Sistemas/views.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Sistemas/views.py b/Sistemas/views.py index 793e951..ca413f1 100644 --- a/Sistemas/views.py +++ b/Sistemas/views.py @@ -230,14 +230,21 @@ class GetDeviceToken(APIView): data = request.data sis = Sistema.objects.get(nombre_sistema=data.get('sistema')) cli = Clientes.objects.get(RFC=data.get('client')) + device_name= data.get('device_name') + ip_address = data.get('ip_address') + macAddress = data.get('macAddress') + username = f"Device_{cli.RFC}_{device_name}_{ip_address}_{macAddress}" + username = re.sub(r'\W+', '', username) - device = Device.objects.filter( - Q(client__id=cli.id) - & Q(macAddress=data.get('macAddress')) - & Q(device_name__icontains=data.get('device_name')) - & Q(ip_address__icontains=data.get('ip_address')) - & Q(sistema__id= sis.id) - & Q(database=data.get('database')) + + device = Device.objects.filter( + Q(username__username__icontains=username) + # Q(client__id=cli.id) + # & Q(macAddress=data.get('macAddress')) + # & Q(device_name__icontains=data.get('device_name')) + # & Q(ip_address__icontains=data.get('ip_address')) + # & Q(sistema__id= sis.id) + # & Q(database=data.get('database')) ).first() if device is not None: