chore: update file uploads

apiserver/plane/api/serializers/__init__.py

@@ -5,9 +5,7 @@
     IssueSerializer,
     LabelSerializer,
     IssueLinkSerializer,
-    IssueAttachmentSerializer,
     IssueCommentSerializer,
-    IssueAttachmentSerializer,
     IssueActivitySerializer,
     IssueExpandSerializer,
 )

apiserver/plane/api/serializers/issue.py

@@ -13,7 +13,6 @@
     Issue,
     IssueActivity,
     IssueAssignee,
-    IssueAttachment,
     IssueComment,
     IssueLabel,
     IssueLink,
@@ -79,7 +78,7 @@ def validate(self, data):
                 parsed_str = html.tostring(parsed, encoding="unicode")
                 data["description_html"] = parsed_str
 
-        except Exception as e:
+        except Exception:
             raise serializers.ValidationError("Invalid HTML passed")
 
         # Validate assignees are from project
@@ -323,22 +322,6 @@ def update(self, instance, validated_data):
         return super().update(instance, validated_data)
 
 
-class IssueAttachmentSerializer(BaseSerializer):
-    class Meta:
-        model = IssueAttachment
-        fields = "__all__"
-        read_only_fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "created_by",
-            "updated_by",
-            "created_at",
-            "updated_at",
-        ]
-
-
 class IssueCommentSerializer(BaseSerializer):
     is_member = serializers.BooleanField(read_only=True)
 
@@ -366,7 +349,7 @@ def validate(self, data):
                 parsed_str = html.tostring(parsed, encoding="unicode")
                 data["comment_html"] = parsed_str
 
-        except Exception as e:
+        except Exception:
             raise serializers.ValidationError("Invalid HTML passed")
         return data
 

apiserver/plane/api/views/cycle.py

@@ -17,7 +17,7 @@
     Issue,
     CycleIssue,
     IssueLink,
-    IssueAttachment,
+    FileAsset,
 )
 from plane.app.permissions import ProjectEntityPermission
 from plane.api.serializers import (
@@ -580,8 +580,9 @@ def get(self, request, slug, project_id, cycle_id):
                 .values("count")
             )
             .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
+                attachment_count=FileAsset.objects.filter(
+                    entity_identifier=OuterRef("id"),
+                    entity_type="issue_attachment",
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))

apiserver/plane/api/views/issue.py

@@ -1,9 +1,8 @@
 # Python imports
 import json
 
-from django.core.serializers.json import DjangoJSONEncoder
-
 # Django imports
+from django.core.serializers.json import DjangoJSONEncoder
 from django.db import IntegrityError
 from django.db.models import (
     Case,
@@ -23,7 +22,6 @@
 from rest_framework import status
 from rest_framework.response import Response
 
-# Module imports
 from plane.api.serializers import (
     IssueActivitySerializer,
     IssueCommentSerializer,
@@ -38,16 +36,17 @@
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
+    FileAsset,
     Issue,
     IssueActivity,
-    IssueAttachment,
     IssueComment,
     IssueLink,
     Label,
     Project,
     ProjectMember,
 )
 
+# Module imports
 from .base import BaseAPIView, WebhookMixin
 
 
@@ -128,8 +127,9 @@ def get(self, request, slug, project_id, pk=None):
                 .values("count")
             )
             .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
+                attachment_count=FileAsset.objects.filter(
+                    entity_identifier=OuterRef("id"),
+                    entity_type="issue_attachment",
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))

apiserver/plane/api/views/module.py

@@ -19,8 +19,8 @@
     ModuleLink,
     Issue,
     ModuleIssue,
-    IssueAttachment,
     IssueLink,
+    FileAsset,
 )
 from plane.api.serializers import (
     ModuleSerializer,
@@ -332,8 +332,9 @@ def get(self, request, slug, project_id, module_id):
                 .values("count")
             )
             .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
+                attachment_count=FileAsset.objects.filter(
+                    entity_identifier=OuterRef("id"),
+                    entity_type="issue_attachment",
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))

apiserver/plane/app/serializers/__init__.py

@@ -60,7 +60,6 @@
     IssueStateSerializer,
     IssueLinkSerializer,
     IssueLiteSerializer,
-    IssueAttachmentSerializer,
     IssueSubscriberSerializer,
     IssueReactionSerializer,
     CommentReactionSerializer,
@@ -70,7 +69,6 @@
     IssuePublicSerializer,
     IssueDetailSerializer,
     IssueReactionLiteSerializer,
-    IssueAttachmentLiteSerializer,
     IssueLinkLiteSerializer,
 )
 

apiserver/plane/app/serializers/asset.py

@@ -1,8 +1,9 @@
-from .base import BaseSerializer
+from .base import BaseFileSerializer
 from plane.db.models import FileAsset
 
 
-class FileAssetSerializer(BaseSerializer):
+class FileAssetSerializer(BaseFileSerializer):
+
     class Meta:
         model = FileAsset
         fields = "__all__"

apiserver/plane/app/serializers/base.py

@@ -51,19 +51,18 @@ def _filter_fields(self, fields):
         for field in allowed:
             if field not in self.fields:
                 from . import (
-                    WorkspaceLiteSerializer,
-                    ProjectLiteSerializer,
-                    UserLiteSerializer,
-                    StateLiteSerializer,
-                    IssueSerializer,
-                    LabelSerializer,
                     CycleIssueSerializer,
-                    IssueLiteSerializer,
-                    IssueRelationSerializer,
                     InboxIssueLiteSerializer,
-                    IssueReactionLiteSerializer,
-                    IssueAttachmentLiteSerializer,
                     IssueLinkLiteSerializer,
+                    IssueLiteSerializer,
+                    IssueReactionLiteSerializer,
+                    IssueRelationSerializer,
+                    IssueSerializer,
+                    LabelSerializer,
+                    ProjectLiteSerializer,
+                    StateLiteSerializer,
+                    UserLiteSerializer,
+                    WorkspaceLiteSerializer,
                 )
 
                 # Expansion mapper
@@ -86,7 +85,6 @@ def _filter_fields(self, fields):
                     "issue_relation": IssueRelationSerializer,
                     "issue_inbox": InboxIssueLiteSerializer,
                     "issue_reactions": IssueReactionLiteSerializer,
-                    "issue_attachment": IssueAttachmentLiteSerializer,
                     "issue_link": IssueLinkLiteSerializer,
                     "sub_issues": IssueLiteSerializer,
                 }
@@ -122,19 +120,18 @@ def to_representation(self, instance):
                 if expand in self.fields:
                     # Import all the expandable serializers
                     from . import (
-                        WorkspaceLiteSerializer,
-                        ProjectLiteSerializer,
-                        UserLiteSerializer,
-                        StateLiteSerializer,
-                        IssueSerializer,
-                        LabelSerializer,
                         CycleIssueSerializer,
-                        IssueRelationSerializer,
                         InboxIssueLiteSerializer,
+                        IssueLinkLiteSerializer,
                         IssueLiteSerializer,
                         IssueReactionLiteSerializer,
-                        IssueAttachmentLiteSerializer,
-                        IssueLinkLiteSerializer,
+                        IssueRelationSerializer,
+                        IssueSerializer,
+                        LabelSerializer,
+                        ProjectLiteSerializer,
+                        StateLiteSerializer,
+                        UserLiteSerializer,
+                        WorkspaceLiteSerializer,
                     )
 
                     # Expansion mapper
@@ -157,7 +154,6 @@ def to_representation(self, instance):
                         "issue_relation": IssueRelationSerializer,
                         "issue_inbox": InboxIssueLiteSerializer,
                         "issue_reactions": IssueReactionLiteSerializer,
-                        "issue_attachment": IssueAttachmentLiteSerializer,
                         "issue_link": IssueLinkLiteSerializer,
                         "sub_issues": IssueLiteSerializer,
                     }
@@ -179,3 +175,20 @@ def to_representation(self, instance):
                         )
 
         return response
+
+
+class BaseFileSerializer(DynamicBaseSerializer):
+
+    class Meta:
+        abstract = True  # Make this serializer abstract
+
+    def to_representation(self, instance):
+        """
+        Object instance -> Dict of primitive datatypes.
+        """
+        response = super().to_representation(instance)
+        response["asset"] = (
+            instance.asset.name
+        )  # Ensure 'asset' field is consistently serialized
+        # Apply custom method to get download URL
+        return response

apiserver/plane/app/serializers/issue.py

@@ -1,40 +1,40 @@
 # Django imports
-from django.utils import timezone
-from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
+from django.core.validators import URLValidator
+from django.utils import timezone
 
 # Third Party imports
 from rest_framework import serializers
 
-# Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
-from .user import UserLiteSerializer
-from .state import StateLiteSerializer
-from .project import ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
 from plane.db.models import (
-    User,
+    CommentReaction,
+    Cycle,
+    CycleIssue,
     Issue,
     IssueActivity,
+    IssueAssignee,
     IssueComment,
+    IssueLabel,
+    IssueLink,
     IssueProperty,
-    IssueAssignee,
+    IssueReaction,
+    IssueRelation,
     IssueSubscriber,
-    IssueLabel,
+    IssueVote,
     Label,
-    CycleIssue,
-    Cycle,
     Module,
     ModuleIssue,
-    IssueLink,
-    IssueAttachment,
-    IssueReaction,
-    CommentReaction,
-    IssueVote,
-    IssueRelation,
     State,
+    User,
 )
 
+# Module imports
+from .base import BaseSerializer, DynamicBaseSerializer
+from .project import ProjectLiteSerializer
+from .state import StateLiteSerializer
+from .user import UserLiteSerializer
+from .workspace import WorkspaceLiteSerializer
+
 
 class IssueFlatSerializer(BaseSerializer):
     ## Contain only flat fields
@@ -442,7 +442,7 @@ def validate_url(self, value):
             raise serializers.ValidationError("Invalid URL format.")
 
         # Check URL scheme
-        if not value.startswith(('http://', 'https://')):
+        if not value.startswith(("http://", "https://")):
             raise serializers.ValidationError("Invalid URL scheme.")
 
         return value
@@ -485,35 +485,6 @@ class Meta:
         read_only_fields = fields
 
 
-class IssueAttachmentSerializer(BaseSerializer):
-    class Meta:
-        model = IssueAttachment
-        fields = "__all__"
-        read_only_fields = [
-            "created_by",
-            "updated_by",
-            "created_at",
-            "updated_at",
-            "workspace",
-            "project",
-            "issue",
-        ]
-
-
-class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
-    class Meta:
-        model = IssueAttachment
-        fields = [
-            "id",
-            "asset",
-            "attributes",
-            "issue_id",
-            "updated_at",
-            "updated_by_id",
-        ]
-        read_only_fields = fields
-
-
 class IssueReactionSerializer(BaseSerializer):
     actor_detail = UserLiteSerializer(read_only=True, source="actor")