diff --git a/src/main/java/run/halo/app/controller/admin/api/MenuController.java b/src/main/java/run/halo/app/controller/admin/api/MenuController.java index 8acf79f70..530139b12 100644 --- a/src/main/java/run/halo/app/controller/admin/api/MenuController.java +++ b/src/main/java/run/halo/app/controller/admin/api/MenuController.java @@ -44,6 +44,18 @@ public class MenuController { return menuService.listAsTree(sort); } + /** + * Get menu by menuId. + * + * @param menuId menuId + * @return MenuDTO + */ + @GetMapping("{menuId:\\d+}") + @ApiOperation("Get menu detail by id") + public MenuDTO getBy(@PathVariable("menuId") Integer menuId) { + return new MenuDTO().convertFrom(menuService.getById(menuId)); + } + @PostMapping @ApiOperation("Creates a menu") public MenuDTO createBy(@RequestBody @Valid MenuParam menuParam) { diff --git a/src/main/java/run/halo/app/controller/admin/api/PhotoController.java b/src/main/java/run/halo/app/controller/admin/api/PhotoController.java index dd3a27337..5c8340a7a 100644 --- a/src/main/java/run/halo/app/controller/admin/api/PhotoController.java +++ b/src/main/java/run/halo/app/controller/admin/api/PhotoController.java @@ -75,7 +75,21 @@ public class PhotoController { } @PostMapping - public Photo createBy(@Valid @RequestBody PhotoParam photoParam) { - return photoService.createBy(photoParam); + public PhotoDTO createBy(@Valid @RequestBody PhotoParam photoParam) { + return new PhotoDTO().convertFrom(photoService.createBy(photoParam)); + } + + @PutMapping("{photoId:\\d+}") + @ApiOperation("Updates a photo") + public PhotoDTO updateBy(@PathVariable("photoId") Integer photoId, + @RequestBody @Valid PhotoParam photoParam) { + // Get the photo + Photo photo = photoService.getById(photoId); + + // Update changed properties of the photo + photoParam.update(photo); + + // Update menu in database + return new PhotoDTO().convertFrom(photoService.update(photo)); } } diff --git a/src/main/java/run/halo/app/model/dto/PhotoDTO.java b/src/main/java/run/halo/app/model/dto/PhotoDTO.java index 06c7979bb..612037369 100644 --- a/src/main/java/run/halo/app/model/dto/PhotoDTO.java +++ b/src/main/java/run/halo/app/model/dto/PhotoDTO.java @@ -24,4 +24,8 @@ public class PhotoDTO implements OutputConverter { private String url; private String team; + + private String location; + + private String description; }