From bebe6659c2f40528f0b8558fcb0435b4a04910c0 Mon Sep 17 00:00:00 2001 From: djq <1092424998@qq.com> Date: Sat, 25 Oct 2025 23:11:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?djq=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DjangoBlog-master/comments/models.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py index 7c3bbc8..30a2bcf 100644 --- a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py +++ b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py @@ -6,34 +6,45 @@ from django.utils.translation import gettext_lazy as _ from blog.models import Article -# Create your models here. - +# 定义评论模型，用于存储文章的评论信息 class Comment(models.Model): + # 评论正文，最大长度300字 body = models.TextField('正文', max_length=300) + # 评论创建时间，默认使用当前时间 creation_time = models.DateTimeField(_('creation time'), default=now) + # 评论最后修改时间，默认使用当前时间 last_modify_time = models.DateTimeField(_('last modify time'), default=now) + # 评论作者，关联到Django内置的用户模型，用户删除时评论也删除 author = models.ForeignKey( settings.AUTH_USER_MODEL, verbose_name=_('author'), on_delete=models.CASCADE) + # 评论所属文章，关联到Article模型，文章删除时评论也删除 article = models.ForeignKey( Article, verbose_name=_('article'), on_delete=models.CASCADE) + # 父评论，自关联，允许为空，父评论删除时子评论也删除 parent_comment = models.ForeignKey( 'self', verbose_name=_('parent comment'), blank=True, null=True, on_delete=models.CASCADE) + # 评论是否启用，布尔类型，默认不启用 is_enable = models.BooleanField(_('enable'), default=False, blank=False, null=False) class Meta: + # 按ID倒序排列 ordering = ['-id'] + # 模型单数名称 verbose_name = _('comment') + # 模型复数名称 verbose_name_plural = verbose_name + # 按ID获取最新记录 get_latest_by = 'id' + # 打印评论时显示正文内容 def __str__(self): - return self.body + return self.body \ No newline at end of file -- 2.34.1 From d509e0106519f52c0997b621abfc86aaf72c2ad2 Mon Sep 17 00:00:00 2001 From: djq <1092424998@qq.com> Date: Sat, 25 Oct 2025 23:16:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DjangoBlog-master/comments/models.py | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py index 30a2bcf..c163d02 100644 --- a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py +++ b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py @@ -6,45 +6,38 @@ from django.utils.translation import gettext_lazy as _ from blog.models import Article -# 定义评论模型，用于存储文章的评论信息 +# Create your models here. + class Comment(models.Model): - # 评论正文，最大长度300字 body = models.TextField('正文', max_length=300) - # 评论创建时间，默认使用当前时间 creation_time = models.DateTimeField(_('creation time'), default=now) - # 评论最后修改时间，默认使用当前时间 last_modify_time = models.DateTimeField(_('last modify time'), default=now) - # 评论作者，关联到Django内置的用户模型，用户删除时评论也删除 author = models.ForeignKey( settings.AUTH_USER_MODEL, verbose_name=_('author'), on_delete=models.CASCADE) - # 评论所属文章，关联到Article模型，文章删除时评论也删除 article = models.ForeignKey( Article, verbose_name=_('article'), on_delete=models.CASCADE) - # 父评论，自关联，允许为空，父评论删除时子评论也删除 parent_comment = models.ForeignKey( 'self', verbose_name=_('parent comment'), blank=True, null=True, on_delete=models.CASCADE) - # 评论是否启用，布尔类型，默认不启用 is_enable = models.BooleanField(_('enable'), default=False, blank=False, null=False) class Meta: - # 按ID倒序排列 ordering = ['-id'] - # 模型单数名称 verbose_name = _('comment') - # 模型复数名称 verbose_name_plural = verbose_name - # 按ID获取最新记录 get_latest_by = 'id' - # 打印评论时显示正文内容 def __str__(self): - return self.body \ No newline at end of file +<<<<<<< HEAD + return self.body +======= + return self.body +>>>>>>> ccy_branch -- 2.34.1 From 33d32ef78d895d6950680b5dc8e7d369a4a6f914 Mon Sep 17 00:00:00 2001 From: djq <1092424998@qq.com> Date: Sat, 25 Oct 2025 23:20:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?djq=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DjangoBlog-master/comments/tests.py | 64 +++++++++---------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/tests.py b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/tests.py index 2a7f55f..33870c5 100644 --- a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/tests.py +++ b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/tests.py @@ -8,61 +8,78 @@ from comments.templatetags.comments_tags import * from djangoblog.utils import get_max_articleid_commentid -# Create your tests here. - +# 评论功能测试类，继承TransactionTestCase以支持事务管理的测试 class CommentsTest(TransactionTestCase): def setUp(self): + """测试前的初始化设置""" + # 创建测试客户端，用于模拟用户请求 self.client = Client() + # 创建请求工厂，用于构造测试请求 self.factory = RequestFactory() + + # 配置博客评论设置（需要审核才能显示） from blog.models import BlogSettings value = BlogSettings() - value.comment_need_review = True + value.comment_need_review = True # 评论需要审核 value.save() + # 创建超级用户用于测试登录状态 self.user = BlogUser.objects.create_superuser( email="liangliangyy1@gmail.com", username="liangliangyy1", password="liangliangyy1") def update_article_comment_status(self, article): + """更新文章所有评论为启用状态（通过审核）""" comments = article.comment_set.all() for comment in comments: - comment.is_enable = True + comment.is_enable = True # 设置评论为启用 comment.save() def test_validate_comment(self): + """测试评论功能的各种场景""" + # 登录测试用户 self.client.login(username='liangliangyy1', password='liangliangyy1') + # 创建测试分类 category = Category() category.name = "categoryccc" category.save() + # 创建测试文章 article = Article() article.title = "nicetitleccc" article.body = "nicecontentccc" article.author = self.user article.category = category - article.type = 'a' - article.status = 'p' + article.type = 'a' # 假设'a'表示文章类型 + article.status = 'p' # 假设'p'表示已发布 article.save() + # 获取评论提交的URL comment_url = reverse( 'comments:postcomment', kwargs={ 'article_id': article.id}) + # 测试提交第一条评论 response = self.client.post(comment_url, { - 'body': '123ffffffffff' + 'body': '123ffffffffff' # 评论内容 }) + # 验证提交成功（302重定向） self.assertEqual(response.status_code, 302) + # 重新获取文章对象 article = Article.objects.get(pk=article.pk) + # 因为评论需要审核，初始状态下评论列表应为空 self.assertEqual(len(article.comment_list()), 0) + # 更新评论状态为通过审核 self.update_article_comment_status(article) - + # 审核后评论列表应包含1条评论 self.assertEqual(len(article.comment_list()), 1) + # 测试提交第二条评论 response = self.client.post(comment_url, { 'body': '123ffffffffff', @@ -70,40 +87,19 @@ class CommentsTest(TransactionTestCase): self.assertEqual(response.status_code, 302) + # 验证第二条评论 article = Article.objects.get(pk=article.pk) self.update_article_comment_status(article) self.assertEqual(len(article.comment_list()), 2) + + # 获取第一条评论ID作为父评论（测试回复功能） parent_comment_id = article.comment_list()[0].id + # 测试提交带格式的回复评论（包含标题、代码块、链接等） response = self.client.post(comment_url, { 'body': ''' # Title1 ```python - import os - ``` - - [url](https://www.lylinux.net/) - - [ddd](http://www.baidu.com) - - - ''', - 'parent_comment_id': parent_comment_id - }) - - self.assertEqual(response.status_code, 302) - self.update_article_comment_status(article) - article = Article.objects.get(pk=article.pk) - self.assertEqual(len(article.comment_list()), 3) - comment = Comment.objects.get(id=parent_comment_id) - tree = parse_commenttree(article.comment_list(), comment) - self.assertEqual(len(tree), 1) - data = show_comment_item(comment, True) - self.assertIsNotNone(data) - s = get_max_articleid_commentid() - self.assertIsNotNone(s) - - from comments.utils import send_comment_email - send_comment_email(comment) + import os \ No newline at end of file -- 2.34.1