Finish the api with the validations and his verification

Author: JEstebanC

src/main/java/JEstebanC/FastFoodApp/controller/IngredientController.java renamed to src/main/java/JEstebanC/FastFoodApp/controller/AdditionalController.java

@@ -20,76 +20,76 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import JEstebanC.FastFoodApp.model.Ingredient;
+import JEstebanC.FastFoodApp.model.Additional;
 import JEstebanC.FastFoodApp.model.Response;
-import JEstebanC.FastFoodApp.service.IngredientServiceImp;
+import JEstebanC.FastFoodApp.service.AdditionalServiceImp;
 import lombok.RequiredArgsConstructor;
 
 /**
  * @author Juan Esteban Castaño Holguin castanoesteban9@gmail.com 2022-01-24
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/ingredient")
-public class IngredientController {
+@RequestMapping("/additional")
+public class AdditionalController {
 
 	@Autowired
-	private final IngredientServiceImp serviceImp;
+	private final AdditionalServiceImp serviceImp;
 
 //	CREATE
 	@PostMapping()
-	public ResponseEntity<Response> saveIngredient(@RequestBody @Valid Ingredient ingredient) {
+	public ResponseEntity<Response> saveAdditional(@RequestBody @Valid Additional addiotional) {
 		return ResponseEntity
-				.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("ingredient", serviceImp.create(ingredient)))
-						.message("Create ingredient").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+				.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("additional", serviceImp.create(addiotional)))
+						.message("Create additional").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 	}
 
 //  READ
 	@GetMapping(value = "/list")
-	public ResponseEntity<Response> getIngredient() {
-		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("ingredient", serviceImp.list()))
-				.message("List ingredients").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+	public ResponseEntity<Response> getadditional() {
+		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("additional", serviceImp.list()))
+				.message("List additionals").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 	}
 
 //	UPDATE
 	@PutMapping(value = "/{id}")
-	public ResponseEntity<Response> updateIngredient(@PathVariable("id") Long id, @RequestBody @Valid Ingredient ingredient) {
+	public ResponseEntity<Response> updateAdditional(@PathVariable("id") Long id, @RequestBody @Valid Additional addiotional) {
 		if (serviceImp.exist(id)) {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.data(Map.of("ingredient", serviceImp.update(ingredient))).message("Update ingredient with id:" + id)
+					.data(Map.of("additional", serviceImp.update(addiotional))).message("Update additional with id:" + id)
 					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 		} else {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.message("The ingredient with id:" + id + " does not exist").status(HttpStatus.BAD_REQUEST)
+					.message("The additional with id:" + id + " does not exist").status(HttpStatus.BAD_REQUEST)
 					.statusCode(HttpStatus.BAD_REQUEST.value()).build());
 		}
 	}
 
 //	DELETE
 	@DeleteMapping(value = "/{id}")
-	public ResponseEntity<Response> deleteIngredient(@PathVariable("id") Long id) {
+	public ResponseEntity<Response> deleteAdditional(@PathVariable("id") Long id) {
 		if (serviceImp.exist(id)) {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.data(Map.of("ingredient", serviceImp.delete(id))).message("Delete ingredient with id: " + id)
+					.data(Map.of("additional", serviceImp.delete(id))).message("Delete additional with id: " + id)
 					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 		} else {
 			return ResponseEntity
-					.ok(Response.builder().timeStamp(Instant.now()).message("The ingredient " + id + " does not exist")
+					.ok(Response.builder().timeStamp(Instant.now()).message("The additional " + id + " does not exist")
 							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
 		}
 	}
 //	SEARCH BY NAME
 	@GetMapping(value = "/{name}")
-	public ResponseEntity<Response> getIngredientByName(@PathVariable("name") String name) {
+	public ResponseEntity<Response> getAdditionalByName(@PathVariable("name") String name) {
 
 		if (serviceImp.findByName(name) != null) {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.data(Map.of("ingredient", serviceImp.findByName(name))).message("Get ingredient by name: " + name)
+					.data(Map.of("additional", serviceImp.findByName(name))).message("Get additional by name: " + name)
 					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 
 		} else {
 			return ResponseEntity.ok(
-					Response.builder().timeStamp(Instant.now()).message("The ingredient called" + name + " does not exist")
+					Response.builder().timeStamp(Instant.now()).message("The additional called" + name + " does not exist")
 							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
 		}
 

src/main/java/JEstebanC/FastFoodApp/controller/BillController.java

@@ -0,0 +1,93 @@
+package JEstebanC.FastFoodApp.controller;
+
+import java.time.Instant;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import JEstebanC.FastFoodApp.model.Bill;
+import JEstebanC.FastFoodApp.model.Response;
+import JEstebanC.FastFoodApp.service.BillServiceImp;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author Juan Esteban Castaño Holguin castanoesteban9@gmail.com 2022-01-26
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bill")
+public class BillController {
+
+	@Autowired
+	private final BillServiceImp serviceImp;
+
+//	CREATE
+	@PostMapping()
+	public ResponseEntity<Response> saveBill(@RequestBody @Valid Bill bill) {
+		return ResponseEntity
+				.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("bill", serviceImp.create(bill)))
+						.message("Create bill").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+	}
+
+//  READ
+	@GetMapping(value = "/list")
+	public ResponseEntity<Response> getBill() {
+		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("bill", serviceImp.list()))
+				.message("List bills").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+	}
+
+//	UPDATE
+	@PutMapping(value = "/{id}")
+	public ResponseEntity<Response> updateBill(@PathVariable("id") Long id, @RequestBody @Valid Bill bill) {
+		if (serviceImp.exist(id)) {
+			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
+					.data(Map.of("bill", serviceImp.update(bill))).message("Update bill with id:" + id)
+					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+		} else {
+			return ResponseEntity.ok(
+					Response.builder().timeStamp(Instant.now()).message("The bill with id:" + id + " does not exist")
+							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
+		}
+	}
+
+//	DELETE
+	@DeleteMapping(value = "/{id}")
+	public ResponseEntity<Response> deleteBill(@PathVariable("id") Long id) {
+		if (serviceImp.exist(id)) {
+			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
+					.data(Map.of("bill", serviceImp.delete(id))).message("Delete bill with id: " + id)
+					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+		} else {
+			return ResponseEntity
+					.ok(Response.builder().timeStamp(Instant.now()).message("The bill " + id + " does not exist")
+							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
+		}
+	}
+//  SEARCH BY CLIENT
+	@GetMapping(value = "/client/{id}")
+	public ResponseEntity<Response> getBill(@PathVariable("id") Long id) {
+		
+		if(serviceImp.findByIdClient(id)!=null) {
+			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("bill", serviceImp.findByIdClient(id)))
+					.message("List bills").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+		}else{
+			return ResponseEntity
+					.ok(Response.builder().timeStamp(Instant.now()).message("The bill with id client: " + id + " does not exist")
+							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
+		}
+		
+		
+	}
+}

src/main/java/JEstebanC/FastFoodApp/controller/CategoryIngredientController.java renamed to src/main/java/JEstebanC/FastFoodApp/controller/CategoryAdditionalController.java

@@ -20,80 +20,80 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import JEstebanC.FastFoodApp.model.CategoryIngredient;
+import JEstebanC.FastFoodApp.model.CategoryAdditional;
 import JEstebanC.FastFoodApp.model.Response;
-import JEstebanC.FastFoodApp.service.CategoryIngredientServiceImp;
+import JEstebanC.FastFoodApp.service.CategoryAdditionalServiceImp;
 import lombok.RequiredArgsConstructor;
 
 /**
  * @author Juan Esteban Castaño Holguin castanoesteban9@gmail.com 2022-01-24
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/category-ingredient")
-public class CategoryIngredientController {
+@RequestMapping("/category-additional")
+public class CategoryAdditionalController {
 
 	@Autowired
-	private final CategoryIngredientServiceImp serviceImp;
+	private final CategoryAdditionalServiceImp serviceImp;
 
 //	CREATE
 	@PostMapping()
-	public ResponseEntity<Response> saveCategoryIngredient(@RequestBody @Valid CategoryIngredient categoryIngredient) {
+	public ResponseEntity<Response> saveCategoryAdditional(@RequestBody @Valid CategoryAdditional categoryAdditional) {
 		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-				.data(Map.of("categoryIngredient", serviceImp.create(categoryIngredient)))
-				.message("Create category ingredient").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+				.data(Map.of("categoryAdditional", serviceImp.create(categoryAdditional)))
+				.message("Create category additional").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 	}
 
 //  READ
 	@GetMapping(value = "/list")
-	public ResponseEntity<Response> getCategoryIngredient() {
+	public ResponseEntity<Response> getCategoryAdditional() {
 		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-				.data(Map.of("categoryIngredient", serviceImp.list())).message("List categories ingredients")
+				.data(Map.of("categoryAdditional", serviceImp.list())).message("List categories additionals")
 				.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
 	}
 
 //	UPDATE
 	@PutMapping(value = "/{id}")
-	public ResponseEntity<Response> updateCategoryIngredient(@PathVariable("id") Long id,
-			@RequestBody @Valid CategoryIngredient categoryIngredient) {
+	public ResponseEntity<Response> updateCategoryAdditional(@PathVariable("id") Long id,
+			@RequestBody @Valid CategoryAdditional categoryAdditional) {
 		if (serviceImp.exist(id)) {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.data(Map.of("categoryIngredient", serviceImp.update(categoryIngredient)))
-					.message("Update category ingredient with id:" + id).status(HttpStatus.OK)
+					.data(Map.of("categoryAdditional", serviceImp.update(categoryAdditional)))
+					.message("Update category additional with id:" + id).status(HttpStatus.OK)
 					.statusCode(HttpStatus.OK.value()).build());
 		} else {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.message("The category ingredient with id:" + id + " does not exist").status(HttpStatus.BAD_REQUEST)
+					.message("The category additional with id:" + id + " does not exist").status(HttpStatus.BAD_REQUEST)
 					.statusCode(HttpStatus.BAD_REQUEST.value()).build());
 		}
 	}
 
 //	DELETE
 	@DeleteMapping(value = "/{id}")
-	public ResponseEntity<Response> deleteCategoryIngredient(@PathVariable("id") Long id) {
+	public ResponseEntity<Response> deleteCategoryAdditional(@PathVariable("id") Long id) {
 		if (serviceImp.exist(id)) {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.data(Map.of("categoryIngredient", serviceImp.delete(id)))
-					.message("Delete category ingredient with id: " + id).status(HttpStatus.OK)
+					.data(Map.of("categoryAdditional", serviceImp.delete(id)))
+					.message("Delete category additional with id: " + id).status(HttpStatus.OK)
 					.statusCode(HttpStatus.OK.value()).build());
 		} else {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.message("The category ingredient " + id + " does not exist").status(HttpStatus.BAD_REQUEST)
+					.message("The category additional " + id + " does not exist").status(HttpStatus.BAD_REQUEST)
 					.statusCode(HttpStatus.BAD_REQUEST.value()).build());
 		}
 	}
 
 //	SEARCH BY NAME
 	@GetMapping(value = "/{name}")
-	public ResponseEntity<Response> getCategoryIngredientByName(@PathVariable("name") String name) {
+	public ResponseEntity<Response> getCategoryAdditionalByName(@PathVariable("name") String name) {
 		if (serviceImp.findByName(name) != null) {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.data(Map.of("categoryIngredient", serviceImp.findByName(name)))
-					.message("Get category ingredient by name: " + name).status(HttpStatus.OK)
+					.data(Map.of("categoryAdditional", serviceImp.findByName(name)))
+					.message("Get category additional by name: " + name).status(HttpStatus.OK)
 					.statusCode(HttpStatus.OK.value()).build());
 		} else {
 			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
-					.message("The category ingredient called" + name + " does not exist").status(HttpStatus.BAD_REQUEST)
+					.message("The category additional called" + name + " does not exist").status(HttpStatus.BAD_REQUEST)
 					.statusCode(HttpStatus.BAD_REQUEST.value()).build());
 		}
 

src/main/java/JEstebanC/FastFoodApp/controller/OrdersController.java

@@ -0,0 +1,86 @@
+package JEstebanC.FastFoodApp.controller;
+
+import java.time.Instant;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import JEstebanC.FastFoodApp.model.Orders;
+import JEstebanC.FastFoodApp.model.Response;
+import JEstebanC.FastFoodApp.service.OrdersServiceImp;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author Juan Esteban Castaño Holguin castanoesteban9@gmail.com 2022-01-28
+ */
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/orders")
+public class OrdersController {
+
+	@Autowired
+	private final OrdersServiceImp serviceImp;
+
+//	CREATE
+	@PostMapping()
+	public ResponseEntity<Response> saveOrder(@RequestBody @Valid Orders order) {
+		return ResponseEntity
+				.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("order", serviceImp.create(order)))
+						.message("Create order").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+	}
+
+//  READ
+	@GetMapping(value = "/list")
+	public ResponseEntity<Response> getOrder() {
+		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("order", serviceImp.list()))
+				.message("List orders").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+	}
+
+//	UPDATE
+	@PutMapping(value = "/{id}")
+	public ResponseEntity<Response> updateOrder(@PathVariable("id") Long id, @RequestBody @Valid Orders order) {
+		if (serviceImp.exist(id)) {
+			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
+					.data(Map.of("order", serviceImp.update(order))).message("Update order with id:" + id)
+					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+		} else {
+			return ResponseEntity.ok(
+					Response.builder().timeStamp(Instant.now()).message("The order with id:" + id + " does not exist")
+							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
+		}
+	}
+
+//	DELETE
+	@DeleteMapping(value = "/{id}")
+	public ResponseEntity<Response> deleteOrder(@PathVariable("id") Long id) {
+		if (serviceImp.exist(id)) {
+			return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
+					.data(Map.of("order", serviceImp.delete(id))).message("order bill with id: " + id)
+					.status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+		} else {
+			return ResponseEntity
+					.ok(Response.builder().timeStamp(Instant.now()).message("The bill " + id + " does not exist")
+							.status(HttpStatus.BAD_REQUEST).statusCode(HttpStatus.BAD_REQUEST.value()).build());
+		}
+	}
+	
+// 	SEARCH  ORDER BY ID CLIENT
+	@GetMapping(value = "/bill/{idBill}")
+	public ResponseEntity<Response> getOrderByIdClient(@PathVariable("idBill") Long idBill) {
+		return ResponseEntity.ok(Response.builder().timeStamp(Instant.now()).data(Map.of("order", serviceImp.findByIdBill(idBill)))
+				.message("List orders").status(HttpStatus.OK).statusCode(HttpStatus.OK.value()).build());
+	}
+}