Commit 4f37245c by Jason Song Committed by GitHub

Merge pull request #377 from lepdou/open

delete item api move operator field to request body
parents 261b382c 5af5ece9
......@@ -68,17 +68,17 @@ public class ItemController {
RequestPrecondition.checkArguments(
!StringUtils.isContainEmpty(item.getKey(), item.getValue(), item.getDataChangeLastModifiedBy()),
"key,value,dataChangeLastModifiedBy 字段不能为空");
"key,value,dataChangeLastModifiedBy can not be empty");
RequestPrecondition.checkArguments(item.getKey().equals(key), "path中的key和payload中的key不一致");
RequestPrecondition.checkArguments(item.getKey().equals(key), "Key in path and payload is not consistent");
if (userService.findByUserId(item.getDataChangeLastModifiedBy()) == null) {
throw new BadRequestException("用户不存在");
throw new BadRequestException("user(dataChangeLastModifiedBy) not exists");
}
ItemDTO toUpdateItem = itemService.loadItem(Env.fromString(env), appId, clusterName, namespaceName, item.getKey());
if (toUpdateItem == null) {
throw new BadRequestException("item不存在");
throw new BadRequestException("item not exists");
}
//protect. only value,comment,lastModifiedBy can be modified
toUpdateItem.setComment(item.getComment());
......@@ -97,12 +97,12 @@ public class ItemController {
HttpServletRequest request) {
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("用户不存在");
throw new BadRequestException("user(operator) not exists");
}
ItemDTO toDeleteItem = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key);
if (toDeleteItem == null){
throw new BadRequestException("item不存在");
throw new BadRequestException("item not exists");
}
itemService.deleteItem(Env.fromString(env), toDeleteItem.getId(), operator);
......
......@@ -47,7 +47,7 @@ public class ReleaseController {
"releaseTitle and releaseBy can not be empty");
if (userService.findByUserId(model.getReleasedBy()) == null) {
throw new BadRequestException("用户不存在.");
throw new BadRequestException("user(releaseBy) not exists");
}
model.setAppId(appId);
......
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