diff --git a/services/case_service.py b/services/case_service.py index dfafbf8e5639702e9935fce0c92c0e151142a8a8..3dcf4a3b97f01e480f2157a72fd1eea4b4272a76 100644 --- a/services/case_service.py +++ b/services/case_service.py @@ -57,13 +57,13 @@ async def create_case(data, owner): if 'test_type' in data: data.update(dict({'type': data['test_type']})) if 'labels' in data: - data.update({'labels': ','.join(data['labels'])}) + data.update({'labels': data['labels']}) if not await TestSuite.query_obj_one(TestSuite.name == data['suite_name']): return ERROR_UN_EXISTED_TS, False try: result = await Case().save(data) if 'labels' in data: - await insert_label_map([{'label_name': label, 'case_id': result.id} for label in data['labels']]) + await insert_label_map([{'label_name': label, 'case_id': result.id} for label in data['labels'].split(',')]) return result.to_dict(), True except sqlalchemy.exc.IntegrityError: return ERROR_DUPLICATED_NAME, False @@ -594,7 +594,7 @@ async def rename_test_suite(data, user): ts.name = data['name'] try: await ts.update() - return ts.to_dict(), False + return ts.to_dict(), True except sqlalchemy.exc.IntegrityError: return ERROR_DUPLICATED_NAME, False @@ -644,7 +644,7 @@ async def rename_labels(data, user): label.name = data['name'] try: await label.update() - return label.to_dict(), False + return label.to_dict(), True except sqlalchemy.exc.IntegrityError: return ERROR_DUPLICATED_NAME, False @@ -664,5 +664,5 @@ async def remove_labels(ids, user): diff_list = list(set(ids).difference(set(label_ids))) if len(diff_list) > 0: return f'无权删除标签{",".join(diff_list)}', True - await CaseLabel.batch_delete(TestSuite.id.in_(ids)) + await CaseLabel.batch_delete(CaseLabel.id.in_(ids)) return None, True