login and auth bug fixed

apps/cuser/cuser_model.py

@@ -0,0 +1,46 @@
+from django.db import models
+from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
+from utils.base_model import BaseModel
+import uuid
+
+
+class CUserManager(BaseUserManager):
+    def create_user(self, username, password, **extra_fields):
+        if not username:
+            raise ValueError("Please Enter username")
+        user = self.model(username=username, **extra_fields)
+        user.set_password(password)
+        user.save()
+        return user
+
+    def create_superuser(self, username, password, **extra_fields):
+        extra_fields.setdefault('is_staff', True)
+        extra_fields.setdefault('is_superuser', True)
+        extra_fields.setdefault('is_active', True)
+
+        return self.create_user(username, password, **extra_fields)
+
+
+class CUser(BaseModel, AbstractBaseUser, PermissionsMixin):
+    username = models.CharField(max_length=50, null=False, blank=False, unique=True)
+    mobile = models.PositiveBigIntegerField(null=False, blank=False, unique=True)
+    name_family = models.CharField(max_length=50, null=True, blank=True)
+    is_active = models.BooleanField(default=False)
+    is_staff = models.BooleanField(default=False)
+    is_superuser = models.BooleanField(default=False)
+    uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
+
+    USERNAME_FIELD = 'username'
+
+    objects = CUserManager()
+
+    class Meta:
+        permissions = [
+            ('user_is_workspace_owner', 'user is workspace owner'),
+            ('user_is_workspace_admin', 'user is workspace admin'),
+            ('user_is_workspace_operator', 'user is workspace operator'),
+            ('user_is_workspace_customer', 'user is workspace customer'),
+        ]
+
+    def __str__(self):
+        return str(self.username)

apps/cuser/migrations/0008_remove_cuserrole_cuser_cuserrole_sys_ws.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.1 on 2024-01-22 12:15
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workspace', '0011_remove_workspace_cuser_owner'),
+        ('cuser', '0007_alter_cuser_mobile'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cuserrole',
+            name='cuser',
+        ),
+        migrations.AddField(
+            model_name='cuserrole',
+            name='sys_ws',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='workspace.workspace'),
+        ),
+    ]

apps/cuser/migrations/0009_cuserrole_cuser.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.1 on 2024-01-22 12:18
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cuser', '0008_remove_cuserrole_cuser_cuserrole_sys_ws'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cuserrole',
+            name='cuser',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cuser_role', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

apps/cuser/models.py

@@ -1,53 +1,14 @@
 from django.db import models
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
 from utils.base_model import BaseModel
-#from apps.workspace.models import Workspace as WorkspaceModel
+from apps.workspace.models import Workspace as WorkspaceModel
+#from apps.cuser.cuser_model import CUser
 import uuid
-
+from django.contrib.auth import get_user_model
+CUser = get_user_model()
 # Create your models here.
 import random
 
-class CUserManager(BaseUserManager):
-    def create_user(self, username, password, **extra_fields):
-        if not username:
-            raise ValueError("Please Enter username")
-        user = self.model(username=username, **extra_fields)
-        user.set_password(password)
-        user.save()
-        return user
-
-    def create_superuser(self, username, password, **extra_fields):
-        extra_fields.setdefault('is_staff', True)
-        extra_fields.setdefault('is_superuser', True)
-        extra_fields.setdefault('is_active', True)
-
-        return self.create_user(username, password, **extra_fields)
-
-
-class CUser(BaseModel, AbstractBaseUser, PermissionsMixin):
-    username = models.CharField(max_length=50, null=False, blank=False, unique=True)
-    mobile = models.PositiveBigIntegerField(null=False, blank=False, unique=True)
-    name_family = models.CharField(max_length=50, null=True, blank=True)
-    is_active = models.BooleanField(default=False)
-    is_staff = models.BooleanField(default=False)
-    is_superuser = models.BooleanField(default=False)
-    uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
-
-    USERNAME_FIELD = 'username'
-
-    objects = CUserManager()
-
-    class Meta:
-        permissions = [
-            ('user_is_workspace_owner', 'user is workspace owner'),
-            ('user_is_workspace_admin', 'user is workspace admin'),
-            ('user_is_workspace_operator', 'user is workspace operator'),
-            ('user_is_workspace_customer', 'user is workspace customer'),
-        ]
-
-    def __str__(self):
-        return str(self.username)
-
 
 class RoleType(BaseModel):
     role_name = models.CharField(max_length=20, null=False, blank=False)
@@ -58,13 +19,13 @@ class RoleType(BaseModel):
 
 
 class CuserRole(BaseModel):
-    cuser = models.ForeignKey(CUser, on_delete=models.CASCADE, related_name='cuser_role')
+    cuser = models.ForeignKey(CUser, on_delete=models.CASCADE, related_name='cuser_role', null=True, blank=True, default=None)
     role_type = models.ForeignKey(RoleType, on_delete=models.CASCADE, related_name='role_type')
     name_family = models.CharField(max_length=30, null=False, blank=False)
     title = models.CharField(max_length=30, null=True, blank=True)
     mobile = models.PositiveBigIntegerField(null=False, blank=False)
     mobile_verify = models.BooleanField(default=False)
-    #sys_ws = models.ForeignKey(WorkspaceModel, on_delete=models.CASCADE, null=True, blank=True, default=None)
+    sys_ws = models.ForeignKey(WorkspaceModel, on_delete=models.CASCADE, null=True, blank=True, default=None)
 
     uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
     is_active = models.BooleanField(default=False)