in name of god 2.0

Sistemas/models.py

@@ -74,14 +74,18 @@ class Device(models.Model):
     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)
-    username = models.OneToOneField(User, on_delete=models.CASCADE)
+    #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)
+    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()        
-    def generate_unique_username(self,client, device_name,ip_address, macAddress, database):
-        username = f"Device_{client.RFC}_{device_name}_{ip_address}_{macAddress}_{database}"
+    def generate_unique_username(self,client, device_name,ip_address, macAddress):
+        username = f"Device_{client.RFC}_{device_name}_{ip_address}_{macAddress}"
         username_ = re.sub(r'\W+', '', username)
 
         if User.objects.filter(username=username_).exists():
@@ -94,7 +98,7 @@ class Device(models.Model):
 
     def save(self, *args, **kwargs):
         if not self.pk:
-            obj = self.generate_unique_username(self.client,self.device_name, self.ip_address, self.macAddress, self.database)
+            obj = self.generate_unique_username(self.client,self.device_name, self.ip_address, self.macAddress)
             self.username= obj
 
             token, created = Token.objects.get_or_create(user=obj)