Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(resource_version): fix diff #1142

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,11 @@ def get(self, request, *args, **kwargs):
source_resource_version_id = data.get("source_resource_version_id")
target_resource_version_id = data.get("target_resource_version_id")

version = ResourceVersionHandler.get_latest_version_by_gateway(request.gateway.id)

source_resource_data = []
# 如果 source_resource_version_id 和 target_resource_version_id 都不为空,则 source_resource_data数据不为空
if source_resource_version_id and target_resource_version_id:
# 如果 source_resource_version_id不为空,并且不是第一次生成版本
if source_resource_version_id and version != "":
source_resource_data = ResourceVersionHandler.get_data_by_id_or_new(
request.gateway, source_resource_version_id
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,13 @@ def test_get(self, request_view):


class TestResourceVersionDiffApi:
def test_resource_version_diff(
def test_resource_version_diff_without_resource_version(
self,
request_view,
fake_backend,
fake_stage,
fake_gateway,
fake_resource,
fake_resource_version_v2,
echo_plugin_stage_binding,
):
resp = request_view(
Expand Down Expand Up @@ -297,6 +296,34 @@ def test_resource_version_diff(
}
}

def test_resource_version_diff_with_resource_version(
self,
request_view,
fake_backend,
fake_stage,
fake_gateway,
fake_resource_version_v2,
echo_plugin_stage_binding,
):
resp = request_view(
method="GET",
view_name="gateway.resource_version.diff",
gateway=fake_gateway,
path_params={
"gateway_id": fake_gateway.id,
},
data={"source_resource_version_id": fake_resource_version_v2.id, "target_resource_version_id": ""},
)
assert resp.status_code == 200
result = resp.json()
assert result == {
"data": {
"add": [],
"delete": [],
"update": [],
}
}


class TestResourceVersionGetApi:
def test_resource_version_get(self, request_view):
Expand Down
Loading