diff --git a/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py b/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py index 9159b3323..6b0960710 100644 --- a/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py +++ b/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py @@ -118,6 +118,7 @@ class ResourceVersionListOutputSLZ(serializers.Serializer): schema_version = serializers.CharField(help_text="资源版本协议版本:1.0/2.0") comment = serializers.CharField(help_text="版本日志") created_time = serializers.DateTimeField(help_text="创建时间") + created_by = serializers.CharField(help_text="创建人") def get_released_stages(self, obj): return self.context["released_stages"].get(obj["id"], []) diff --git a/src/dashboard/apigateway/apigateway/apis/web/resource_version/views.py b/src/dashboard/apigateway/apigateway/apis/web/resource_version/views.py index 9d6e4fd92..04b4a5f3d 100644 --- a/src/dashboard/apigateway/apigateway/apis/web/resource_version/views.py +++ b/src/dashboard/apigateway/apigateway/apis/web/resource_version/views.py @@ -76,9 +76,9 @@ def list(self, request, *args, **kwargs): queryset = ResourceVersion.objects.filter(gateway=request.gateway) if query: queryset = queryset.filter(version__icontains=query) - data = queryset.values("id", "version", "schema_version", "comment", "name", "title", "created_time").order_by( - "-id" - ) + data = queryset.values( + "id", "version", "schema_version", "comment", "name", "title", "created_time", "created_by" + ).order_by("-id") page = self.paginate_queryset(data) resource_version_ids = [rv["id"] for rv in page] diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py index aa3f7c975..d5b27f560 100644 --- a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py +++ b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py @@ -50,10 +50,11 @@ def test_to_representation(self): gateway=gateway, version="1.0.1", created_time=arrow.get("2019-01-01 12:30:00").datetime, + created_by="x" ) queryset = ResourceVersion.objects.filter(gateway=gateway).values( - "id", "version", "schema_version", "comment", "created_time" + "id", "version", "schema_version", "comment", "created_time", "created_by" ) slz = serializers.ResourceVersionListOutputSLZ( @@ -92,6 +93,7 @@ def test_to_representation(self): "name": "test", }, ], + "created_by": "x", "created_time": "2019-01-01 20:30:00", }, ] diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py index 73a3337c5..5eb30eefb 100644 --- a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py +++ b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py @@ -76,6 +76,7 @@ def test_list(self, request_view, fake_gateway): "comment": resource_version.comment, "sdk_count": 1, "created_time": dummy_time.str, + "created_by": resource_version.created_by, }, ] expected_release_stages = [