github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9718 from jumpserver/pr@dev@perf_account_info 

perf: 修改 account asset auto_info 返回
pull/9719/head
老广 2023-02-23 16:16:39 +08:00 committed by GitHub
parent 3ee2bfce9a d1b807bd8b
commit bb62e19ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/accounts/serializers/account/account.py
View File

@ -119,7 +119,7 @@ class AccountSerializer(AccountSerializerCreateMixin, BaseAccountSerializer):
def setup_eager_loading(cls, queryset): def setup_eager_loading(cls, queryset):
""" Perform necessary eager loading of data. """ """ Perform necessary eager loading of data. """
queryset = queryset \ queryset = queryset \
.prefetch_related('asset', 'asset__platform') .prefetch_related('asset', 'asset__platform', 'asset__platform__automation')
return queryset return queryset

5
apps/assets/serializers/asset/common.py
View File

@ -136,6 +136,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali
read_only_fields = [ read_only_fields = [
'category', 'type', 'connectivity', 'category', 'type', 'connectivity',
'date_verified', 'created_by', 'date_created', 'date_verified', 'created_by', 'date_created',
'auto_info',
] ]
fields = fields_small + fields_fk + fields_m2m + read_only_fields fields = fields_small + fields_fk + fields_m2m + read_only_fields
extra_kwargs = { extra_kwargs = {
@ -182,10 +183,10 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali
@classmethod @classmethod
def setup_eager_loading(cls, queryset): def setup_eager_loading(cls, queryset):
""" Perform necessary eager loading of data. """ """ Perform necessary eager loading of data. """
queryset = queryset.prefetch_related('domain', 'platform') \ queryset = queryset.prefetch_related('domain', 'nodes', 'labels', 'protocols') \
.prefetch_related('platform', 'platform__automation') \
.annotate(category=F("platform__category")) \ .annotate(category=F("platform__category")) \
.annotate(type=F("platform__type")) .annotate(type=F("platform__type"))
queryset = queryset.prefetch_related('nodes', 'labels', 'protocols')
return queryset return queryset
@staticmethod @staticmethod