update(id field): move id field to BaseModel from models

EngRobot33 · Mar 26, 2024 · 5b78ff4 · 5b78ff4
1 parent fa6a627
commit 5b78ff4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/content/models.py b/content/models.py
@@ -11,7 +11,6 @@
 
 
 class Topic(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     name = models.CharField(max_length=32, verbose_name=_('topic name'))
 
     class Meta:
@@ -28,7 +27,6 @@ def save(self, *args, **kwargs):
 
 
 class Post(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     content = models.TextField(verbose_name=_('post content'))
     image = models.ImageField(verbose_name=_('post image'), upload_to="post_photos/", blank=True, null=True)
     like_count = models.IntegerField(verbose_name=_('post like count'), default=0)
@@ -74,7 +72,6 @@ def save(self, *args, **kwargs):
 
 
 class Comment(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     content = models.TextField(verbose_name=_('comment content'))
     like_count = models.IntegerField(verbose_name=_('comment like count'), default=0)
     commenter = models.ForeignKey(
@@ -106,7 +103,6 @@ def __str__(self):
 
 
 class Repost(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     post = models.ForeignKey(
         Post,
         verbose_name=_('reposted post'),

diff --git a/engagement/models.py b/engagement/models.py
@@ -11,7 +11,6 @@
 
 
 class LikedPost(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     like_count = models.IntegerField(verbose_name=_('post like count'), default=0)
     post = models.ForeignKey(
         Post,
@@ -40,7 +39,6 @@ def __str__(self):
 
 
 class LikedComment(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     like_count = models.IntegerField(verbose_name=_('comment like count'), default=0)
     comment = models.ForeignKey(
         Comment,
@@ -69,7 +67,6 @@ def __str__(self):
 
 
 class LikeNotification(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     notified = models.ForeignKey(
         User,
         verbose_name=_('notified user'),

diff --git a/relation/models.py b/relation/models.py
@@ -1,5 +1,3 @@
-import uuid
-
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.utils.translation import gettext_lazy as _
@@ -10,7 +8,6 @@
 
 
 class Relation(BaseModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     following = models.ForeignKey(
         User,
         verbose_name=_('following'),

diff --git a/utils/models.py b/utils/models.py
@@ -1,7 +1,10 @@
+import uuid
+
 from django.db import models
 
 
 class BaseModel(models.Model):
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     created_time = models.DateTimeField(auto_now_add=True)
     modified_time = models.DateTimeField(auto_now=True)