diff --git a/src/main/java/io/salmonllama/fashionscapeapi/controller/GalleryController.java b/src/main/java/io/salmonllama/fashionscapeapi/controller/GalleryController.java index c233328..dcc764c 100644 --- a/src/main/java/io/salmonllama/fashionscapeapi/controller/GalleryController.java +++ b/src/main/java/io/salmonllama/fashionscapeapi/controller/GalleryController.java @@ -19,8 +19,10 @@ public class GalleryController { private GalleryRepository galleryRepository; @GetMapping() - public List getAllGalleries() { - return galleryRepository.findAll(); + public ResponseEntity> getAllGalleries() { + List galleries = galleryRepository.findAll(); + + return ResponseEntity.ok(galleries); } @GetMapping("/{id}") @@ -31,8 +33,10 @@ public class GalleryController { } @GetMapping("/server/{id}") - public List getGalleriesByServer(@PathVariable(value = "id") String serverId) { - return galleryRepository.findAllByServer(serverId); + public ResponseEntity> getGalleriesByServer(@PathVariable(value = "id") String serverId) { + List galleries = galleryRepository.findAllByServer(serverId); + + return ResponseEntity.ok(galleries); } @GetMapping("/server/{serverId}/channel/{channelId}") @@ -43,8 +47,10 @@ public class GalleryController { } @PostMapping() - public Gallery createGallery(@Valid @RequestBody Gallery gallery) { - return galleryRepository.save(gallery); + public ResponseEntity createGallery(@Valid @RequestBody Gallery gallery) { + Gallery createdGallery = galleryRepository.save(gallery); + + return ResponseEntity.ok(createdGallery); } @PutMapping("/{id}") @@ -63,7 +69,7 @@ public class GalleryController { return ResponseEntity.ok(updatedGallery); } - @DeleteMapping() + @DeleteMapping("/{id}") public ResponseEntity> deleteGallery(@PathVariable(value = "id") Long galleryId) throws ResourceNotFoundException { Gallery gallery = galleryRepository.findById(galleryId).orElseThrow(() -> new ResourceNotFoundException("Gallery not found for id :: " + galleryId)); diff --git a/src/main/java/io/salmonllama/fashionscapeapi/controller/OutfitController.java b/src/main/java/io/salmonllama/fashionscapeapi/controller/OutfitController.java index a0149bd..f676210 100644 --- a/src/main/java/io/salmonllama/fashionscapeapi/controller/OutfitController.java +++ b/src/main/java/io/salmonllama/fashionscapeapi/controller/OutfitController.java @@ -20,8 +20,10 @@ public class OutfitController { private OutfitRepository outfitRepository; @GetMapping() - public List getAllOutfits() { - return outfitRepository.findAll(); + public ResponseEntity> getAllOutfits() { + List outfits = outfitRepository.findAll(); + + return ResponseEntity.ok(outfits); } @GetMapping("/{id}") @@ -39,8 +41,10 @@ public class OutfitController { } @PostMapping() - public Outfit createOutfit(@Valid @RequestBody Outfit outfit) { - return outfitRepository.save(outfit); + public ResponseEntity createOutfit(@Valid @RequestBody Outfit newOutfit) { + Outfit outfit = outfitRepository.save(newOutfit); + + return ResponseEntity.ok(outfit); } @PutMapping("/{id}") @@ -66,12 +70,12 @@ public class OutfitController { } @DeleteMapping("/{id}") - public Map deleteOutfit(@PathVariable(value = "id") String outfitId) throws ResourceNotFoundException { + public ResponseEntity> deleteOutfit(@PathVariable(value = "id") String outfitId) throws ResourceNotFoundException { Outfit outfit = outfitRepository.findById(outfitId).orElseThrow(() -> new ResourceNotFoundException("Outfit not found for id :: " + outfitId)); outfitRepository.delete(outfit); Map response = new HashMap<>(); response.put("deleted", Boolean.TRUE); - return response; + return ResponseEntity.ok(response); } }