login and auth bug fixed

apps/workspace/migrations/0010_remove_workspace_cuser_role_owner.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.1 on 2024-01-22 11:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workspace', '0009_alter_workspace_username'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='workspace',
+            name='cuser_role_owner',
+        ),
+    ]

apps/workspace/migrations/0011_remove_workspace_cuser_owner.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.1 on 2024-01-22 12:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workspace', '0010_remove_workspace_cuser_role_owner'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='workspace',
+            name='cuser_owner',
+        ),
+    ]

apps/workspace/migrations/0012_workspace_cuser_owner.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.1 on 2024-01-22 12:27
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('workspace', '0011_remove_workspace_cuser_owner'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='workspace',
+            name='cuser_owner',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

apps/workspace/migrations/0013_alter_workspace_cuser_owner.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.1 on 2024-01-23 05:00
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('workspace', '0012_workspace_cuser_owner'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='workspace',
+            name='cuser_owner',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

apps/workspace/models.py

@@ -1,15 +1,17 @@
 from django.db import models
 from utils.base_model import BaseModel
 import uuid
-from apps.cuser.models import CuserRole as CuserRoleModel
-from apps.cuser.models import CUser as CUserModel
+from django.contrib.auth import get_user_model
+from apps.cuser.cuser_model import CUser
 # Create your models here.
+#CUserM2 = get_user_model()
 
 
 class Workspace(BaseModel):
-    cuser_role_owner = models.OneToOneField(CuserRoleModel, on_delete=models.CASCADE,
-                                            related_name='workspace', null=True, blank=True)
-    cuser_owner = models.ForeignKey(CUserModel, on_delete=models.CASCADE, null=True, blank=True, default=None)
+    #cuser_role_owner = models.OneToOneField(CuserRoleModel, on_delete=models.CASCADE,
+    #                                        related_name='workspace', null=True, blank=True)
+
+    cuser_owner = models.ForeignKey(CUser, on_delete=models.SET_NULL, null=True, blank=True, default=None)
     name = models.CharField(max_length=15, null=False, blank=False)
     username = models.CharField(max_length=30, null=False, blank=False, unique=True)
     expire = models.DateTimeField(null=True, blank=True)