From 8e39a84e9a472f951d891a116f14ec6fcb877edc Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Thu, 5 Dec 2019 22:58:22 -0500 Subject: [PATCH] completed --- .../bakery/controllers/BakerController.java | 20 +++++++++------ .../bakery/controllers/MuffinController.java | 25 +++++++++++-------- .../bakery/models/Baker.java | 8 +++++- .../bakery/models/Muffin.java | 9 +++++-- .../bakery/repositories/BakerRepository.java | 2 ++ .../bakery/repositories/MuffinRepository.java | 3 +++ .../bakery/services/BakerService.java | 3 +++ .../bakery/services/MuffinService.java | 2 ++ 8 files changed, 50 insertions(+), 22 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..045c7c6 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -4,31 +4,35 @@ import com.zipcodewilmington.bakery.services.BakerService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +@Controller public class BakerController { private BakerService service; public BakerController(BakerService service) { this.service = service; } - +@GetMapping("/bakers/") 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("/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..ec8299e 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -4,31 +4,34 @@ import com.zipcodewilmington.bakery.services.MuffinService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +@Controller public class MuffinController { private MuffinService service; 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); } - - public ResponseEntity create(Muffin baker) { - return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); + @PostMapping + 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 + public ResponseEntity update(@PathVariable Long id,@RequestBody Muffin muffin) { + return new ResponseEntity<>(service.update(id, muffin), HttpStatus.OK); } - - public ResponseEntity destroy(Long id) { +@DeleteMapping + 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..c795809 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..11a4d90 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..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..8818ebb 100644 --- a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java +++ b/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java @@ -2,6 +2,9 @@ import com.zipcodewilmington.bakery.models.Muffin; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.RepositoryDefinition; +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..59b1055 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; @@ -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..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;