first base of project-changed apps: Herd-livestock-tag-log-elasticsearch-

apps/authorization/models.py

@@ -17,8 +17,14 @@ class Permissions(BaseModel):
 
 
 class Role(BaseModel):
-    role_name = models.CharField(max_length=50)
+    role_name = models.CharField(max_length=50, unique=True)
     description = models.TextField(max_length=500)
+    type = models.ForeignKey(
+        auth_models.OrganizationType,
+        on_delete=models.CASCADE,
+        related_name="organization_role_type",
+        null=True
+    )
     permissions = models.ManyToManyField(Permissions)
 
     def __str__(self):
@@ -28,26 +34,28 @@ class Role(BaseModel):
         super(Role, self).save(*args, **kwargs)
 
 
-class OrganizationRole(BaseModel):
+class UserRelations(BaseModel):
     user = models.ForeignKey(
         auth_models.User,
         on_delete=models.CASCADE,
-        related_name='organization_user',
+        related_name='user_relation',
         null=True
     )
     organization = models.ForeignKey(
         auth_models.Organization,
         on_delete=models.CASCADE,
-        related_name='organization'
+        related_name='user_organization'
     )
     role = models.ForeignKey(
         Role,
         on_delete=models.CASCADE,
-        related_name='organization_role'
+        related_name='user_role',
+        null=True
     )
+    permissions = models.ManyToManyField(Permissions)
 
     def __str__(self):
         return f'{self.organization.name}-{self.user.username}'
 
     def save(self, *args, **kwargs):
-        super(OrganizationRole, self).save(*args, **kwargs)
+        super(UserRelations, self).save(*args, **kwargs)