refactor: rename IssueUserProperty to ProjectUserProperty and update related references across the codebase

pablohashescobar · pablohashescobar · commit 6a09e5154198 · 2025-12-01T14:47:59.000+05:30
diff --git a/apps/api/plane/api/views/project.py b/apps/api/plane/api/views/project.py
@@ -18,7 +18,7 @@
 from plane.db.models import (
     Cycle,
     Intake,
-    IssueUserProperty,
+    ProjectUserProperty,
     Module,
     Project,
     DeployBoard,
@@ -217,7 +217,7 @@ def post(self, request, slug):
                 # Add the user as Administrator to the project
                 _ = ProjectMember.objects.create(project_id=serializer.instance.id, member=request.user, role=20)
                 # Also create the issue property for the user
-                _ = IssueUserProperty.objects.create(project_id=serializer.instance.id, user=request.user)
+                _ = ProjectUserProperty.objects.create(project_id=serializer.instance.id, user=request.user)
 
                 if serializer.instance.project_lead is not None and str(serializer.instance.project_lead) != str(
                     request.user.id
@@ -228,7 +228,7 @@ def post(self, request, slug):
                         role=20,
                     )
                     # Also create the issue property for the user
-                    IssueUserProperty.objects.create(
+                    ProjectUserProperty.objects.create(
                         project_id=serializer.instance.id,
                         user_id=serializer.instance.project_lead,
                     )
diff --git a/apps/api/plane/app/serializers/issue.py b/apps/api/plane/app/serializers/issue.py
@@ -18,7 +18,7 @@
     Issue,
     IssueActivity,
     IssueComment,
-    IssueUserProperty,
+    ProjectUserProperty,
     IssueAssignee,
     IssueSubscriber,
     IssueLabel,
@@ -348,7 +348,7 @@ class Meta:
 
 class IssueUserPropertySerializer(BaseSerializer):
     class Meta:
-        model = IssueUserProperty
+        model = ProjectUserProperty
         fields = "__all__"
         read_only_fields = ["user", "workspace", "project"]
 
diff --git a/apps/api/plane/app/urls/issue.py b/apps/api/plane/app/urls/issue.py
@@ -208,13 +208,13 @@
         name="project-issue-comment-reactions",
     ),
     ## End Comment Reactions
-    ## IssueUserProperty
+    ## ProjectUserProperty
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/user-properties/",
         IssueUserDisplayPropertyEndpoint.as_view(),
         name="project-issue-display-properties",
     ),
-    ## IssueUserProperty End
+    ## ProjectUserProperty End
     ## Issue Archives
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/archived-issues/",
diff --git a/apps/api/plane/app/views/issue/base.py b/apps/api/plane/app/views/issue/base.py
@@ -51,7 +51,7 @@
     IssueReaction,
     IssueRelation,
     IssueSubscriber,
-    IssueUserProperty,
+    ProjectUserProperty,
     ModuleIssue,
     Project,
     ProjectMember,
@@ -718,7 +718,7 @@ def destroy(self, request, slug, project_id, pk=None):
 class IssueUserDisplayPropertyEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def patch(self, request, slug, project_id):
-        issue_property = IssueUserProperty.objects.get(user=request.user, project_id=project_id)
+        issue_property = ProjectUserProperty.objects.get(user=request.user, project_id=project_id)
 
         issue_property.rich_filters = request.data.get("rich_filters", issue_property.rich_filters)
         issue_property.filters = request.data.get("filters", issue_property.filters)
@@ -730,7 +730,7 @@ def patch(self, request, slug, project_id):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id):
-        issue_property, _ = IssueUserProperty.objects.get_or_create(user=request.user, project_id=project_id)
+        issue_property, _ = ProjectUserProperty.objects.get_or_create(user=request.user, project_id=project_id)
         serializer = IssueUserPropertySerializer(issue_property)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
diff --git a/apps/api/plane/app/views/project/base.py b/apps/api/plane/app/views/project/base.py
@@ -26,7 +26,7 @@
     UserFavorite,
     Intake,
     DeployBoard,
-    IssueUserProperty,
+    ProjectUserProperty,
     Project,
     ProjectIdentifier,
     ProjectMember,
@@ -249,7 +249,7 @@ def create(self, request, slug):
                 role=ROLE.ADMIN.value,
             )
             # Also create the issue property for the user
-            _ = IssueUserProperty.objects.create(project_id=serializer.data["id"], user=request.user)
+            _ = ProjectUserProperty.objects.create(project_id=serializer.data["id"], user=request.user)
 
             if serializer.data["project_lead"] is not None and str(serializer.data["project_lead"]) != str(
                 request.user.id
@@ -260,7 +260,7 @@ def create(self, request, slug):
                     role=ROLE.ADMIN.value,
                 )
                 # Also create the issue property for the user
-                IssueUserProperty.objects.create(
+                ProjectUserProperty.objects.create(
                     project_id=serializer.data["id"],
                     user_id=serializer.data["project_lead"],
                 )
diff --git a/apps/api/plane/app/views/project/invite.py b/apps/api/plane/app/views/project/invite.py
@@ -24,7 +24,7 @@
     User,
     WorkspaceMember,
     Project,
-    IssueUserProperty,
+    ProjectUserProperty,
 )
 from plane.db.models.project import ProjectNetwork
 from plane.utils.host import base_host
@@ -160,9 +160,9 @@ def create(self, request, slug):
             ignore_conflicts=True,
         )
 
-        IssueUserProperty.objects.bulk_create(
+        ProjectUserProperty.objects.bulk_create(
             [
-                IssueUserProperty(
+                ProjectUserProperty(
                     project_id=project_id,
                     user=request.user,
                     workspace=workspace,
diff --git a/apps/api/plane/app/views/project/member.py b/apps/api/plane/app/views/project/member.py
@@ -13,7 +13,7 @@
 
 from plane.app.permissions import WorkspaceUserPermission
 
-from plane.db.models import Project, ProjectMember, IssueUserProperty, WorkspaceMember
+from plane.db.models import Project, ProjectMember, ProjectUserProperty, WorkspaceMember
 from plane.bgtasks.project_add_user_email_task import project_add_user_email
 from plane.utils.host import base_host
 from plane.app.permissions.base import allow_permission, ROLE
@@ -119,7 +119,7 @@ def create(self, request, slug, project_id):
             )
             # Create a new issue property
             bulk_issue_props.append(
-                IssueUserProperty(
+                ProjectUserProperty(
                     user_id=member.get("member_id"),
                     project_id=project_id,
                     workspace_id=project.workspace_id,
@@ -129,7 +129,7 @@ def create(self, request, slug, project_id):
         # Bulk create the project members and issue properties
         project_members = ProjectMember.objects.bulk_create(bulk_project_members, batch_size=10, ignore_conflicts=True)
 
-        _ = IssueUserProperty.objects.bulk_create(bulk_issue_props, batch_size=10, ignore_conflicts=True)
+        _ = ProjectUserProperty.objects.bulk_create(bulk_issue_props, batch_size=10, ignore_conflicts=True)
 
         project_members = ProjectMember.objects.filter(
             project_id=project_id,
diff --git a/apps/api/plane/bgtasks/workspace_seed_task.py b/apps/api/plane/bgtasks/workspace_seed_task.py
@@ -20,7 +20,7 @@
     WorkspaceMember,
     Project,
     ProjectMember,
-    IssueUserProperty,
+    ProjectUserProperty,
     State,
     Label,
     Issue,
@@ -118,9 +118,9 @@ def create_project_and_member(workspace: Workspace) -> Dict[int, uuid.UUID]:
         )
 
         # Create issue user properties
-        IssueUserProperty.objects.bulk_create(
+        ProjectUserProperty.objects.bulk_create(
             [
-                IssueUserProperty(
+                ProjectUserProperty(
                     project=project,
                     user_id=workspace_member["member_id"],
                     workspace_id=workspace.id,
diff --git a/apps/api/plane/db/management/commands/create_project_member.py b/apps/api/plane/db/management/commands/create_project_member.py
@@ -8,7 +8,7 @@
     WorkspaceMember,
     ProjectMember,
     Project,
-    IssueUserProperty,
+    ProjectUserProperty,
 )
 
 
@@ -67,7 +67,7 @@ def handle(self, *args: Any, **options: Any):
                 ProjectMember.objects.create(project=project, member=user, role=role, sort_order=sort_order)
 
             # Issue Property
-            IssueUserProperty.objects.get_or_create(user=user, project=project)
+            ProjectUserProperty.objects.get_or_create(user=user, project=project)
 
             # Success message
             self.stdout.write(self.style.SUCCESS(f"User {user_email} added to project {project_id}"))
diff --git a/apps/api/plane/db/migrations/0113_alter_issueuserproperty_table.py b/apps/api/plane/db/migrations/0113_alter_issueuserproperty_table.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.25 on 2025-11-28 14:36
+
+from django.db import migrations, models
+import plane.db.models.project
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0112_auto_20251124_0603'),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name='issueuserproperty',
+            table='project_user_properties',
+        ),
+        migrations.RenameModel(
+            old_name='IssueUserProperty',
+            new_name='ProjectUserProperty',
+        ),
+        migrations.AddField(
+            model_name='apitoken',
+            name='allowed_rate_limit',
+            field=models.CharField(default='60/min', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='projectuserproperty',
+            name='preferences',
+            field=models.JSONField(default=plane.db.models.project.get_default_preferences),
+        ),
+        migrations.AddField(
+            model_name='projectuserproperty',
+            name='sort_order',
+            field=models.FloatField(default=65535),
+        ),
+    ]
diff --git a/apps/api/plane/db/migrations/0114_auto_20251201_0857.py b/apps/api/plane/db/migrations/0114_auto_20251201_0857.py
@@ -0,0 +1,42 @@
+# Generated by Django 4.2.25 on 2025-12-01 08:57
+
+from django.db import migrations
+
+def move_issue_user_properties_to_project_user_properties(apps, schema_editor):
+    ProjectMember = apps.get_model('db', 'ProjectMember')
+    ProjectUserProperty = apps.get_model('db', 'ProjectUserProperty')
+
+    # Get all project members
+    project_members = ProjectMember.objects.filter(deleted_at__isnull=True).values('member_id', 'project_id', 'preferences', 'sort_order')
+
+    # create a mapping with consistent ordering 
+    pm_dict = {
+        (pm['member_id'], pm['project_id']): pm
+        for pm in project_members
+    }
+    
+    # Get all project user properties
+    properties_to_update = []
+    for projectuserproperty in ProjectUserProperty.objects.filter(deleted_at__isnull=True):
+        pm = pm_dict.get((projectuserproperty.user_id, projectuserproperty.project_id))
+        if pm:
+            projectuserproperty.preferences = pm['preferences']
+            projectuserproperty.sort_order = pm['sort_order']
+            properties_to_update.append(projectuserproperty)
+
+    ProjectUserProperty.objects.bulk_update(properties_to_update, ['preferences', 'sort_order'], batch_size=2000)
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0113_alter_issueuserproperty_table'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            move_issue_user_properties_to_project_user_properties, 
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]
diff --git a/apps/api/plane/db/models/__init__.py b/apps/api/plane/db/models/__init__.py
@@ -34,7 +34,6 @@
     IssueLabel,
     IssueLink,
     IssueMention,
-    IssueUserProperty,
     IssueReaction,
     IssueRelation,
     IssueSequence,
@@ -53,6 +52,7 @@
     ProjectMember,
     ProjectMemberInvite,
     ProjectPublicMember,
+    ProjectUserProperty,
 )
 from .session import Session
 from .social_connection import SocialLoginConnection
diff --git a/apps/api/plane/db/models/api.py b/apps/api/plane/db/models/api.py
@@ -32,6 +32,7 @@ class APIToken(BaseModel):
     workspace = models.ForeignKey("db.Workspace", related_name="api_tokens", on_delete=models.CASCADE, null=True)
     expired_at = models.DateTimeField(blank=True, null=True)
     is_service = models.BooleanField(default=False)
+    allowed_rate_limit = models.CharField(max_length=255, default="60/min")
 
     class Meta:
         verbose_name = "API Token"
diff --git a/apps/api/plane/db/models/issue.py b/apps/api/plane/db/models/issue.py
@@ -536,36 +536,6 @@ def __str__(self):
         return str(self.issue)
 
 
-class IssueUserProperty(ProjectBaseModel):
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="issue_property_user",
-    )
-    filters = models.JSONField(default=get_default_filters)
-    display_filters = models.JSONField(default=get_default_display_filters)
-    display_properties = models.JSONField(default=get_default_display_properties)
-    rich_filters = models.JSONField(default=dict)
-
-    class Meta:
-        verbose_name = "Issue User Property"
-        verbose_name_plural = "Issue User Properties"
-        db_table = "issue_user_properties"
-        ordering = ("-created_at",)
-        unique_together = ["user", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_user_property_unique_user_project_when_deleted_at_null",
-            )
-        ]
-
-    def __str__(self):
-        """Return properties status of the issue"""
-        return str(self.user)
-
-
 class IssueLabel(ProjectBaseModel):
     issue = models.ForeignKey("db.Issue", on_delete=models.CASCADE, related_name="label_issue")
     label = models.ForeignKey("db.Label", on_delete=models.CASCADE, related_name="label_issue")
diff --git a/apps/api/plane/db/models/project.py b/apps/api/plane/db/models/project.py
@@ -12,7 +12,6 @@
 # Module imports
 from plane.db.mixins import AuditModel
 
-# Module imports
 from .base import BaseModel
 
 ROLE_CHOICES = ((20, "Admin"), (15, "Member"), (5, "Guest"))
@@ -313,3 +312,37 @@ class Meta:
         verbose_name_plural = "Project Public Members"
         db_table = "project_public_members"
         ordering = ("-created_at",)
+
+
+class ProjectUserProperty(ProjectBaseModel):
+
+    from .issue import get_default_filters, get_default_display_filters, get_default_display_properties
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="issue_property_user",
+    )
+    filters = models.JSONField(default=get_default_filters)
+    display_filters = models.JSONField(default=get_default_display_filters)
+    display_properties = models.JSONField(default=get_default_display_properties)
+    rich_filters = models.JSONField(default=dict)
+    preferences = models.JSONField(default=get_default_preferences)
+    sort_order = models.FloatField(default=65535)
+
+    class Meta:
+        verbose_name = "Issue User Property"
+        verbose_name_plural = "Issue User Properties"
+        db_table = "project_user_properties"
+        ordering = ("-created_at",)
+        unique_together = ["user", "project", "deleted_at"]
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "project"],
+                condition=Q(deleted_at__isnull=True),
+                name="issue_user_property_unique_user_project_when_deleted_at_null",
+            )
+        ]
+
+    def __str__(self):
+        """Return properties status of the issue"""
+        return str(self.user)
diff --git a/apps/api/plane/tests/contract/app/test_project_app.py b/apps/api/plane/tests/contract/app/test_project_app.py

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`User,`
`25`	`25`	`WorkspaceMember,`
`26`	`26`	`Project,`
`27`		`- IssueUserProperty,`
	`27`	`+ ProjectUserProperty,`
`28`	`28`	`)`
`29`	`29`	`from plane.db.models.project import ProjectNetwork`
`30`	`30`	`from plane.utils.host import base_host`
`@@ -160,9 +160,9 @@ def create(self, request, slug):`
`160`	`160`	`ignore_conflicts=True,`
`161`	`161`	`)`
`162`	`162`
`163`		`- IssueUserProperty.objects.bulk_create(`
	`163`	`+ ProjectUserProperty.objects.bulk_create(`
`164`	`164`	`[`
`165`		`- IssueUserProperty(`
	`165`	`+ ProjectUserProperty(`
`166`	`166`	`project_id=project_id,`
`167`	`167`	`user=request.user,`
`168`	`168`	`workspace=workspace,`