refactor: separate quib model and change models name

backend/apps/comment/admin.py

@@ -1,11 +1,11 @@
 from django.contrib import admin
 
-from .models import Comment
+from .models import CommentModel
 
 # Register your models here.
 
 
-@admin.register(Comment)
+@admin.register(CommentModel)
 class CommentAdmin(admin.ModelAdmin):
     list_display = ('quibbler', 'content', 'created_at')
     search_fields = ('quibbler__username', 'content')

backend/apps/comment/api/v1/serializers.py

@@ -1,14 +1,14 @@
 from django.shortcuts import get_object_or_404
 from rest_framework import serializers
 
-from ...models import Comment
+from ...models import CommentModel
 
 
 class CommentSerializer(serializers.ModelSerializer):
     path = serializers.CharField(required=False)
 
     class Meta:
-        model = Comment
+        model = CommentModel
         fields = '__all__'
 
     def create(self, validated_data):
@@ -19,12 +19,16 @@ def create(self, validated_data):
         }
 
         if path := validated_data.get('path'):
-            parent_instance = get_object_or_404(Comment, path__match=path)
-            comment_instance: Comment = Comment.objects.create_child(
-                parent=parent_instance, **data
+            parent_instance = get_object_or_404(CommentModel, path__match=path)
+            comment_instance: CommentModel = (
+                CommentModel.objects.create_child(  # pyright: ignore
+                    parent=parent_instance, **data
+                )
             )
         else:
-            comment_instance: Comment = Comment.objects.create_child(**data)
+            comment_instance: CommentModel = CommentModel.objects.create_child(
+                **data
+            )  # pyright: ignore
 
         comment_instance.save()
         return comment_instance

backend/apps/comment/api/v1/viewsets.py

@@ -1,9 +1,9 @@
 from rest_framework import viewsets
 
-from ...models import Comment
+from ...models import CommentModel
 from .serializers import CommentSerializer
 
 
 class CommentViewSet(viewsets.ModelViewSet):
-    queryset = Comment.objects.all()
+    queryset = CommentModel.objects.all()
     serializer_class = CommentSerializer

backend/apps/comment/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.4 on 2024-12-13 12:02
+# Generated by Django 5.1.4 on 2024-12-14 02:43
 
 import django_ltree.fields
 from django.db import migrations, models
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Comment',
+            name='CommentModel',
             fields=[
                 (
                     'id',

backend/apps/comment/migrations/0002_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.4 on 2024-12-13 12:02
+# Generated by Django 5.1.4 on 2024-12-14 02:43
 
 import django.contrib.postgres.indexes
 import django.db.models.deletion
@@ -16,38 +16,38 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AddField(
-            model_name='comment',
+            model_name='commentmodel',
             name='downvotes',
             field=models.ManyToManyField(
                 blank=True,
                 related_name='downvotes',
-                to='user.profile',
+                to='user.profilemodel',
                 verbose_name='downvotes',
             ),
         ),
         migrations.AddField(
-            model_name='comment',
+            model_name='commentmodel',
             name='quibbler',
             field=models.ForeignKey(
                 on_delete=django.db.models.deletion.CASCADE,
-                to='user.profile',
+                to='user.profilemodel',
                 verbose_name='quibbler',
             ),
         ),
         migrations.AddField(
-            model_name='comment',
+            model_name='commentmodel',
             name='upvotes',
             field=models.ManyToManyField(
                 blank=True,
                 related_name='upvotes',
-                to='user.profile',
+                to='user.profilemodel',
                 verbose_name='upvotes',
             ),
         ),
         migrations.AddIndex(
-            model_name='comment',
+            model_name='commentmodel',
             index=django.contrib.postgres.indexes.GistIndex(
-                fields=['path'], name='comment_com_path_d1388c_gist'
+                fields=['path'], name='comment_com_path_d124df_gist'
             ),
         ),
     ]

backend/apps/comment/models.py

@@ -3,22 +3,22 @@
 from django.utils.translation import gettext_lazy as _
 from django_ltree.models import TreeModel
 
-from apps.user.models import Profile
+from apps.user.models import ProfileModel
 from common.mixins.model_mixins import CreatedAtMixin
 
 # Create your models here.
 
 
-class Comment(CreatedAtMixin, TreeModel):
+class CommentModel(CreatedAtMixin, TreeModel):
     quibbler = models.ForeignKey(
-        Profile, on_delete=models.CASCADE, verbose_name=_('quibbler')
+        ProfileModel, on_delete=models.CASCADE, verbose_name=_('quibbler')
     )
     content = models.TextField(_('content'))
     upvotes = models.ManyToManyField(
-        Profile, related_name='upvotes', blank=True, verbose_name=_('upvotes')
+        ProfileModel, related_name='upvotes', blank=True, verbose_name=_('upvotes')
     )
     downvotes = models.ManyToManyField(
-        Profile, related_name='downvotes', blank=True, verbose_name=_('downvotes')
+        ProfileModel, related_name='downvotes', blank=True, verbose_name=_('downvotes')
     )
 
     @property

backend/apps/quib/admin.py

@@ -0,0 +1,11 @@
+from django.contrib import admin
+
+from .models import QuibModel
+
+# Register your models here.
+
+
+@admin.register(QuibModel)
+class QuibModelAdmin(admin.ModelAdmin):
+    list_display = ('title', 'quiblet', 'quibber', 'is_public', 'created_at')
+    search_fields = ('title', 'quiblet__name', 'quibber__name')

backend/apps/quib/api/v1/serializers.py

@@ -0,0 +1,21 @@
+from rest_framework import serializers
+
+from apps.quiblet.api.v1.serializers import QuibletSerializer, QuibletSlimSerializer
+
+from ...models import QuibModel
+
+
+class QuibSerializer(serializers.ModelSerializer):
+    quiblet = QuibletSerializer(read_only=True)
+
+    class Meta:
+        model = QuibModel
+        fields = '__all__'
+
+
+class QuibSlimSerializer(serializers.ModelSerializer):
+    quiblet = QuibletSlimSerializer(read_only=True)
+
+    class Meta:
+        model = QuibModel
+        exclude = ('quibber',)

backend/apps/quib/api/v1/urls.py

@@ -0,0 +1,8 @@
+from rest_framework.routers import DefaultRouter
+
+from .viewsets import QuibViewSet
+
+router = DefaultRouter()
+router.register(r'', QuibViewSet)
+
+urlpatterns = router.urls

backend/apps/quib/api/v1/viewsets.py

@@ -0,0 +1,13 @@
+from rest_framework import viewsets
+
+from ...models import QuibModel
+from .serializers import QuibSerializer, QuibSlimSerializer
+
+
+class QuibViewSet(viewsets.ModelViewSet):
+    queryset = QuibModel.objects.all()
+
+    def get_serializer_class(self):  # pyright: ignore
+        if self.action == 'list':
+            return QuibSlimSerializer
+        return QuibSerializer

backend/apps/quib/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class QuibConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'apps.quib'

backend/apps/quib/migrations/0001_initial.py

@@ -0,0 +1,73 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:43
+
+import dynamic_filenames
+import shortuuid.django_fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('comment', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuibModel',
+            fields=[
+                (
+                    'created_at',
+                    models.DateTimeField(auto_now_add=True, verbose_name='create at'),
+                ),
+                ('is_public', models.BooleanField(default=True, verbose_name='is public')),
+                (
+                    'id',
+                    shortuuid.django_fields.ShortUUIDField(
+                        alphabet='abcdefghijklmnopqrstuvwxyz0123456789',
+                        editable=False,
+                        length=7,
+                        max_length=7,
+                        prefix='',
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='id',
+                    ),
+                ),
+                ('title', models.CharField(max_length=255, verbose_name='title')),
+                (
+                    'slug',
+                    models.SlugField(
+                        blank=True, editable=False, max_length=25, verbose_name='slug'
+                    ),
+                ),
+                ('content', models.TextField(verbose_name='content')),
+                (
+                    'cover',
+                    models.ImageField(
+                        blank=True,
+                        null=True,
+                        upload_to=dynamic_filenames.FilePattern(
+                            filename_pattern='cover/{uuid:s}{ext}'
+                        ),
+                        verbose_name='cover',
+                    ),
+                ),
+                (
+                    'comments',
+                    models.ManyToManyField(
+                        blank=True,
+                        related_name='comments',
+                        to='comment.commentmodel',
+                        verbose_name='comments',
+                    ),
+                ),
+            ],
+            options={
+                'verbose_name': 'Quib',
+                'verbose_name_plural': 'Quibs',
+                'ordering': ['-created_at'],
+            },
+        ),
+    ]

backend/apps/quib/migrations/0002_initial.py

@@ -0,0 +1,58 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:43
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('quib', '0001_initial'),
+        ('quiblet', '0001_initial'),
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quibmodel',
+            name='downvotes',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='downvoted_quibs',
+                to='user.profilemodel',
+                verbose_name='downvotes',
+            ),
+        ),
+        migrations.AddField(
+            model_name='quibmodel',
+            name='quibber',
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='quibs',
+                to='user.profilemodel',
+                verbose_name='quibber',
+            ),
+        ),
+        migrations.AddField(
+            model_name='quibmodel',
+            name='quiblet',
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='quibs',
+                to='quiblet.quibletmodel',
+                verbose_name='quiblet',
+            ),
+        ),
+        migrations.AddField(
+            model_name='quibmodel',
+            name='upvotes',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='upvoted_quibs',
+                to='user.profilemodel',
+                verbose_name='upvotes',
+            ),
+        ),
+    ]

backend/apps/quib/migrations/0003_remove_quibmodel_comments.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quib', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='quibmodel',
+            name='comments',
+        ),
+    ]

backend/apps/quib/migrations/0004_quibmodel_comments.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comment', '0002_initial'),
+        ('quib', '0003_remove_quibmodel_comments'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quibmodel',
+            name='comments',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='comments',
+                to='comment.commentmodel',
+                verbose_name='comments',
+            ),
+        ),
+    ]