From c2c2f8be61478187a851c58836a46d30aea6dc54 Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Thu, 5 Dec 2019 16:42:50 -0500 Subject: [PATCH] Complete, all test working working with Postman --- .../bakery/controllers/BakerController.java | 31 ++++++++++++------- .../bakery/controllers/MuffinController.java | 28 ++++++++++++----- .../bakery/models/Baker.java | 8 ++++- .../bakery/models/Muffin.java | 7 ++++- .../bakery/repositories/BakerRepository.java | 2 ++ .../bakery/repositories/MuffinRepository.java | 2 ++ .../bakery/services/BakerService.java | 3 ++ .../bakery/services/MuffinService.java | 2 ++ 8 files changed, 62 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index b69065c..cb98be5 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -4,31 +4,40 @@ import com.zipcodewilmington.bakery.services.BakerService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; - +import org.springframework.stereotype.Controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller public class BakerController { private BakerService service; - + @Autowired public BakerController(BakerService service) { this.service = service; } - + @GetMapping("/baker") public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - - public ResponseEntity show(Long id) { + @GetMapping("/bakers/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - - public ResponseEntity create(Baker baker) { + @PostMapping("/bakers") + public ResponseEntity create(@RequestBody Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - - public ResponseEntity update(Long id, Baker baker) { + @PutMapping("/baker/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - - public ResponseEntity destroy(Long id) { + @DeleteMapping("/baker/{id}") + public ResponseEntity destroy(@PathVariable Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } } diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java index f6b5d42..5762924 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -4,31 +4,43 @@ import com.zipcodewilmington.bakery.services.MuffinService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; - +import org.springframework.stereotype.Controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller public class MuffinController { private MuffinService service; + @Autowired public MuffinController(MuffinService service) { this.service = service; } + @GetMapping("/muffins") public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - - public ResponseEntity show(Long id) { + @GetMapping("/muffins/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } + @PostMapping("/muffins") - public ResponseEntity create(Muffin baker) { + public ResponseEntity create(@RequestBody Muffin baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - - public ResponseEntity update(Long id, Muffin baker) { + @PutMapping("/muffins/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - - public ResponseEntity destroy(Long id) { + @DeleteMapping("/muffins/{id}") + public ResponseEntity destroy(@PathVariable Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } } diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java index 8e8c716..36058f9 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -1,9 +1,14 @@ package com.zipcodewilmington.bakery.models; - +import javax.persistence.Entity; import java.util.Objects; +import javax.persistence.Id; +import javax.persistence.GeneratedValue; +@Entity public class Baker { + @Id + @GeneratedValue private Long id; private String name; @@ -26,6 +31,7 @@ public Baker(Long id, String name, String employeeId, String specialty) { this.specialty = specialty; } + public Long getId() { return id; } diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java index 9b374a1..55162dd 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java @@ -1,9 +1,14 @@ package com.zipcodewilmington.bakery.models; +import javax.persistence.Entity; import java.util.Objects; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +@Entity public class Muffin { - + @Id + @GeneratedValue private Long id; private String flavor; diff --git a/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java b/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java index 65923a1..ee03f03 100644 --- a/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java +++ b/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java @@ -2,6 +2,8 @@ import com.zipcodewilmington.bakery.models.Baker; import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; +@Repository public interface BakerRepository extends CrudRepository { } diff --git a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java b/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java index f63c832..4b8c814 100644 --- a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java +++ b/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java @@ -2,6 +2,8 @@ import com.zipcodewilmington.bakery.models.Muffin; import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; +@Repository public interface MuffinRepository extends CrudRepository { } diff --git a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java index 6b2fb31..cdd3a03 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java @@ -2,7 +2,10 @@ import com.zipcodewilmington.bakery.models.Baker; import com.zipcodewilmington.bakery.repositories.BakerRepository; +import org.springframework.stereotype.Service; + +@Service public class BakerService { private BakerRepository repository; diff --git a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java index 69ce276..a4b9a06 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java @@ -2,7 +2,9 @@ import com.zipcodewilmington.bakery.models.Muffin; import com.zipcodewilmington.bakery.repositories.MuffinRepository; +import org.springframework.stereotype.Service; +@Service public class MuffinService { private MuffinRepository repository;