From 156d3d6899f6223345da7123c6ab3ccc46636461 Mon Sep 17 00:00:00 2001 From: David Trombello Date: Thu, 5 Dec 2019 17:14:28 -0500 Subject: [PATCH] all tests pass, annotations made, and correctly interatcting thru Postman --- .../bakery/controllers/BakerController.java | 26 ++++++++++++++----- .../bakery/controllers/MuffinController.java | 26 ++++++++++++++----- .../bakery/models/Baker.java | 8 +++++- .../bakery/models/Muffin.java | 9 +++++-- .../bakery/repositories/BakerRepository.java | 2 ++ .../bakery/repositories/MuffinRepository.java | 2 ++ .../bakery/services/BakerService.java | 5 +++- .../bakery/services/MuffinService.java | 8 +++--- 8 files changed, 66 insertions(+), 20 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..b0a8b4e 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -2,33 +2,47 @@ import com.zipcodewilmington.bakery.models.Baker; import com.zipcodewilmington.bakery.services.BakerService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import javax.persistence.Entity; +import javax.persistence.Id; + +@Controller public class BakerController { private BakerService service; + @Autowired public BakerController(BakerService service) { this.service = service; } - public ResponseEntity> index() { - return new ResponseEntity<>(service.index(), HttpStatus.OK); + @GetMapping("/bakers") + public ResponseEntity> findAll() { + return new ResponseEntity<>(service.findAll(), 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("/bakers/{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("/bakers/{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..bc57c27 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -2,33 +2,45 @@ import com.zipcodewilmington.bakery.models.Muffin; import com.zipcodewilmington.bakery.services.MuffinService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import javax.persistence.Entity; + +@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); + return new ResponseEntity<>(service.findAll(), HttpStatus.OK); } - public ResponseEntity show(Long id) { + @GetMapping("/muffins/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - public ResponseEntity create(Muffin baker) { - return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); + @PostMapping("/muffins") + public ResponseEntity create(@RequestBody Muffin muffin) { + return new ResponseEntity<>(service.create(muffin), HttpStatus.CREATED); } - public ResponseEntity update(Long id, Muffin baker) { - return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); + @PutMapping("/muffins/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Muffin muffin) { + return new ResponseEntity<>(service.update(id, muffin), 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..2e439b0 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -1,9 +1,15 @@ package com.zipcodewilmington.bakery.models; - +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import java.util.Objects; +@Entity public class Baker { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) private Long id; private String name; diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java index 9b374a1..dca2880 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 javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import java.util.Objects; - +@Entity public class Muffin { - + @Id + @GeneratedValue(strategy = GenerationType.AUTO) 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..20a6220 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.Component; +@Component 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..ba49e5a 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.Component; +@Component 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..34bf154 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java @@ -2,7 +2,9 @@ import com.zipcodewilmington.bakery.models.Baker; import com.zipcodewilmington.bakery.repositories.BakerRepository; +import org.springframework.stereotype.Service; +@Service public class BakerService { private BakerRepository repository; @@ -10,7 +12,7 @@ public BakerService(BakerRepository repository) { this.repository = repository; } - public Iterable index() { + public Iterable findAll() { return repository.findAll(); } @@ -25,6 +27,7 @@ public Baker create(Baker baker) { public Baker update(Long id, Baker newBakerData) { Baker originalBaker = repository.findById(id).get(); originalBaker.setName(newBakerData.getName()); + originalBaker.setEmployeeId(newBakerData.getEmployeeId()); originalBaker.setSpecialty(newBakerData.getSpecialty()); return repository.save(originalBaker); } diff --git a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java index 69ce276..6ecb1cf 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; @@ -10,7 +12,7 @@ public MuffinService(MuffinRepository repository) { this.repository = repository; } - public Iterable index() { + public Iterable findAll() { return repository.findAll(); } @@ -18,8 +20,8 @@ public Muffin show(Long id) { return repository.findById(id).get(); } - public Muffin create(Muffin baker) { - return repository.save(baker); + public Muffin create(Muffin muffin) { + return repository.save(muffin); } public Muffin update(Long id, Muffin newMuffinData) {