登录
注册
开源
企业版
高校版
搜索
帮助中心
使用条款
关于我们
开源
企业版
高校版
私有云
模力方舟
我知道了
查看详情
登录
注册
代码拉取完成,页面将自动刷新
开源项目
>
WEB应用开发
>
后台管理框架
&&
捐赠
捐赠前请先登录
取消
前往登录
扫描微信二维码支付
取消
支付完成
支付提示
将跳转至支付宝完成支付
确定
取消
Watch
不关注
关注所有动态
仅关注版本发行动态
关注但不提醒动态
186
Star
2.3K
Fork
1.1K
huge-dream
/
django-vue3-admin
代码
Issues
13
Pull Requests
5
Wiki
统计
流水线
服务
Gitee Pages
质量分析
Jenkins for Gitee
腾讯云托管
腾讯云 Serverless
悬镜安全
阿里云 SAE
Codeblitz
SBOM
我知道了,不再自动展开
更新失败,请稍后重试!
移除标识
内容风险标识
本任务被
标识为内容中包含有代码安全 Bug 、隐私泄露等敏感信息,仓库外成员不可访问
软删除模型不符合预期
进行中
#ICKWYN
lorenzo
创建于
2025-07-09 03:12
# 软删除模型不符合预期 首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。 模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。  # 相关代码 代码位于`backend/dvadmin/utils/models.py`,如下 ``` python class SoftDeleteManager(models.Manager): """支持软删除""" def __init__(self, *args, **kwargs): self.__add_is_del_filter = False super(SoftDeleteManager, self).__init__(*args, **kwargs) def filter(self, *args, **kwargs): # 考虑是否主动传入is_deleted if not kwargs.get('is_deleted') is None: self.__add_is_del_filter = True return super(SoftDeleteManager, self).filter(*args, **kwargs) def get_queryset(self): if self.__add_is_del_filter: return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False) return SoftDeleteQuerySet(self.model).exclude(is_deleted=True) def get_by_natural_key(self, name): return SoftDeleteQuerySet(self.model).get(username=name) ``` 在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象 # 级联数据安全 在`SoftDeletedModel`中,`delete`方法重写为 ```python def delete(self, using=None, soft_delete=True, *args, **kwargs): """ 重写删除方法,直接开启软删除 """ if soft_delete: self.is_deleted = True self.save(using=using) # 级联软删除关联对象 for related_object in self._meta.related_objects: related_model = getattr(self, related_object.get_accessor_name()) # 处理一对多和多对多的关联对象 if related_object.one_to_many or related_object.many_to_many: related_objects = related_model.all() elif related_object.one_to_one: related_objects = [related_model] else: continue for obj in related_objects: obj.delete(soft_delete=True) else: super().delete(using=using, *args, **kwargs) ``` 注意到代码没有限制`on_delete=CASCADE`的外键关系。 # 修复建议 ``` python class SoftDeleteQuerySet(models.QuerySet): """ 软删除QuerySet """ def delete(self): """批量软删除""" return self.update(is_deleted=True, deleted_at=timezone.now()) def hard_delete(self): """批量物理删除""" return super().delete() def alive(self): """只返回未删除的对象""" return self.filter(is_deleted=False) def dead(self): """只返回已删除的对象""" return self.filter(is_deleted=True) def all_objects(self): """返回所有对象(包括已删除)""" return self class SoftDeleteManager(models.Manager): """ 软删除管理器 """ def get_queryset(self): """默认只返回未删除对象""" return SoftDeleteQuerySet(self.model).filter(is_deleted=False) def all_objects(self): """返回所有对象(包含已删除)""" return SoftDeleteQuerySet(self.model) def deleted(self): """只返回已删除对象""" return self.all_objects().filter(is_deleted=True) def get_by_natural_key(self, name): """按自然键获取对象(只获取未删除的)""" return self.get(username=name) class SoftDeleteModel(models.Model): is_deleted = models.BooleanField( verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True ) deleted_at = models.DateTimeField( verbose_name="删除时间", null=True, blank=True, db_index=True ) objects = SoftDeleteManager() class Meta: abstract = True def delete(self, using=None, soft_delete=True): """ 重写删除方法 :param soft_delete: 是否软删除 (默认为True) """ if soft_delete: self.is_deleted = True self.deleted_at = timezone.now() update_fields = ["is_deleted", "deleted_at"] if hasattr(self, "update_datetime"): self.update_datetime = timezone.now() update_fields.append("update_datetime") self.save(update_fields=update_fields) self._cascade_soft_delete() else: super().delete(using=using) def _cascade_soft_delete(self): """ 级联软删除关联对象 - 只处理设置了 on_delete=models.CASCADE 的关系 - 跳过多对多关系(只解除关系,不删除对象) """ for related in self._meta.related_objects: if related.on_delete != models.CASCADE: continue accessor_name = related.get_accessor_name() if not hasattr(self, accessor_name): continue related_manager = getattr(self, accessor_name) if related.one_to_many or related.one_to_one: if hasattr(related_manager, "all"): related_manager.all().delete() else: related_manager.delete() elif related.many_to_many: related_manager.clear() def restore(self): """ 恢复软删除的对象 """ if not self.is_deleted: return self.is_deleted = False self.deleted_at = None update_fields = ["is_deleted", "deleted_at"] if hasattr(self, "update_datetime"): self.update_datetime = timezone.now() update_fields.append("update_datetime") self.save(update_fields=update_fields) ``` # 修复结果  
# 软删除模型不符合预期 首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。 模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。  # 相关代码 代码位于`backend/dvadmin/utils/models.py`,如下 ``` python class SoftDeleteManager(models.Manager): """支持软删除""" def __init__(self, *args, **kwargs): self.__add_is_del_filter = False super(SoftDeleteManager, self).__init__(*args, **kwargs) def filter(self, *args, **kwargs): # 考虑是否主动传入is_deleted if not kwargs.get('is_deleted') is None: self.__add_is_del_filter = True return super(SoftDeleteManager, self).filter(*args, **kwargs) def get_queryset(self): if self.__add_is_del_filter: return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False) return SoftDeleteQuerySet(self.model).exclude(is_deleted=True) def get_by_natural_key(self, name): return SoftDeleteQuerySet(self.model).get(username=name) ``` 在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象 # 级联数据安全 在`SoftDeletedModel`中,`delete`方法重写为 ```python def delete(self, using=None, soft_delete=True, *args, **kwargs): """ 重写删除方法,直接开启软删除 """ if soft_delete: self.is_deleted = True self.save(using=using) # 级联软删除关联对象 for related_object in self._meta.related_objects: related_model = getattr(self, related_object.get_accessor_name()) # 处理一对多和多对多的关联对象 if related_object.one_to_many or related_object.many_to_many: related_objects = related_model.all() elif related_object.one_to_one: related_objects = [related_model] else: continue for obj in related_objects: obj.delete(soft_delete=True) else: super().delete(using=using, *args, **kwargs) ``` 注意到代码没有限制`on_delete=CASCADE`的外键关系。 # 修复建议 ``` python class SoftDeleteQuerySet(models.QuerySet): """ 软删除QuerySet """ def delete(self): """批量软删除""" return self.update(is_deleted=True, deleted_at=timezone.now()) def hard_delete(self): """批量物理删除""" return super().delete() def alive(self): """只返回未删除的对象""" return self.filter(is_deleted=False) def dead(self): """只返回已删除的对象""" return self.filter(is_deleted=True) def all_objects(self): """返回所有对象(包括已删除)""" return self class SoftDeleteManager(models.Manager): """ 软删除管理器 """ def get_queryset(self): """默认只返回未删除对象""" return SoftDeleteQuerySet(self.model).filter(is_deleted=False) def all_objects(self): """返回所有对象(包含已删除)""" return SoftDeleteQuerySet(self.model) def deleted(self): """只返回已删除对象""" return self.all_objects().filter(is_deleted=True) def get_by_natural_key(self, name): """按自然键获取对象(只获取未删除的)""" return self.get(username=name) class SoftDeleteModel(models.Model): is_deleted = models.BooleanField( verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True ) deleted_at = models.DateTimeField( verbose_name="删除时间", null=True, blank=True, db_index=True ) objects = SoftDeleteManager() class Meta: abstract = True def delete(self, using=None, soft_delete=True): """ 重写删除方法 :param soft_delete: 是否软删除 (默认为True) """ if soft_delete: self.is_deleted = True self.deleted_at = timezone.now() update_fields = ["is_deleted", "deleted_at"] if hasattr(self, "update_datetime"): self.update_datetime = timezone.now() update_fields.append("update_datetime") self.save(update_fields=update_fields) self._cascade_soft_delete() else: super().delete(using=using) def _cascade_soft_delete(self): """ 级联软删除关联对象 - 只处理设置了 on_delete=models.CASCADE 的关系 - 跳过多对多关系(只解除关系,不删除对象) """ for related in self._meta.related_objects: if related.on_delete != models.CASCADE: continue accessor_name = related.get_accessor_name() if not hasattr(self, accessor_name): continue related_manager = getattr(self, accessor_name) if related.one_to_many or related.one_to_one: if hasattr(related_manager, "all"): related_manager.all().delete() else: related_manager.delete() elif related.many_to_many: related_manager.clear() def restore(self): """ 恢复软删除的对象 """ if not self.is_deleted: return self.is_deleted = False self.deleted_at = None update_fields = ["is_deleted", "deleted_at"] if hasattr(self, "update_datetime"): self.update_datetime = timezone.now() update_fields.append("update_datetime") self.save(update_fields=update_fields) ``` # 修复结果  
评论 (
0
)
lorenzo
创建了
任务
lorenzo
关联了
huge-dream/django-vue3-admin Pull Request !126
lorenzo
修改了
描述
原值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self.__add_is_del_filter = False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def get_by_natural_key(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstract = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_deleted = True
self.deleted_at = timezone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.deleted_at = None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```

新值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self.__add_is_del_filter = False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def get_by_natural_key(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstract = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_deleted = True
self.deleted_at = timezone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.deleted_at = None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
#
修复
结果

lorenzo
修改了
描述
原值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self._
_
add_is_del_filter = False
s
uper(SoftDelet
e
Manager,
self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del
_
fi
l
ter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDel
e
teQuerySet(self.model, using=self._db).exclude(is_deleted=False)
retu
r
n SoftDelet
e
QueryS
e
t(s
e
lf.model).
e
xcl
u
de(is_deleted=True)
def get_by_natural_key(self, name):
r
et
urn SoftDe
l
et
e
QuerySet(self.model).get(username=name)
```
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_d
e
leted = True
self.
save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_
mod
e
l = getattr(s
e
lf, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.
a
ll()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj
.delete(soft_dele
t
e=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
v
e
rbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstr
a
ct = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_d
e
leted = True
self.
deleted_at
=
tim
e
zone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self,
"
update_datetime"):
self.update_datetim
e
=
t
imezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
-
跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != mod
e
ls.CASCADE:
con
t
inue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
rela
t
ed_manager.
a
ll().delete(
)
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.
deleted_at
=
None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self,
"
update_datetime"):
self.update_datetim
e
=
t
imezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

新值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。
在filter方法中,当传入的参数kwargs中包含is_deleted(无论其值是True还是False)时,就会将__add_is_del_filter设置为True。然后在get_queryset中,如果__add_is_del_filter为True,就返回exclude(is_deleted=False),即已删除的对象

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def
__init
_
_(self, *args, **kwargs):
s
elf.__add_is_d
e
l_filter
= False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def
filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if
not kwargs.get('is
_
de
l
eted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def
get_queryset(self):
if
self.__add_is_d
e
l_filter:
r
eturn SoftD
e
leteQu
e
ryS
e
t(self.mod
e
l,
u
sing=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def
g
et
_by_natura
l
_k
e
y(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def
delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if
soft_delet
e
:
self.
is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for
related_
obj
e
ct in self._m
e
ta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if
related_object.one_to_many or rel
a
ted_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for
obj
in related_objec
t
s:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def
delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def
hard_delete(self):
"""批量物理删除"""
return super().delete()
def
alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def
dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def
all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def
get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def
all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def
deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def
get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
delet
e
d_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Met
a
:
abstract = True
def
delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if
soft_delet
e
:
self.
is_deleted
=
Tru
e
self.deleted_at = timezone.now()
update_fields = [
"
is_deleted", "deleted_at"]
if
hasattr(self, "updat
e
_da
t
etime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def
_cascade_soft_delete(self):
"""
级联软删除关联对象
-
只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for
related in self._meta.relat
e
d_objects:
if
rela
t
ed.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if
not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if
related.one_to_many or related.one_to_one:
if
hasat
t
r(related_m
a
nager, "all"
)
:
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def
restore(self):
"""
恢复软删除的对象
"""
if
not self.is_deleted:
return
self.
is_deleted
=
False
self.deleted_at = None
update_fields = [
"
is_deleted", "deleted_at"]
if
hasattr(self, "updat
e
_da
t
etime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

lorenzo
修改了
描述
原值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。
在filter方法中,当传入的参数kwargs中包含is_deleted(无论其值是True还是False)时,就会将__add_is_del_filter设置为True。然后在get_queryset中,如果__add_is_del_filter为True,就返回exclude(is_deleted=False),即已删除的对象

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def
__init
_
_(self, *args, **kwargs):
s
elf.__add_is_d
e
l_filter
= False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def
filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if
not kwargs.get('is
_
de
l
eted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def
get_queryset(self):
if
self.__add_is_d
e
l_filter:
r
eturn SoftD
e
leteQu
e
ryS
e
t(self.mod
e
l,
u
sing=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def
g
et
_by_natura
l
_k
e
y(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_d
e
leted = True
self.
save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_
mod
e
l = getattr(s
e
lf, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.
a
ll()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj
.delete(soft_dele
t
e=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
v
e
rbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstr
a
ct = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_d
e
leted = True
self.
deleted_at
=
tim
e
zone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self,
"
update_datetime"):
self.update_datetim
e
=
t
imezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
-
跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != mod
e
ls.CASCADE:
con
t
inue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
rela
t
ed_manager.
a
ll().delete(
)
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.
deleted_at
=
None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self,
"
update_datetime"):
self.update_datetim
e
=
t
imezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

新值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self._
_
add_is_del_filter = False
s
uper(SoftDelet
e
Manager,
self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del
_
fi
l
ter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDel
e
teQuerySet(self.model, using=self._db).exclude(is_deleted=False)
retu
r
n SoftDelet
e
QueryS
e
t(s
e
lf.model).
e
xcl
u
de(is_deleted=True)
def get_by_natural_key(self, name):
r
et
urn SoftDe
l
et
e
QuerySet(self.model).get(username=name)
```
在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def
delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if
soft_delet
e
:
self.
is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for
related_
obj
e
ct in self._m
e
ta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if
related_object.one_to_many or rel
a
ted_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for
obj
in related_objec
t
s:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def
delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def
hard_delete(self):
"""批量物理删除"""
return super().delete()
def
alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def
dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def
all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def
get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def
all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def
deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def
get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
delet
e
d_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Met
a
:
abstract = True
def
delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if
soft_delet
e
:
self.
is_deleted
=
Tru
e
self.deleted_at = timezone.now()
update_fields = [
"
is_deleted", "deleted_at"]
if
hasattr(self, "updat
e
_da
t
etime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def
_cascade_soft_delete(self):
"""
级联软删除关联对象
-
只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for
related in self._meta.relat
e
d_objects:
if
rela
t
ed.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if
not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if
related.one_to_many or related.one_to_one:
if
hasat
t
r(related_m
a
nager, "all"
)
:
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def
restore(self):
"""
恢复软删除的对象
"""
if
not self.is_deleted:
return
self.
is_deleted
=
False
self.deleted_at = None
update_fields = [
"
is_deleted", "deleted_at"]
if
hasattr(self, "updat
e
_da
t
etime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

lorenzo
修改了
描述
原值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self.__add_is_del_filter = False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def get_by_natural_key(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstract = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_deleted = True
self.deleted_at = timezone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.deleted_at = None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

新值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self.__add_is_del_filter = False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def get_by_natural_key(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstract = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_deleted = True
self.deleted_at = timezone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.deleted_at = None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

lorenzo
修改了
描述
原值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self.__add_is_del_filter = False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def get_by_natural_key(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstract = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_deleted = True
self.deleted_at = timezone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.deleted_at = None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果

新值
# 软删除模型不符合预期
首先向 **dvadmin开发组** 表达深深的敬意,dvadmin3项目以其优雅的设计和强大的功能让无数开发者受益。但在使用的过程中,我发现有一些值得注意的地方。
模型`AppUser`同时继承`CoreModel`和`SoftDeleteModel`,在访问字段`is_deleted`后,`filter`方法行为不符合预期。

# 相关代码
代码位于`backend/dvadmin/utils/models.py`,如下
``` python
class SoftDeleteManager(models.Manager):
"""支持软删除"""
def __init__(self, *args, **kwargs):
self.__add_is_del_filter = False
super(SoftDeleteManager, self).__init__(*args, **kwargs)
def filter(self, *args, **kwargs):
# 考虑是否主动传入is_deleted
if not kwargs.get('is_deleted') is None:
self.__add_is_del_filter = True
return super(SoftDeleteManager, self).filter(*args, **kwargs)
def get_queryset(self):
if self.__add_is_del_filter:
return SoftDeleteQuerySet(self.model, using=self._db).exclude(is_deleted=False)
return SoftDeleteQuerySet(self.model).exclude(is_deleted=True)
def get_by_natural_key(self, name):
return SoftDeleteQuerySet(self.model).get(username=name)
```
在`filter`方法中,当传入的参数`kwargs`中包含`is_deleted`(无论其值是`True`还是`False`)时,就会将`__add_is_del_filter`设置为`True`。然后在`get_queryset`中,如果`__add_is_del_filter`为`True`,就返回`exclude(is_deleted=False)`,即已删除的对象
# 级联数据安全
在`SoftDeletedModel`中,`delete`方法重写为
```python
def delete(self, using=None, soft_delete=True, *args, **kwargs):
"""
重写删除方法,直接开启软删除
"""
if soft_delete:
self.is_deleted = True
self.save(using=using)
# 级联软删除关联对象
for related_object in self._meta.related_objects:
related_model = getattr(self, related_object.get_accessor_name())
# 处理一对多和多对多的关联对象
if related_object.one_to_many or related_object.many_to_many:
related_objects = related_model.all()
elif related_object.one_to_one:
related_objects = [related_model]
else:
continue
for obj in related_objects:
obj.delete(soft_delete=True)
else:
super().delete(using=using, *args, **kwargs)
```
注意到代码没有限制`on_delete=CASCADE`的外键关系。
# 修复建议
``` python
class SoftDeleteQuerySet(models.QuerySet):
"""
软删除QuerySet
"""
def delete(self):
"""批量软删除"""
return self.update(is_deleted=True, deleted_at=timezone.now())
def hard_delete(self):
"""批量物理删除"""
return super().delete()
def alive(self):
"""只返回未删除的对象"""
return self.filter(is_deleted=False)
def dead(self):
"""只返回已删除的对象"""
return self.filter(is_deleted=True)
def all_objects(self):
"""返回所有对象(包括已删除)"""
return self
class SoftDeleteManager(models.Manager):
"""
软删除管理器
"""
def get_queryset(self):
"""默认只返回未删除对象"""
return SoftDeleteQuerySet(self.model).filter(is_deleted=False)
def all_objects(self):
"""返回所有对象(包含已删除)"""
return SoftDeleteQuerySet(self.model)
def deleted(self):
"""只返回已删除对象"""
return self.all_objects().filter(is_deleted=True)
def get_by_natural_key(self, name):
"""按自然键获取对象(只获取未删除的)"""
return self.get(username=name)
class SoftDeleteModel(models.Model):
is_deleted = models.BooleanField(
verbose_name="是否软删除", help_text="是否软删除", default=False, db_index=True
)
deleted_at = models.DateTimeField(
verbose_name="删除时间", null=True, blank=True, db_index=True
)
objects = SoftDeleteManager()
class Meta:
abstract = True
def delete(self, using=None, soft_delete=True):
"""
重写删除方法
:param soft_delete: 是否软删除 (默认为True)
"""
if soft_delete:
self.is_deleted = True
self.deleted_at = timezone.now()
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
self._cascade_soft_delete()
else:
super().delete(using=using)
def _cascade_soft_delete(self):
"""
级联软删除关联对象
- 只处理设置了 on_delete=models.CASCADE 的关系
- 跳过多对多关系(只解除关系,不删除对象)
"""
for related in self._meta.related_objects:
if related.on_delete != models.CASCADE:
continue
accessor_name = related.get_accessor_name()
if not hasattr(self, accessor_name):
continue
related_manager = getattr(self, accessor_name)
if related.one_to_many or related.one_to_one:
if hasattr(related_manager, "all"):
related_manager.all().delete()
else:
related_manager.delete()
elif related.many_to_many:
related_manager.clear()
def restore(self):
"""
恢复软删除的对象
"""
if not self.is_deleted:
return
self.is_deleted = False
self.deleted_at = None
update_fields = ["is_deleted", "deleted_at"]
if hasattr(self, "update_datetime"):
self.update_datetime = timezone.now()
update_fields.append("update_datetime")
self.save(update_fields=update_fields)
```
# 修复结果


lorenzo
关联了
huge-dream/django-vue3-admin Pull Request !127
lorenzo
将
任务状态
从
待办的
修改为
进行中
展开全部操作日志
折叠全部操作日志
登录
后才可以发表评论
状态
进行中
待办的
进行中
已完成
已关闭
负责人
未设置
标签
未设置
标签管理
里程碑
未关联里程碑
未关联里程碑
Pull Requests
未关联
未关联
关联的 Pull Requests 被合并后可能会关闭此 issue
分支
未关联
分支 (2)
标签 (10)
master
develop
v3.2.0
v3.1.0
v3.0.3
v3.0.2
v3.0.1
v3.0.0
v1.0.1
v1.0.0
1.0.1
1.0.0
开始日期   -   截止日期
-
置顶选项
不置顶
置顶等级:高
置顶等级:中
置顶等级:低
优先级
不指定
严重
主要
次要
不重要
参与者(1)
Python
1
https://gitee.com/huge-dream/django-vue3-admin.git
git@gitee.com:huge-dream/django-vue3-admin.git
huge-dream
django-vue3-admin
django-vue3-admin
点此查找更多帮助
搜索帮助
Git 命令在线学习
如何在 Gitee 导入 GitHub 仓库
Git 仓库基础操作
企业版和社区版功能对比
SSH 公钥设置
如何处理代码冲突
仓库体积过大,如何减小?
如何找回被删除的仓库数据
Gitee 产品配额说明
GitHub仓库快速导入Gitee及同步更新
什么是 Release(发行版)
将 PHP 项目自动发布到 packagist.org
评论
仓库举报
回到顶部
登录提示
该操作需登录 Gitee 帐号,请先登录后再操作。
立即登录
没有帐号,去注册