Restructure Device Register

Sistemas/models.py

@@ -73,24 +73,25 @@ class Device(models.Model):
     client = models.ForeignKey(Clientes,on_delete=models.CASCADE)
     device_name = models.CharField(max_length=255)
     device_os = models.CharField(max_length=255)
-    ip_address= models.GenericIPAddressField()
-    #token = models.OneToOneField(Token, on_delete=models.CASCADE, blank=True,null=True)
-    token = models.ForeignKey(Token, on_delete=models.CASCADE, blank=True,null=True)
-
-    #username = models.OneToOneField(User, on_delete=models.CASCADE)
+    ip_address= models.GenericIPAddressField()    
+    token = models.ForeignKey(Token, on_delete=models.CASCADE, blank=True,null=True)    
     username = models.ForeignKey(User, on_delete=models.CASCADE)
-
     sistema = models.ForeignKey(Sistema,on_delete=models.CASCADE, blank=True, null=True)
     macAddress = models.CharField(max_length=30, blank=True,null=True)
     database = models.CharField(max_length=30, blank=True,null=True)
-    #objects = DeviceManager()        
+    #objects = DeviceManager()
+
+    class Meta:
+        ordering = ('username',)
+
     def generate_unique_username(self,client, device_name,ip_address, macAddress):
-        username = f"Device_{client.RFC}_{device_name}_{ip_address}_{macAddress}"
+        #username = f"Device_{client.RFC}_{device_name}_{ip_address}_{macAddress}"
+        username = f"Device_{client.RFC}_{device_name}_{macAddress}"
         username_ = re.sub(r'\W+', '', username)
 
         if User.objects.filter(username=username_).exists():
             return User.objects.get(username=username_)
-            raise ValidationError(f"El Usuario ya existe {username_}")
+            #raise ValidationError(f"El Usuario ya existe {username_}")
         obj= User.objects.create_user(
             username=username_
         )
@@ -116,12 +117,6 @@ class DeviceHistory(models.Model):
     last_authentication  = models.DateTimeField(auto_now=True)
     ip_address = models.GenericIPAddressField()
 
-
-
-
-
-    
-
 class Maquinas_Conectadas(models.Model):
     
     UserName = models.CharField(max_length=255)
@@ -130,7 +125,6 @@ class Maquinas_Conectadas(models.Model):
     OSversion= models.CharField(max_length=255)
     local_ip = models.CharField(max_length=55)
     public_ip= models.CharField(max_length=55)
-
     Token    = models.CharField(max_length=50)
     Cliente  = models.CharField(max_length=13)
     class Meta: