Commit 1845f024 authored by 王英豪's avatar 王英豪

合并下

parents c3713726 099f1574
...@@ -22,6 +22,9 @@ from automated_main.view.web_socket.socket import ChatConsumer ...@@ -22,6 +22,9 @@ from automated_main.view.web_socket.socket import ChatConsumer
urlpatterns = [ urlpatterns = [
# path('admin/', admin.site.urls), # path('admin/', admin.site.urls),
# 测试人员进度-人员分配接口
path('', include("automated_main.url.testing_progress_url.testing_progress_url")),
# 用户接口 # 用户接口
path('', include("automated_main.url.user_url.user_url")), path('', include("automated_main.url.user_url.user_url")),
......
# Generated by Django 3.1.3 on 2022-10-24 20:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('automated_main', '0003_apimanagement_yapi_id'),
]
operations = [
migrations.CreateModel(
name='TestingProgress',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('testing_progress_title', models.CharField(max_length=50, verbose_name='测试进度标题')),
('start_date', models.TextField(default='', max_length=200, null=True, verbose_name='开始时间')),
('end_date', models.TextField(default='', max_length=200, null=True, verbose_name='开始时间')),
('duration', models.TextField(default='', max_length=200, null=True, verbose_name='测试内容-标题')),
('group', models.IntegerField(default=1, verbose_name='是否分组')),
('parent', models.IntegerField(default=0, max_length=50, null=True, verbose_name='父id')),
('type', models.CharField(max_length=50, verbose_name='图表颜色')),
('description', models.TextField(default='', max_length=20000, null=True, verbose_name='描述')),
('update_time', models.DateTimeField(auto_now_add=True)),
('create_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
],
),
]
# Generated by Django 3.1.3 on 2022-10-24 20:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('automated_main', '0004_testingprogress'),
]
operations = [
migrations.AlterField(
model_name='testingprogress',
name='parent',
field=models.IntegerField(default=0, null=True, verbose_name='父id'),
),
]
...@@ -10,10 +10,37 @@ from automated_main.models.ui_automation.ui_element_operation import UIElementsO ...@@ -10,10 +10,37 @@ from automated_main.models.ui_automation.ui_element_operation import UIElementsO
from automated_main.models.ui_automation.ui_page_element import UIPageElement from automated_main.models.ui_automation.ui_page_element import UIPageElement
from automated_main.models.ui_automation.ui_test_case import UITestCase, UITestCaseAssociated from automated_main.models.ui_automation.ui_test_case import UITestCase, UITestCaseAssociated
from automated_main.models.ui_automation.ui_test_task import UITestTask, UITestResult from automated_main.models.ui_automation.ui_test_task import UITestTask, UITestResult
<<<<<<< HEAD
from automated_main.models.performance_test.performance_project import PerformanceProject from automated_main.models.performance_test.performance_project import PerformanceProject
from automated_main.models.performance_test.performance_script import PerformanceScript from automated_main.models.performance_test.performance_script import PerformanceScript
from automated_main.models.performance_test.performance_report import PerformanceReport from automated_main.models.performance_test.performance_report import PerformanceReport
=======
"""
8.19 弃用
"""
# from automated_main.models.api_automation.api_project import APIProject
# from automated_main.models.api_automation.api_module import APIModule
from automated_main.models.api_automation.api_environment import APIEnvironment
"""
8.19 弃用
"""
# from automated_main.models.api_automation.api_test_case import ApiTestCase
# from automated_main.models.api_automation.api_business_test import ApiBusinessTest, ApiBusinessTestAssociated
# from automated_main.models.api_automation.api_test_task import APITestTask, APITestResultAssociated, APITestResult
from automated_main.models.performance_test.performance_project import PerformanceProject
from automated_main.models.performance_test.performance_script import PerformanceScript
from automated_main.models.performance_test.performance_report import PerformanceReport
from automated_main.models.api_automation.api_database import APIDatabase
from automated_main.models.api_automation.api_management import ApiManagement
from automated_main.models.api_automation.api_interfaces_case import ApiInterfacesCase
from automated_main.models.api_automation.api_scenarios_case import ApiScenariosCaseAssociated, \
ApiScenariosCaseAssociated
from automated_main.models.api_automation.api_test_plan import ApiTestPlan
from automated_main.models.testing_progress.testing_progress import TestingProgress
>>>>>>> test
from django.db import models
class TestingProgress(models.Model):
"""
测试进度
"""
testing_progress_title = models.CharField("测试进度标题", max_length=50, null=False)
start_date = models.TextField("开始时间", default="", max_length=200, null=True)
end_date = models.TextField("开始时间", default="", max_length=200, null=True)
duration = models.TextField("测试内容-标题", default="", max_length=200, null=True)
group = models.IntegerField("是否分组", default=1) # 1 是 0 不是
parent = models.IntegerField("父id", null=True, default=0)
type = models.CharField("图表颜色", max_length=50, null=False)
description = models.TextField("描述", default="", max_length=20000, null=True)
update_time = models.DateTimeField(auto_now_add=True)
create_time = models.DateTimeField("创建时间", auto_now_add=True)
def __str__(self):
return self.testing_progress_title
# -*- coding: utf-8 -*-
# @Time : 2022/10/24 21:06
# @Author : wyh
# @File : __init__.py.py
# @desc:
# -*- coding: utf-8 -*-
# @Time : 2022/10/24 21:06
# @Author : wyh
# @File : testing_progress_url.py
# @desc:
from django.urls import path
from automated_main.view.testing_progress.PersonnelAllocation.personnel_allocation_view import PersonnelAllocationView
urlpatterns = [
path("api/backend/personnel_allocation/", PersonnelAllocationView.as_view()),
path("api/backend/personnel_allocation_list/", PersonnelAllocationView.as_view()),
]
\ No newline at end of file
# -*- coding: utf-8 -*-
# @Time : 2021/10/21 17:24
# @Author : wangyinghao
# @File : api_database_view.py
# @Software: PyCharm
from django.views.generic import View
import json
from django.forms import model_to_dict
from automated_main.utils.http_format import response_success
from automated_main.exception.my_exception import MyException
from automated_main.models.api_automation.api_database import APIDatabase
from automated_main.form.api_database import ApiDatabaseForm
from automated_main.utils.handle_db import HandleDB
class ApiDatabaseView(View):
def get(self, request, api_database_id, *args, **kwargs):
"""
代表获取单个API数据库
:param request:
:param api_database_id:数据库的id
:param args:
:param kwargs:
:return:
"""
api_database = APIDatabase.objects.filter(id=api_database_id).first()
if api_database is None:
return response_success()
else:
return response_success(model_to_dict(api_database))
def post(self, request, api_database_id, *args, **kwargs):
"""
代表更改API数据库
:param request:
:param api_database_id:
:param args:
:param kwargs:
:return:
"""
api_database = APIDatabase.objects.filter(id=api_database_id).first()
if api_database is None:
return response_success()
body = request.body
if not body:
return response_success()
data = json.loads(body)
form = ApiDatabaseForm(data)
if form.is_valid():
APIDatabase.objects.filter(id=api_database_id).update(**form.cleaned_data)
return response_success("编辑成功")
else:
raise MyException()
def delete(self, request, api_database_id, *args, **kwargs):
"""
代表删除单独API数据库
:param request:
:param api_database_id: API数据库ID
:param args:
:param kwargs:
:return:
"""
APIDatabase.objects.delete()
return response_success("删除成功")
def put(self, request, *args, **kwargs):
"""
代表创建API数据库
:param request:
:param args:
:param kwargs:
:return:
"""
body = request.body
if not body:
return response_success()
data = json.loads(body)
form = ApiDatabaseForm(data)
if form.is_valid():
APIDatabase.objects.create(**form.cleaned_data)
return response_success("创建成功")
else:
raise MyException(message="创建失败")
class DatabaseProcessingView(View):
def post(self, request, *args, **kwargs):
"""
连接数据库
:param request:
:param args:
:param kwargs:
:return:
"""
body = request.body
if not body:
return response_success()
data = json.loads(body)
db = HandleDB(data['api_host'], int(data['api_port']), data['user'], data['password'], data['database'])
sql = 'SELECT VERSION()'
try:
db.execution_results(sql)
db.close()
return response_success("调试成功")
except Exception as e:
print(e)
pass
return MyException(40000, message="调试失败")
# -*- coding: utf-8 -*-
# @Time : 2021/3/25 15:28
# @Author : wangyinghao
# @FileName: api_environment_view.py
# @Software: PyCharm
from django.views.generic import View
import json
from django.forms import model_to_dict
from automated_main.utils.http_format import response_success
from automated_main.exception.my_exception import MyException
from automated_main.models.api_automation.api_environment import APIEnvironment
from automated_main.models.api_automation.api_environment import APIGlobalVariable
from automated_main.form.api_environment import ApiEnvironmentForm
class ApiEnvironmentView(View):
def get(self, request, api_environment_id, *args, **kwargs):
"""
代表获取单个API环境
:param request:
:param api_environment_id:
:param args:
:param kwargs:
:return:
"""
api_environment = APIEnvironment.objects.filter(id=api_environment_id).first()
api_environment_data = model_to_dict(api_environment)
api_global_variable = APIGlobalVariable.objects.filter(api_environment_id=api_environment_id)
global_variable_list = []
if api_global_variable.count() == 0:
global_variable_dict = {
"api_global_variable_name": "",
"api_global_variable_value": "",
"api_global_variable_describe": ""
}
global_variable_list.append(global_variable_dict)
api_environment_data["global_variable"] = global_variable_list
else:
for global_variable in api_global_variable:
global_variable_dict = {
"api_global_variable_name": global_variable.api_global_variable_name,
"api_global_variable_value": global_variable.api_global_variable_value,
"api_global_variable_describe": global_variable.api_global_variable_describe
}
global_variable_list.append(global_variable_dict)
api_environment_data["global_variable"] = global_variable_list
if api_environment is None:
return response_success()
else:
return response_success(api_environment_data)
def post(self, request, api_environment_id, *args, **kwargs):
"""
代表更改API环境
:param request:
:param api_environment_id:
:param args:
:param kwargs:
:return:
"""
api_environment = APIEnvironment.objects.filter(id=api_environment_id).first()
if api_environment is None:
return response_success()
body = request.body
if not body:
return response_success()
data = json.loads(body)
form = ApiEnvironmentForm(data)
if form.is_valid():
APIEnvironment.objects.filter(id=api_environment_id).update(**form.cleaned_data)
if APIGlobalVariable.objects.filter(api_environment_id=api_environment_id).count() >= 0:
APIGlobalVariable.objects.delete()
for global_variable in data['global_variable_data']:
APIGlobalVariable.objects.create(
api_environment_id=api_environment_id,
api_global_variable_name=global_variable['api_global_variable_name'],
api_global_variable_value=global_variable['api_global_variable_value'],
api_global_variable_describe=global_variable['api_global_variable_describe'],
)
return response_success("编辑API环境成功")
else:
raise MyException()
def delete(self, request, api_environment_id, *args, **kwargs):
"""
代表删除单独API环境
:param request:
:param api_environment_id: API环境ID
:param args:
:param kwargs:
:return:
"""
APIEnvironment.objects.delete()
return response_success("删除API环境成功")
def put(self, request, *args, **kwargs):
"""
代表创建API环境
:param request:
:param args:
:param kwargs:
:return:
"""
body = request.body
if not body:
return response_success()
data = json.loads(body)
form = ApiEnvironmentForm(data)
if form.is_valid():
api_environment = APIEnvironment.objects.create(**form.cleaned_data)
api_environment.save()
if APIGlobalVariable.objects.filter(api_environment_id=api_environment.id).count() >= 0:
APIGlobalVariable.objects.delete()
for global_variable in data['global_variable_data']:
APIGlobalVariable.objects.create(
api_environment_id=api_environment.id,
api_global_variable_name=global_variable['api_global_variable_name'],
api_global_variable_value=global_variable['api_global_variable_value'],
api_global_variable_describe=global_variable['api_global_variable_describe'],
)
return response_success("创建成功")
else:
raise MyException(message="创建失败")
# -*- coding: utf-8 -*-
# @Time : 2022/5/24 21:30
# @Author : wangyinghao
# @Site :
# @File : api_management_detail_view.py
# @Software: PyCharm
from django.views.generic import View
import json
from django.forms import model_to_dict
from automated_main.utils.http_format import response_success, response_failed
from automated_main.exception.my_exception import MyException
from automated_main.form.api_management import ApiManagementForm
from automated_main.models.api_automation.api_management import ApiManagement
from datetime import datetime
class ApiManagementView(View):
def get(self, request, api_management_id, *args, **kwargs):
"""
代表获取单个服务
:param request:
:param api_management_id:
:param args:
:param kwargs:
:return:
"""
try:
api_management = ApiManagement.objects.get(id=api_management_id)
except ApiManagement.DoesNotExist:
return response_failed()
else:
return response_success(model_to_dict(api_management))
def post(self, request, api_management_id, *args, **kwargs):
"""
更新单个服务
:param request:
:param api_management_id:
:param args:
:param kwargs:
:return:
"""
body = request.body
params = json.loads(body)
form = ApiManagementForm(params)
result = form.is_valid()
if result:
api_management_data = ApiManagement.objects.get(id=api_management_id)
api_management_data.name = params['name']
api_management_data.description = params['description']
api_management_data.parent = params['parent']
api_management_data.update_time = datetime.now()
api_management_data.save()
else:
print(form.errors.as_json())
raise MyException()
return response_success()
def delete(self, request, api_management_id, *args, **kwargs):
ApiManagement.objects.delete()
ApiManagement.objects.delete()
return response_success()
# -*- coding: utf-8 -*-
# @Time : 2021/3/3 11:02
# @Author : wangyinghao
# @FileName: api_module_view.py
# @Software: PyCharm
from django.views.generic import View
import json
from django.forms import model_to_dict
from automated_main.utils.http_format import response_success
from automated_main.exception.my_exception import MyException
from automated_main.models.api_automation.api_module import APIModule
from django.core.paginator import Paginator
import arrow
from automated_main.form.api_module import ApiModuleForm
class ApiModuleView(View):
def get(self, request, api_module_id, *args, **kwargs):
"""
代表获取单个API模块
:param request:
:param api_module_id: API模块ID
:param args:
:param kwargs:
:return:
"""
api_module = APIModule.objects.filter(id=api_module_id).first()
if api_module is None:
return response_success()
else:
return response_success(model_to_dict(api_module))
def post(self, request, api_module_id, *args, **kwargs):
"""
代表更改页面
:param request:
:param api_module_id: API模块ID
:param args:
:param kwargs:
:return:
"""
api_module = APIModule.objects.filter(id=api_module_id).first()
if api_module is None:
return response_success()
body = request.body
if not body:
return response_success()
data = json.loads(body)
form = ApiModuleForm(data)
if form.is_valid():
APIModule.objects.filter(id=api_module_id).update(**form.cleaned_data)
return response_success("编辑API模块成功")
else:
raise MyException()
def delete(self, request, api_module_id, *args, **kwargs):
"""
代表删除单独模块
:param request:
:param api_module_id: API模块ID
:param args:
:param kwargs:
:return:
"""
APIModule.objects.delete()
return response_success("删除模块成功")
def put(self, request, *args, **kwargs):
"""
代表创建模块
:param request:
:param args:
:param kwargs:
:return:
"""
body = request.body
if not body:
return response_success()
data = json.loads(body)
form = ApiModuleForm(data)
if form.is_valid():
APIModule.objects.create(**form.cleaned_data)
return response_success("创建成功")
else:
raise MyException(message="创建失败")
class ApiProjectModuleView(View):
def get(self, request, api_project_id, size_page, page, *args, **kwargs):
"""
获取 单个API项目中包含得所有模块
:param page: 页数
:param size_page: 展示条数
:param request:
:param api_project_id: api项目id
:param args:
:param kwargs:
:return:
"""
api_module = APIModule.objects.filter(api_project_id=api_project_id)
api_module_list = []
for api_modules in api_module:
api_module_dict = {
"id": api_modules.id,
"api_project_name": api_modules.api_project.api_project_name,
"api_module_name": api_modules.api_module_name,
"api_module_describe": api_modules.api_module_describe,
"updata_time": arrow.get(str(api_modules.updata_time)).format('YYYY-MM-DD HH:mm:ss'),
"create_time": arrow.get(str(api_modules.create_time)).format('YYYY-MM-DD HH:mm:ss'),
}
api_module_list.append(api_module_dict)
p = Paginator(api_module_list, size_page)
if int(page) > int(p.num_pages):
page1 = p.page(p.num_pages)
current_page = page1.object_list
else:
page1 = p.page(page)
current_page = page1.object_list
total_module = len(api_module_list)
if api_module is None:
return response_success()
else:
return response_success({'status': 200, 'data': current_page, 'total_module': total_module})
...@@ -12,6 +12,7 @@ from automated_main.exception.my_exception import MyException ...@@ -12,6 +12,7 @@ from automated_main.exception.my_exception import MyException
from automated_main.models.performance_test.performance_project import PerformanceProject from automated_main.models.performance_test.performance_project import PerformanceProject
from automated_main.form.performance_project import PerformanceProjectForm from automated_main.form.performance_project import PerformanceProjectForm
import logging import logging
logger = logging.getLogger('django') logger = logging.getLogger('django')
...@@ -70,7 +71,7 @@ class PerformanceProjectView(View): ...@@ -70,7 +71,7 @@ class PerformanceProjectView(View):
:return: :return:
""" """
PerformanceProject.objects.filter(id=performance_project_id).delete() PerformanceProject.objects.delete()
return response_success() return response_success()
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
......
...@@ -26,13 +26,9 @@ from django.conf import settings ...@@ -26,13 +26,9 @@ from django.conf import settings
from django.core.paginator import Paginator from django.core.paginator import Paginator
from automated_main.models.performance_test.performance_report import PerformanceReport, PerformanceReportError from automated_main.models.performance_test.performance_report import PerformanceReport, PerformanceReportError
from pathlib import Path from pathlib import Path
from django.db.models import Q
from automated_main.utils.jmeter_perform import create_para_jmx
import logging import logging
import csv import csv
import pandas as pd import pandas as pd
import numpy as np
from functools import reduce
logger = logging.getLogger('django') logger = logging.getLogger('django')
...@@ -133,7 +129,7 @@ class PerformanceScriptView(View): ...@@ -133,7 +129,7 @@ class PerformanceScriptView(View):
:return: :return:
""" """
PerformanceScript.objects.filter(id=performance_script_id).delete() PerformanceScript.objects.delete()
return response_success("删除单独性能脚本") return response_success("删除单独性能脚本")
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
...@@ -437,7 +433,7 @@ class PerformanceScriptReport(View): ...@@ -437,7 +433,7 @@ class PerformanceScriptReport(View):
if report_id == "": if report_id == "":
return response_failed({"status": 10102, "message": "report_id不能为空"}) return response_failed({"status": 10102, "message": "report_id不能为空"})
PerformanceReport.objects.filter(id=report_id).delete() PerformanceReport.objects.delete()
dir = settings.JMETER_REPORT dir = settings.JMETER_REPORT
dir_list = os.listdir(dir) dir_list = os.listdir(dir)
for report in dir_list: for report in dir_list:
......
# -*- coding: utf-8 -*-
# @Time : 2022/10/24 20:49
# @Author : wyh
# @File : __init__.py.py
# @desc:
# -*- coding: utf-8 -*-
# @Time : 2022/10/24 20:50
# @Author : wyh
# @File : personnel_allocation_view.py
# @desc:
from django.views.generic import View
from automated_main.utils.http_format import response_success, response_failed
from automated_main.exception.my_exception import MyException
from automated_main.models.testing_progress.testing_progress import TestingProgress
import json
import arrow
class PersonnelAllocationView(View):
def get(self, request, *args, **kwargs):
"""
获取任务
"""
testing_progress_data = TestingProgress.objects.all()
testing_progress_list = []
for testing_progress in testing_progress_data:
if testing_progress.group == "1":
render = "split"
else:
render = ""
testing_progress_dict = {
"text": testing_progress.testing_progress_title,
"start_date": testing_progress.start_date,
"id": testing_progress.id,
"duration": testing_progress.duration,
"parent": testing_progress.parent,
"type": testing_progress.type,
"end_date": testing_progress.end_date,
"render": render,
"description": testing_progress.description
}
testing_progress_list.append(testing_progress_dict)
return response_success(testing_progress_list)
def put(self, request, *args, **kwargs):
"""
新增测试任务
"""
body = request.body
if not body:
return response_success()
data = json.loads(body)
TestingProgress.objects.create(testing_progress_title=data['text'],
start_date=arrow.get(str(data['start_date'])).format('YYYY-MM-DD'),
end_date=arrow.get(str(data['end_date'])).format('YYYY-MM-DD'),
duration=data['duration'],
group=data['group'],
parent=data['parent'],
type=data['color'],
description=data['description'])
return response_success("创建成功")
def post(self, request, *args, **kwargs):
return response_success()
def delete(self, *args, **kwargs):
return response_success()
...@@ -68,7 +68,7 @@ class UIElementOperationView(View): ...@@ -68,7 +68,7 @@ class UIElementOperationView(View):
:return: :return:
""" """
UIElementsOperation.objects.filter(id=element_operation_id).delete() UIElementsOperation.objects.delete()
return response_success("删除元素操作成功") return response_success("删除元素操作成功")
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
......
...@@ -67,7 +67,7 @@ class UiPageView(View): ...@@ -67,7 +67,7 @@ class UiPageView(View):
:return: :return:
""" """
UIPage.objects.filter(id=ui_page_id).delete() UIPage.objects.delete()
return response_success("删除页面成功") return response_success("删除页面成功")
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
......
...@@ -99,7 +99,7 @@ class UIPageElementView(View): ...@@ -99,7 +99,7 @@ class UIPageElementView(View):
delete_ui_page_elemnt_id = list(set(page_element_all_id_list).difference(set(edit_page_element_id_list))) delete_ui_page_elemnt_id = list(set(page_element_all_id_list).difference(set(edit_page_element_id_list)))
for delete_elemnt_id in delete_ui_page_elemnt_id: for delete_elemnt_id in delete_ui_page_elemnt_id:
UIPageElement.objects.filter(id=delete_elemnt_id).delete() UIPageElement.objects.delete()
return response_success("编辑页面元素成功") return response_success("编辑页面元素成功")
else: else:
raise MyException() raise MyException()
...@@ -114,7 +114,7 @@ class UIPageElementView(View): ...@@ -114,7 +114,7 @@ class UIPageElementView(View):
:return: :return:
""" """
UIPageElement.objects.filter(id=ui_page_element_id).delete() UIPageElement.objects.delete()
return response_success("删除页面元素成功") return response_success("删除页面元素成功")
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
......
...@@ -66,7 +66,7 @@ class UIPositioningView(View): ...@@ -66,7 +66,7 @@ class UIPositioningView(View):
:return: :return:
""" """
UIPositioning.objects.filter(id=element_positioning_id).delete() UIPositioning.objects.delete()
return response_success("删除元素定位成功") return response_success("删除元素定位成功")
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
......
...@@ -67,7 +67,7 @@ class UiProjectView(View): ...@@ -67,7 +67,7 @@ class UiProjectView(View):
:return: :return:
""" """
UIProject.objects.filter(id=ui_project_id).delete() UIProject.objects.delete()
return response_success() return response_success()
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
......
...@@ -97,7 +97,7 @@ class UITestCaseView(View): ...@@ -97,7 +97,7 @@ class UITestCaseView(View):
ui_test_case.ui_project_id = data['ui_project_id'] ui_test_case.ui_project_id = data['ui_project_id']
ui_test_case.id = data['ui_test_case_id'] ui_test_case.id = data['ui_test_case_id']
ui_test_case.save() ui_test_case.save()
UITestCaseAssociated.objects.filter(cid_id=ui_test_case_id).delete() UITestCaseAssociated.objects.delete()
if form.is_valid(): if form.is_valid():
for i in data["ui_test_case_data"]: for i in data["ui_test_case_data"]:
...@@ -127,7 +127,7 @@ class UITestCaseView(View): ...@@ -127,7 +127,7 @@ class UITestCaseView(View):
:return: :return:
""" """
UITestCase.objects.get(id=ui_test_case_id).delete() UITestCase.objects.delete()
return response_success("删除UI测试用例成功") return response_success("删除UI测试用例成功")
def put(self, request, *args, **kwargs): def put(self, request, *args, **kwargs):
...@@ -146,7 +146,7 @@ class UITestCaseView(View): ...@@ -146,7 +146,7 @@ class UITestCaseView(View):
form = UiTestCaseForm(data) form = UiTestCaseForm(data)
if form.is_valid(): if form.is_valid():
ui_test_case = UITestCase.objects.create(**form.cleaned_data) ui_test_case = UITestCase.objects
ui_test_case_id = ui_test_case.id ui_test_case_id = ui_test_case.id
print(data["ui_test_case_data"]) print(data["ui_test_case_data"])
......
...@@ -45,7 +45,7 @@ class UITestTaskView(View): ...@@ -45,7 +45,7 @@ class UITestTaskView(View):
:param kwargs: :param kwargs:
:return: :return:
""" """
UITestTask.objects.get(id=ui_test_task_id).delete() UITestTask.objects.delete()
return response_success("删除UI测试任务成功") return response_success("删除UI测试任务成功")
...@@ -257,7 +257,7 @@ class CheckResultList(View): ...@@ -257,7 +257,7 @@ class CheckResultList(View):
if ui_test_result_id == "": if ui_test_result_id == "":
return response_failed({"status": 10102, "message": "ui_test_result_id不能为空"}) return response_failed({"status": 10102, "message": "ui_test_result_id不能为空"})
UITestResult.objects.get(ui_task_id=ui_test_task_id, id=ui_test_result_id).delete() UITestResult.objects.delete()
return response_success("删除UI测试任务成功") return response_success("删除UI测试任务成功")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment