From 5d86598bc7b48fb9591ddd3fc29fc0b7a93809b3 Mon Sep 17 00:00:00 2001 From: Marc Rodriguez Date: Wed, 9 Oct 2024 11:53:01 +0200 Subject: [PATCH 1/3] asfasf --- src/main/resources/application.properties | 3 +-- src/main/resources/application.properties~ | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/application.properties~ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bb3e760..e8948fe 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,7 @@ spring.application.name=restaurantManager -#spring.datasource.url=jdbc:h2:mem:testdb -spring.datasource.url=jdbc:h2:/home/albert/MyProjects/DataBase/customerdb +spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=albert spring.datasource.password=1234 diff --git a/src/main/resources/application.properties~ b/src/main/resources/application.properties~ new file mode 100644 index 0000000..bb3e760 --- /dev/null +++ b/src/main/resources/application.properties~ @@ -0,0 +1,15 @@ +spring.application.name=restaurantManager + + +#spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.url=jdbc:h2:/home/albert/MyProjects/DataBase/customerdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=albert +spring.datasource.password=1234 +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.h2.console.enabled=true + +spring.jpa.hibernate.ddl-auto=create + +springdoc.api-docs.path=/api-docs +springdoc.swagger-ui.path=/swagger-ui.html \ No newline at end of file From 9fd73ffd5ea3e7469732a235fe81c76b4033c34a Mon Sep 17 00:00:00 2001 From: Marc Rodriguez Date: Fri, 11 Oct 2024 13:26:32 +0200 Subject: [PATCH 2/3] final --- HELP.md | 2 +- _PRA/PRA01.md | 15 +- _PRA/PRA01.md~ | 88 ++++++++++ .../RestaurantManagerApplication.java | 9 +- .../controller/CustomerController.java | 8 +- .../controller/CustomerWebController.java | 2 +- .../controller/MenuController.java | 83 ++++++++++ .../controller/MenuWebController.java | 32 ++++ .../controller/OrderController.java | 84 ++++++++++ .../controller/OrderController.java~ | 84 ++++++++++ .../controller/OrderWebController.java | 29 ++++ .../controller/TableController.java | 84 ++++++++++ .../controller/TableWebController.java | 26 +++ .../restaurantManager/model/Booking.java | 4 +- .../model/MenuRestaurant.java | 27 ++++ .../model/{Menu.java => MenuRestaurant.java~} | 6 +- .../restaurantManager/model/Order.java | 37 ----- .../model/OrderRestaurant.java | 45 ++++++ .../{Table.java => TableRestaurant.java} | 9 +- .../repository/MenuRepository.java | 7 + .../repository/OrderRepository.java | 8 + .../repository/TableRepository.java | 8 + .../service/CustomerService.java | 3 + .../service/MenuRestaurantService.java | 17 ++ .../service/MenuRestaurantServiceImpl.java | 72 +++++++++ .../service/OrderService.java | 18 +++ .../service/OrderServiceImpl.java | 67 ++++++++ .../service/TableService.java | 20 +++ .../service/TableServiceImpl.java | 71 +++++++++ .../utilities/CustomerDataLoader.java | 42 ----- .../utilities/DataLoader.java | 142 +++++++++++++++++ .../utilities/DataLoader.java~ | 150 ++++++++++++++++++ .../utilities/OrderDataLoader.java~ | 42 +++++ src/main/resources/application.properties | 10 +- src/main/resources/application.properties~ | 5 +- src/main/resources/static/css/stylesMenu.css | 75 +++++++++ .../resources/static/css/stylesOrders.css | 74 +++++++++ .../resources/static/css/stylesTables.css | 74 +++++++++ src/main/resources/templates/home.html | 6 +- src/main/resources/templates/menuHome.html | 49 ++++++ src/main/resources/templates/menuOrder.html | 48 ++++++ src/main/resources/templates/menuTable.html | 43 +++++ 42 files changed, 1617 insertions(+), 108 deletions(-) create mode 100644 _PRA/PRA01.md~ create mode 100644 src/main/java/dev/example/restaurantManager/controller/MenuController.java create mode 100644 src/main/java/dev/example/restaurantManager/controller/MenuWebController.java create mode 100644 src/main/java/dev/example/restaurantManager/controller/OrderController.java create mode 100644 src/main/java/dev/example/restaurantManager/controller/OrderController.java~ create mode 100644 src/main/java/dev/example/restaurantManager/controller/OrderWebController.java create mode 100644 src/main/java/dev/example/restaurantManager/controller/TableController.java create mode 100644 src/main/java/dev/example/restaurantManager/controller/TableWebController.java create mode 100644 src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java rename src/main/java/dev/example/restaurantManager/model/{Menu.java => MenuRestaurant.java~} (70%) delete mode 100644 src/main/java/dev/example/restaurantManager/model/Order.java create mode 100644 src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java rename src/main/java/dev/example/restaurantManager/model/{Table.java => TableRestaurant.java} (58%) create mode 100644 src/main/java/dev/example/restaurantManager/repository/MenuRepository.java create mode 100644 src/main/java/dev/example/restaurantManager/repository/OrderRepository.java create mode 100644 src/main/java/dev/example/restaurantManager/repository/TableRepository.java create mode 100644 src/main/java/dev/example/restaurantManager/service/MenuRestaurantService.java create mode 100644 src/main/java/dev/example/restaurantManager/service/MenuRestaurantServiceImpl.java create mode 100644 src/main/java/dev/example/restaurantManager/service/OrderService.java create mode 100644 src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java create mode 100644 src/main/java/dev/example/restaurantManager/service/TableService.java create mode 100644 src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java delete mode 100644 src/main/java/dev/example/restaurantManager/utilities/CustomerDataLoader.java create mode 100644 src/main/java/dev/example/restaurantManager/utilities/DataLoader.java create mode 100644 src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ create mode 100644 src/main/java/dev/example/restaurantManager/utilities/OrderDataLoader.java~ create mode 100644 src/main/resources/static/css/stylesMenu.css create mode 100644 src/main/resources/static/css/stylesOrders.css create mode 100644 src/main/resources/static/css/stylesTables.css create mode 100644 src/main/resources/templates/menuHome.html create mode 100644 src/main/resources/templates/menuOrder.html create mode 100644 src/main/resources/templates/menuTable.html diff --git a/HELP.md b/HELP.md index 34b0d40..e43068a 100644 --- a/HELP.md +++ b/HELP.md @@ -1,6 +1,6 @@ # Restaurant Manager Application -This Spring Boot application is designed to manage various aspects of a restaurant's operations. It provides functionality for customer management, bookings, menu items, orders, and table management. +This Spring Boot application is designed to manage various aspects of a restaurant's operations. It provides functionality for customer management, bookings, menu items, orders, and tableRestaurant management. ## Project Structure diff --git a/_PRA/PRA01.md b/_PRA/PRA01.md index 6d70130..e6150c1 100644 --- a/_PRA/PRA01.md +++ b/_PRA/PRA01.md @@ -17,12 +17,12 @@ Enhance the existing Restaurant Manager project by implementing JPA repositories Summary tasks -- [ ] Update Entity Classe -- [ ] Create Faker Classe -- [ ] Develop Service Layer -- [ ] Implement JPA Repositories -- [ ] Design REST Controllers -- [ ] Test with Swagger API +- [x] Update Entity Classe +- [x] Create Faker Classe +- [x] Develop Service Layer +- [x] Implement JPA Repositories +- [x] Design REST Controllers +- [x] Test with Swagger API @@ -83,3 +83,6 @@ Good luck with your implementation! And remember, **code slow to go far** Citations: [1] https://github.com/AlbertProfe/restaurantManager/commits/master/ [2] https://albertprofe.dev/springboot/sblab8-3.ht + +##### Preguntas +Puedo crear un metodo que una todos los fakers y ir ejecutando uno por uno para poder sacar datos de ellos, por ejemplo: ejecuto primero Menus y tables para que en order pueda coger aleatoriamente un menu y un table. \ No newline at end of file diff --git a/_PRA/PRA01.md~ b/_PRA/PRA01.md~ new file mode 100644 index 0000000..c60d3a6 --- /dev/null +++ b/_PRA/PRA01.md~ @@ -0,0 +1,88 @@ +# PRA01: Spring Boot JPA Repository and Entity Class Exercise + +## CIFO La Violeta - FullStack IFCD0021-24 MF01-02-03 + +In this practical exercise, you will enhance the existing Restaurant Manager project by implementing JPA repositories, entity classes, and related components. You'll be working with the **TABLE** and **MENUS** classes, transforming them into entities and creating the necessary supporting structures. + +## Objectives + +Enhance the existing Restaurant Manager project by implementing JPA repositories, entity classes, and related components. + +### Project Base + +- Existing Repository: [Restaurant Manager](https://github.com/AlbertProfe/restaurantManager/commits/master/)[1] +- Reference Lab: [Spring Boot Lab 8.3](https://albertprofe.dev/springboot/sblab8-3.html)[2] + +### Tasks + +Summary tasks + +- [x] Update Entity Classe +- [x] Create Faker Classe +- [x] Develop Service Layer +- [x] Implement JPA Repositories +- [ ] Design REST Controllers +- [ ] Test with Swagger API + + + +1. **Update Entity Classes** + + - Transform the **TABLE** and **MENUS** classes into JPA entities. + - Add appropriate annotations such as `@Entity`, `@Id`, and do not use `@GeneratedValue.`Use @id string UUID. + - ~~Define relationships between entities if necessary.~~ + +2. **Create Faker Classes** + + - Implement faker classes for **TABLE** and **MENUS** to generate sample data. + - Use libraries like **Faker** or **Java Faker** to create realistic mock data. + +3. **Develop Service Layer** + + - Create service interfaces for **TABLE** and **MENUS**. + - Implement the service interfaces with concrete classes. + - Include methods for CRUD operations and any additional business logic. + +4. **Implement JPA Repositories** + + - Create JPA repository `interfaces` for **TABLE** and **MENUS**. + - Extend `JpaRepository` for each entity. + - ~~Add any custom query methods if required.~~ + +5. **Design REST Controllers** + + - Develop REST controllers for **TABLE** and **MENUS**. + - Implement endpoints for CRUD operations. + - Use appropriate HTTP methods (GET, POST, PUT, DELETE) for each operation. + +6. **Test with Swagger API** + + - Configure `Swagger` for your Spring Boot application. + - Use `Swagger` UI to test all implemented REST endpoints. + - Verify CRUD operations for both **TABLE** and **MENUS** entities. + +### Submission Guidelines + +- Fork the existing [Restaurant Manager](https://github.com/AlbertProfe/restaurantManager/commits/master/) repository and clone to your local environment. +- Create a new branch named `PRA01-YourName`from the commit `PRA01: Spring Boot JPA Repository and Entity Class Exercise` +- Commit your changes with clear, descriptive messages. +- **Push** your branch to your forked repository. +- Create a pull request to the AlbertProfe repository with a summary of your changes with title: + - `PRA01-YourName-SpringBootJPARepositoryAndEntityClassExercise` + +### Evaluation Criteria + +- Correct implementation of JPA entities and repositories. +- Proper use of Spring Boot annotations and best practices. +- Functionality of service layer and controllers. +- Quality and coverage of Swagger API tests. +- Code clarity and documentation. + +Good luck with your implementation! And remember, **code slow to go far** + +Citations: +[1] https://github.com/AlbertProfe/restaurantManager/commits/master/ +[2] https://albertprofe.dev/springboot/sblab8-3.ht + +##### Preguntas +Puedo crear un metodo que una todos los fakers y ir ejecutando uno por uno para poder sacar datos de ellos, por ejemplo: ejecuto primero Menus y tables para que en order pueda coger aleatoriamente un menu y un table. \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java b/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java index 7be7eb3..f4d8f9c 100644 --- a/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java +++ b/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java @@ -1,7 +1,7 @@ package dev.example.restaurantManager; -import dev.example.restaurantManager.utilities.CustomerDataLoader; +import dev.example.restaurantManager.utilities.DataLoader; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -15,8 +15,11 @@ public static void main(String[] args) { SpringApplication.run(RestaurantManagerApplication.class, args); } + @Bean - public ApplicationRunner dataLoader(CustomerDataLoader customerDataLoader) { - return args -> customerDataLoader.createFakeCustomers(); + public ApplicationRunner customerDataLoader(DataLoader DataLoader) { + return args -> DataLoader.createFakeAllData(); + } + } \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/controller/CustomerController.java b/src/main/java/dev/example/restaurantManager/controller/CustomerController.java index fc0fe65..337eee4 100644 --- a/src/main/java/dev/example/restaurantManager/controller/CustomerController.java +++ b/src/main/java/dev/example/restaurantManager/controller/CustomerController.java @@ -37,7 +37,7 @@ public ResponseEntity> getAllCustomers( ) { : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); } - @PostMapping + @PostMapping("/add") public ResponseEntity createCustomer(@RequestBody Customer customer) { Customer createdCustomer = customerService.createCustomer(customer); HttpHeaders headers = getCommonHeaders("Create a new customer"); @@ -47,7 +47,7 @@ public ResponseEntity createCustomer(@RequestBody Customer customer) { : new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST); } - @PutMapping("/{id}") + @PutMapping("/update/{id}") public ResponseEntity updateCustomer(@PathVariable String id, @RequestBody Customer customerDetails) { Customer updatedCustomer = customerService.updateCustomer(id, customerDetails); HttpHeaders headers = getCommonHeaders("Update a customer"); @@ -57,7 +57,7 @@ public ResponseEntity updateCustomer(@PathVariable String id, @Request : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); } - @DeleteMapping("/{id}") + @DeleteMapping("/delete/{id}") public ResponseEntity deleteCustomer(@PathVariable String id) { boolean deleted = customerService.deleteCustomer(id); HttpHeaders headers = getCommonHeaders("Delete a customer"); @@ -69,7 +69,7 @@ public ResponseEntity deleteCustomer(@PathVariable String id) { : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); } - @GetMapping("/{id}") + @GetMapping("/get/{id}") public ResponseEntity getCustomerById(@PathVariable String id) { Customer customer = customerService.getCustomerById(id); HttpHeaders headers = getCommonHeaders("Get a customer by Id"); diff --git a/src/main/java/dev/example/restaurantManager/controller/CustomerWebController.java b/src/main/java/dev/example/restaurantManager/controller/CustomerWebController.java index 416c7ef..5623313 100644 --- a/src/main/java/dev/example/restaurantManager/controller/CustomerWebController.java +++ b/src/main/java/dev/example/restaurantManager/controller/CustomerWebController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; -@RequestMapping("/web") +@RequestMapping("/customer") @Controller public class CustomerWebController { diff --git a/src/main/java/dev/example/restaurantManager/controller/MenuController.java b/src/main/java/dev/example/restaurantManager/controller/MenuController.java new file mode 100644 index 0000000..5977097 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/MenuController.java @@ -0,0 +1,83 @@ +package dev.example.restaurantManager.controller; + +import dev.example.restaurantManager.model.Customer; +import dev.example.restaurantManager.model.MenuRestaurant; +import dev.example.restaurantManager.service.CustomerService; +import dev.example.restaurantManager.service.MenuRestaurantService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RequestMapping("/api/v1/menu") +@RestController +public class MenuController { + + @Autowired + private MenuRestaurantService menuRestaurantService; + @GetMapping("/allMenus") + public ResponseEntity> getAllMenus( ) { + List menuRestaurants = menuRestaurantService.getAllMenus(); + HttpHeaders headers = getCommonHeaders("Get all menus"); + + return menuRestaurants != null && !menuRestaurants.isEmpty() + ? new ResponseEntity<>(menuRestaurants, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @PostMapping("/add") + public ResponseEntity createMenu(@RequestBody MenuRestaurant menuRestaurant) { + MenuRestaurant createdMenu = menuRestaurantService.createMenu(menuRestaurant); + HttpHeaders headers = getCommonHeaders("Create a new menu"); + + return createdMenu != null + ? new ResponseEntity<>(createdMenu, headers, HttpStatus.CREATED) + : new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST); + } + @PutMapping("/update/{id}") + public ResponseEntity updateMenu(@PathVariable String id, @RequestBody MenuRestaurant menuRestaurantDetails) { + MenuRestaurant updatedMenu = menuRestaurantService.updateMenu(id, menuRestaurantDetails); + HttpHeaders headers = getCommonHeaders("Update a menu"); + + return updatedMenu != null + ? new ResponseEntity<>(updatedMenu, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteMenu(@PathVariable String id) { + boolean deleted = menuRestaurantService.deleteMenu(id); + HttpHeaders headers = getCommonHeaders("Delete a menu"); + headers.add("deleted", String.valueOf(deleted)); + + return deleted + ? new ResponseEntity<>(headers, HttpStatus.NO_CONTENT) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @GetMapping("/get/{id}") + public ResponseEntity getMenuById(@PathVariable String id) { + MenuRestaurant menu = menuRestaurantService.getMenuById(id); + HttpHeaders headers = getCommonHeaders("Get a menu"); + + return menu != null + ? new ResponseEntity<>(menu, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + private HttpHeaders getCommonHeaders(String description) { + HttpHeaders headers = new HttpHeaders(); + headers.add("desc", description); + headers.add("content-type", "application/json"); + headers.add("date", new Date().toString()); + headers.add("server", "H2 Database"); + headers.add("version", "1.0.0"); + headers.add("menu-count", String.valueOf(menuRestaurantService.countMenus())); + headers.add("object", "customers"); + return headers; + } +} diff --git a/src/main/java/dev/example/restaurantManager/controller/MenuWebController.java b/src/main/java/dev/example/restaurantManager/controller/MenuWebController.java new file mode 100644 index 0000000..9e4a628 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/MenuWebController.java @@ -0,0 +1,32 @@ +package dev.example.restaurantManager.controller; + +import dev.example.restaurantManager.model.Customer; +import dev.example.restaurantManager.model.MenuRestaurant; +import dev.example.restaurantManager.repository.CustomerRepository; +import dev.example.restaurantManager.repository.MenuRepository; +import dev.example.restaurantManager.service.MenuRestaurantService; +import dev.example.restaurantManager.service.OrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +@RequestMapping("/menus") +@Controller +public class MenuWebController { + + @Autowired + MenuRepository menuRepository; + + @GetMapping("/home") + public String home(Model model) { + + List menus = menuRepository.findAll(); + model.addAttribute("customersToView", menus); + + return "menuHome"; + } +} diff --git a/src/main/java/dev/example/restaurantManager/controller/OrderController.java b/src/main/java/dev/example/restaurantManager/controller/OrderController.java new file mode 100644 index 0000000..39eaed8 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/OrderController.java @@ -0,0 +1,84 @@ +package dev.example.restaurantManager.controller; + + +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.service.OrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RequestMapping("/api/v1/order") +@RestController +public class OrderController { + + @Autowired + private OrderService orderService; + + @GetMapping("/allOrders") + public ResponseEntity> getAllOrders( ) { + List orderRestaurants = orderService.getAllOrders(); + HttpHeaders headers = getCommonHeaders("Get all orders"); + + return orderRestaurants != null && !orderRestaurants.isEmpty() + ? new ResponseEntity<>(orderRestaurants, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @PostMapping("/add") + public ResponseEntity createOrder(@RequestBody OrderRestaurant orderRestaurant) { + OrderRestaurant createdOrder = orderService.createOrder(orderRestaurant); + HttpHeaders headers = getCommonHeaders("Create a new order"); + + return createdOrder != null + ? new ResponseEntity<>(createdOrder, headers, HttpStatus.CREATED) + : new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST); + } + + @PutMapping("/update/{id}") + public ResponseEntity updateOrder(@PathVariable String id, @RequestBody OrderRestaurant orderRestaurantDetails) { + OrderRestaurant updatedOrder = orderService.updateOrder(id, orderRestaurantDetails); + HttpHeaders headers = getCommonHeaders("Update a order"); + + return updatedOrder != null + ? new ResponseEntity<>(updatedOrder, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteOrder(@PathVariable String id) { + boolean deleted = orderService.deleteOrder(id); + HttpHeaders headers = getCommonHeaders("Delete a order"); + headers.add("deleted", String.valueOf(deleted)); + + return deleted + ? new ResponseEntity<>(headers, HttpStatus.NO_CONTENT) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @GetMapping("/get/{id}") + public ResponseEntity getOrderById(@PathVariable String id) { + OrderRestaurant order = orderService.getOrderById(id); + HttpHeaders headers = getCommonHeaders("Get an order"); + + return order != null + ? new ResponseEntity<>(order, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + private HttpHeaders getCommonHeaders(String description) { + HttpHeaders headers = new HttpHeaders(); + headers.add("desc", description); + headers.add("content-type", "application/json"); + headers.add("date", new Date().toString()); + headers.add("server", "H2 Database"); + headers.add("version", "1.0.0"); + headers.add("menu-count", String.valueOf(orderService.countOrders())); + headers.add("object", "customers"); + return headers; + } +} diff --git a/src/main/java/dev/example/restaurantManager/controller/OrderController.java~ b/src/main/java/dev/example/restaurantManager/controller/OrderController.java~ new file mode 100644 index 0000000..e0a0b0d --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/OrderController.java~ @@ -0,0 +1,84 @@ +package dev.example.restaurantManager.controller; + + +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.service.OrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RequestMapping("/api/v1/order") +@RestController +public class OrderController { + + @Autowired + private OrderService orderService; + + @GetMapping("/allOrders") + public ResponseEntity> getAllOrders( ) { + List orderRestaurants = orderService.getAllOrders(); + HttpHeaders headers = getCommonHeaders("Get all orders"); + + return orderRestaurants != null && !orderRestaurants.isEmpty() + ? new ResponseEntity<>(orderRestaurants, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @PostMapping + public ResponseEntity createOrder(@RequestBody OrderRestaurant orderRestaurant) { + OrderRestaurant createdOrder = orderService.createOrder(orderRestaurant); + HttpHeaders headers = getCommonHeaders("Create a new order"); + + return createdOrder != null + ? new ResponseEntity<>(createdOrder, headers, HttpStatus.CREATED) + : new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST); + } + + @PutMapping("/{id}") + public ResponseEntity updateOrder(@PathVariable String id, @RequestBody OrderRestaurant orderRestaurantDetails) { + OrderRestaurant updatedOrder = orderService.updateOrder(id, orderRestaurantDetails); + HttpHeaders headers = getCommonHeaders("Update a order"); + + return updatedOrder != null + ? new ResponseEntity<>(updatedOrder, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteOrder(@PathVariable String id) { + boolean deleted = orderService.deleteOrder(id); + HttpHeaders headers = getCommonHeaders("Delete a order"); + headers.add("deleted", String.valueOf(deleted)); + + return deleted + ? new ResponseEntity<>(headers, HttpStatus.NO_CONTENT) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @GetMapping("/{id}") + public ResponseEntity getOrderById(@PathVariable String id) { + OrderRestaurant order = orderService.getOrderById(id); + HttpHeaders headers = getCommonHeaders("Get an order"); + + return order != null + ? new ResponseEntity<>(order, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + private HttpHeaders getCommonHeaders(String description) { + HttpHeaders headers = new HttpHeaders(); + headers.add("desc", description); + headers.add("content-type", "application/json"); + headers.add("date", new Date().toString()); + headers.add("server", "H2 Database"); + headers.add("version", "1.0.0"); + headers.add("menu-count", String.valueOf(orderService.countOrders())); + headers.add("object", "customers"); + return headers; + } +} diff --git a/src/main/java/dev/example/restaurantManager/controller/OrderWebController.java b/src/main/java/dev/example/restaurantManager/controller/OrderWebController.java new file mode 100644 index 0000000..cb64e54 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/OrderWebController.java @@ -0,0 +1,29 @@ +package dev.example.restaurantManager.controller; + +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.repository.OrderRepository; +import dev.example.restaurantManager.service.OrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +@RequestMapping("/orders") +@Controller +public class OrderWebController { + + @Autowired + private OrderRepository orderRepository; + + @GetMapping("/home") + public String home(Model model) { + List orders = orderRepository.findAll(); + System.out.println("Number of orders: " + orders.size()); + model.addAttribute("ordersToView", orders); + return "menuOrder"; + } + +} diff --git a/src/main/java/dev/example/restaurantManager/controller/TableController.java b/src/main/java/dev/example/restaurantManager/controller/TableController.java new file mode 100644 index 0000000..6a8f591 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/TableController.java @@ -0,0 +1,84 @@ +package dev.example.restaurantManager.controller; + + + +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.service.TableService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/api/v1/tables") +public class TableController { + + @Autowired + private TableService tableService; + + @RequestMapping("/allOrders") + public ResponseEntity> getAllTables() { + List tables = tableService.getAllTables(); + HttpHeaders headers = getCommonHeaders("Get all tables"); + + return tables != null && !tables.isEmpty() + ? new ResponseEntity<>(tables, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + @PostMapping("/add") + public ResponseEntity createMenu(@RequestBody TableRestaurant tableRestaurant) { + TableRestaurant createdTable = tableService.createTable(tableRestaurant); + HttpHeaders headers = getCommonHeaders("Create a new table"); + + return createdTable != null + ? new ResponseEntity<>(createdTable, headers, HttpStatus.CREATED) + : new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST); + } + + @PutMapping("/update/{id}") + public ResponseEntity updateTable(@PathVariable String id, @RequestBody TableRestaurant tableRestaurantDetails) { + TableRestaurant updatedTable = tableService.updateTable(id, tableRestaurantDetails); + HttpHeaders headers = getCommonHeaders("Update a table"); + + return updatedTable != null + ? new ResponseEntity<>(updatedTable, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteTable(@PathVariable String id) { + boolean deleted = tableService.deleteTable(id); + HttpHeaders headers = getCommonHeaders("Delete a table"); + + return deleted + ? new ResponseEntity<>(headers, HttpStatus.NO_CONTENT) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @GetMapping("/get/{id}") + public ResponseEntity getTableById(@PathVariable String id) { + TableRestaurant table = tableService.getTableById(id); + HttpHeaders headers = getCommonHeaders("Get a table"); + + return table != null + ? new ResponseEntity<>(table, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + private HttpHeaders getCommonHeaders(String description) { + HttpHeaders headers = new HttpHeaders(); + headers.add("desc", description); + headers.add("content-type", "application/json"); + headers.add("date", new Date().toString()); + headers.add("server", "H2 Database"); + headers.add("version", "1.0.0"); + headers.add("menu-count", String.valueOf(tableService.countTables())); + headers.add("object", "customers"); + return headers; + } +} diff --git a/src/main/java/dev/example/restaurantManager/controller/TableWebController.java b/src/main/java/dev/example/restaurantManager/controller/TableWebController.java new file mode 100644 index 0000000..bbeac4b --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/TableWebController.java @@ -0,0 +1,26 @@ +package dev.example.restaurantManager.controller; + +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.repository.TableRepository; +import dev.example.restaurantManager.service.TableService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +@RequestMapping("/table") +@Controller +public class TableWebController { + + @Autowired + TableRepository tableRepository; + + @RequestMapping("/home") + public String home(Model model) { + List tables = tableRepository.findAll(); + model.addAttribute("tables", tables); + return "menuTable"; + } +} diff --git a/src/main/java/dev/example/restaurantManager/model/Booking.java b/src/main/java/dev/example/restaurantManager/model/Booking.java index b9ea2fa..0af40b9 100644 --- a/src/main/java/dev/example/restaurantManager/model/Booking.java +++ b/src/main/java/dev/example/restaurantManager/model/Booking.java @@ -14,7 +14,7 @@ public class Booking { private String phoneNumber; private int peopleQty; private LocalDateTime date; - private List tables; + private List tableRestaurants; private boolean confirmed; // Custom toString method (optional, as @Data provides a default toString) @@ -25,7 +25,7 @@ public String toString() { "phoneNumber: " + phoneNumber + "\n" + "peopleQty: " + peopleQty +"\n" + "date: " + date +"\n" + - "tables: " + tables + "tables: " + tableRestaurants ; } } \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java new file mode 100644 index 0000000..c979fb6 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java @@ -0,0 +1,27 @@ +package dev.example.restaurantManager.model; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import jakarta.persistence.Table; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "menus") +public class MenuRestaurant { + + + @Id + private String id; + private String name; + private Double price; + private String content; + private boolean active; + private boolean water; + +} + diff --git a/src/main/java/dev/example/restaurantManager/model/Menu.java b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ similarity index 70% rename from src/main/java/dev/example/restaurantManager/model/Menu.java rename to src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ index ac13716..8958f4c 100644 --- a/src/main/java/dev/example/restaurantManager/model/Menu.java +++ b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ @@ -1,13 +1,17 @@ package dev.example.restaurantManager.model; +import jakarta.persistence.Entity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import jakarta.persistence.Table; @Data @AllArgsConstructor @NoArgsConstructor -public class Menu { +@Entity +@Table(name = "menus") +public class MenuRestaurant { private String name; private Double price; diff --git a/src/main/java/dev/example/restaurantManager/model/Order.java b/src/main/java/dev/example/restaurantManager/model/Order.java deleted file mode 100644 index cf09f93..0000000 --- a/src/main/java/dev/example/restaurantManager/model/Order.java +++ /dev/null @@ -1,37 +0,0 @@ -package dev.example.restaurantManager.model; - -import java.util.ArrayList; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Order { - - private Date date; - private String waiter; - private int peopleQty; - private double totalPayment; - private boolean paid; - private ArrayList
tables; - private ArrayList menus; - - @Override - public String toString() { - return - "date: " + date + "\n" + - "waiter: " + waiter + "\n" + - "peopleQty: " + peopleQty +"\n" + - "totalPayment: " + totalPayment +" euros\n" + - "paid: " + paid +"\n" + - "Tables quantity: " + tables.size() +"\n" + - "table: " + tables +"\n" + - "Menus quantity: " + menus.size() +"\n" + - "menus: " + menus - ; - } - -} \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java b/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java new file mode 100644 index 0000000..4a6f961 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java @@ -0,0 +1,45 @@ +package dev.example.restaurantManager.model; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import jakarta.persistence.Table; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "orders") +public class OrderRestaurant { + @Id + private String id; + private Date date; + private String waiter; + private int peopleQty; + private double totalPayment; + private boolean paid; + + private List tableIds; + private List menuIds; + + @Override + public String toString() { + return + "date: " + date + "\n" + + "waiter: " + waiter + "\n" + + "peopleQty: " + peopleQty + "\n" + + "totalPayment: " + totalPayment + " euros\n" + + "paid: " + paid + "\n" + + "Tables quantity: " + tableIds.size() + "\n" + + "table IDs: " + tableIds + "\n" + + "Menus quantity: " + menuIds.size() + "\n" + + "menu IDs: " + menuIds; + } +} \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/model/Table.java b/src/main/java/dev/example/restaurantManager/model/TableRestaurant.java similarity index 58% rename from src/main/java/dev/example/restaurantManager/model/Table.java rename to src/main/java/dev/example/restaurantManager/model/TableRestaurant.java index 3ae969a..a3d3f4c 100644 --- a/src/main/java/dev/example/restaurantManager/model/Table.java +++ b/src/main/java/dev/example/restaurantManager/model/TableRestaurant.java @@ -1,14 +1,21 @@ package dev.example.restaurantManager.model; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import jakarta.persistence.Table; @Data @AllArgsConstructor @NoArgsConstructor -public class Table { +@Entity +@Table (name = "table_restaurant") +public class TableRestaurant { + @Id + private String id; private String name; private String description; private int qty; diff --git a/src/main/java/dev/example/restaurantManager/repository/MenuRepository.java b/src/main/java/dev/example/restaurantManager/repository/MenuRepository.java new file mode 100644 index 0000000..cbf1c1f --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/repository/MenuRepository.java @@ -0,0 +1,7 @@ +package dev.example.restaurantManager.repository; + +import dev.example.restaurantManager.model.MenuRestaurant; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MenuRepository extends JpaRepository { +} diff --git a/src/main/java/dev/example/restaurantManager/repository/OrderRepository.java b/src/main/java/dev/example/restaurantManager/repository/OrderRepository.java new file mode 100644 index 0000000..5bf0a31 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/repository/OrderRepository.java @@ -0,0 +1,8 @@ +package dev.example.restaurantManager.repository; + +import dev.example.restaurantManager.model.OrderRestaurant; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface OrderRepository extends JpaRepository { +} diff --git a/src/main/java/dev/example/restaurantManager/repository/TableRepository.java b/src/main/java/dev/example/restaurantManager/repository/TableRepository.java new file mode 100644 index 0000000..fd72fdb --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/repository/TableRepository.java @@ -0,0 +1,8 @@ +package dev.example.restaurantManager.repository; + +import dev.example.restaurantManager.model.TableRestaurant; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface TableRepository extends JpaRepository { +} diff --git a/src/main/java/dev/example/restaurantManager/service/CustomerService.java b/src/main/java/dev/example/restaurantManager/service/CustomerService.java index 1d6963a..637dc3d 100644 --- a/src/main/java/dev/example/restaurantManager/service/CustomerService.java +++ b/src/main/java/dev/example/restaurantManager/service/CustomerService.java @@ -3,8 +3,11 @@ import dev.example.restaurantManager.model.Customer; +import org.springframework.stereotype.Service; + import java.util.List; + public interface CustomerService { List getAllCustomers(); Customer createCustomer(Customer customer); diff --git a/src/main/java/dev/example/restaurantManager/service/MenuRestaurantService.java b/src/main/java/dev/example/restaurantManager/service/MenuRestaurantService.java new file mode 100644 index 0000000..cd78b88 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/MenuRestaurantService.java @@ -0,0 +1,17 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.MenuRestaurant; +import org.springframework.stereotype.Service; + +import java.util.List; + + +public interface MenuRestaurantService { + + List getAllMenus(); + MenuRestaurant getMenuById(String id); + MenuRestaurant createMenu(MenuRestaurant menuRestaurant); + MenuRestaurant updateMenu(String id, MenuRestaurant menuRestaurant); + boolean deleteMenu(String id); + long countMenus(); +} diff --git a/src/main/java/dev/example/restaurantManager/service/MenuRestaurantServiceImpl.java b/src/main/java/dev/example/restaurantManager/service/MenuRestaurantServiceImpl.java new file mode 100644 index 0000000..592a700 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/MenuRestaurantServiceImpl.java @@ -0,0 +1,72 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.MenuRestaurant; +import dev.example.restaurantManager.repository.MenuRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class MenuRestaurantServiceImpl implements MenuRestaurantService{ + + + @Autowired + private MenuRepository menuRepository; + + + @Override + public MenuRestaurant getMenuById(String id) { + Optional menu = menuRepository.findById(id); + return menu.get(); + } + + @Override + public MenuRestaurant createMenu(MenuRestaurant menu) { + Optional menuOptional = menuRepository.findById(menu.getId()); + if (menuOptional.isPresent()) { + return null; + } else { + menuRepository.save(menu); + return menu; + } + } + + @Override + public MenuRestaurant updateMenu(String id, MenuRestaurant menuDetails) { + Optional menuOptional = menuRepository.findById(id); + if (menuOptional.isPresent()) { + MenuRestaurant menu = menuOptional.get(); + menu.setName(menuDetails.getName()); + menu.setPrice(menuDetails.getPrice()); + menu.setContent(menuDetails.getContent()); + menu.setActive(menuDetails.isActive()); + menu.setWater(menuDetails.isWater()); + menuRepository.save(menu); + return menu; + } else { + return null; + } + } + @Override + public boolean deleteMenu(String id) { + Optional menuOptional = menuRepository.findById(id); + if (menuOptional.isPresent()) { + MenuRestaurant menu = menuOptional.get(); + menuRepository.delete(menu); + return true; + } else { + return false; + } + } + @Override + public List getAllMenus() { + List menus = menuRepository.findAll(); + return menus; + } + @Override + public long countMenus() { + return menuRepository.count(); + } +} diff --git a/src/main/java/dev/example/restaurantManager/service/OrderService.java b/src/main/java/dev/example/restaurantManager/service/OrderService.java new file mode 100644 index 0000000..cf585cc --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/OrderService.java @@ -0,0 +1,18 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.OrderRestaurant; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public interface OrderService { + + long countOrders(); + + List getAllOrders(); + OrderRestaurant getOrderById(String id); + OrderRestaurant createOrder(OrderRestaurant order); + OrderRestaurant updateOrder(String id, OrderRestaurant orderDetails); + boolean deleteOrder(String id); +} diff --git a/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java b/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java new file mode 100644 index 0000000..1ee0e20 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java @@ -0,0 +1,67 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.repository.OrderRepository; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Optional; + +public class OrderServiceImpl implements OrderService { + + @Autowired + private OrderRepository orderRepository; + + @Override + public List getAllOrders(){ + List orders = orderRepository.findAll(); + return orders; + } + + @Override + public OrderRestaurant getOrderById(String id){ + Optional order = orderRepository.findById(id); + return order.orElse(null); + } + + @Override + public OrderRestaurant createOrder(OrderRestaurant order){ + Optional orderRestaurant = orderRepository.findById(order.getId()); + if(orderRestaurant.isEmpty()){ + return orderRepository.save(order); + }else{ + return null; + } + } + + @Override + public OrderRestaurant updateOrder(String id, OrderRestaurant orderDetails){ + OrderRestaurant order = orderRepository.findById(id).orElse(null); + if(order != null){ + order.setId(orderDetails.getId()); + order.setDate(orderDetails.getDate()); + order.setWaiter(orderDetails.getWaiter()); + order.setPeopleQty(orderDetails.getPeopleQty()); + order.setTotalPayment(orderDetails.getTotalPayment()); + order.setPaid(orderDetails.isPaid()); + return orderRepository.save(order); + }else{ + return null; + } + } + + @Override + public boolean deleteOrder(String id){ + Optional order = orderRepository.findById(id); + if(order.isEmpty()){ + return false; + }else{ + orderRepository.deleteById(id); + return true; + } + } + @Override + public long countOrders(){ + return orderRepository.count(); + } +} diff --git a/src/main/java/dev/example/restaurantManager/service/TableService.java b/src/main/java/dev/example/restaurantManager/service/TableService.java new file mode 100644 index 0000000..3091730 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/TableService.java @@ -0,0 +1,20 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.TableRestaurant; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public interface TableService { + + List getAllTables(); + + TableRestaurant getTableById(String id); + + TableRestaurant createTable(TableRestaurant table); + + TableRestaurant updateTable(String id, TableRestaurant tableDetails); + + boolean deleteTable(String id); + long countTables(); +} diff --git a/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java b/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java new file mode 100644 index 0000000..d98950e --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java @@ -0,0 +1,71 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.repository.TableRepository; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Optional; + +public class TableServiceImpl implements TableService { + + @Autowired + TableRepository tableRepository; + + @Override + public TableRestaurant getTableById(String id) { + Optional table = tableRepository.findById(id); + if (table.isPresent()) { + return table.get(); + } else { + return null; + } + } + + @Override + public List getAllTables() { + List tables = tableRepository.findAll(); + return tables; + } + + @Override + public TableRestaurant createTable(TableRestaurant table) { + Optional tableOptional = tableRepository.findById(table.getId()); + if (tableOptional.isPresent()) { + return null; + } else { + tableRepository.save(table); + return table; + } + } + @Override + public TableRestaurant updateTable(String id, TableRestaurant tableDetails) { + Optional tableOptional = tableRepository.findById(id); + if (tableOptional.isPresent()) { + TableRestaurant table = tableOptional.get(); + table.setName(tableDetails.getName()); + table.setDescription(tableDetails.getDescription()); + table.setQty(tableDetails.getQty()); + table.setBusy(tableDetails.isBusy()); + tableRepository.save(table); + return table; + } else { + return null; + } + } + + @Override + public boolean deleteTable(String id) { + Optional table = tableRepository.findById(id); + if (table.isPresent()) { + tableRepository.delete(table.get()); + return true; + } else { + return false; + } + } + @Override + public long countTables() { + return tableRepository.count(); + } +} diff --git a/src/main/java/dev/example/restaurantManager/utilities/CustomerDataLoader.java b/src/main/java/dev/example/restaurantManager/utilities/CustomerDataLoader.java deleted file mode 100644 index 025ae13..0000000 --- a/src/main/java/dev/example/restaurantManager/utilities/CustomerDataLoader.java +++ /dev/null @@ -1,42 +0,0 @@ -package dev.example.restaurantManager.utilities; - -import com.github.javafaker.Faker; -import dev.example.restaurantManager.model.Customer; -import dev.example.restaurantManager.repository.CustomerRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import java.util.Locale; -import java.util.UUID; - -@Component -public class CustomerDataLoader { - - @Autowired - private CustomerRepository customerRepository; - - public void createFakeCustomers() { - // Check if the database is empty - if (customerRepository.count() == 0) { - System.out.println(" 0 records at the database found"); - Faker faker = new Faker(new Locale("en-US")); - - int qty = 50; - // Create and save 100 fake customers - for (int i = 0; i < qty; i++) { - Customer customer = new Customer( - UUID.randomUUID().toString(), - faker.name().fullName(), - faker.internet().emailAddress(), - faker.phoneNumber().cellPhone(), - faker.random().nextInt(18, 130), - faker.random().nextBoolean(), - faker.random().nextBoolean() - - ); - customerRepository.save(customer); - } - - System.out.println(qty + " fake customers have been created and saved to the database."); - } - } -} \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java new file mode 100644 index 0000000..567f86b --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java @@ -0,0 +1,142 @@ +package dev.example.restaurantManager.utilities; + +import com.github.javafaker.Faker; +import dev.example.restaurantManager.model.Customer; +import dev.example.restaurantManager.model.MenuRestaurant; +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.repository.CustomerRepository; +import dev.example.restaurantManager.repository.MenuRepository; +import dev.example.restaurantManager.repository.OrderRepository; +import dev.example.restaurantManager.repository.TableRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.*; + +@Component +public class DataLoader { + + + @Autowired + private CustomerRepository customerRepository; + @Autowired + private OrderRepository orderRepository; + @Autowired + private TableRepository tableRepository; + @Autowired + private MenuRepository menuRepository; + + List tables = new ArrayList<>(); + List menus = new ArrayList<>(); + + public void createFakeCustomers() { + // Check if the database is empty + if (customerRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + + int qty = 50; + // Create and save 100 fake customers + for (int i = 0; i < qty; i++) { + Customer customer = new Customer( + UUID.randomUUID().toString(), + faker.name().fullName(), + faker.internet().emailAddress(), + faker.phoneNumber().cellPhone(), + faker.random().nextInt(18, 130), + faker.random().nextBoolean(), + faker.random().nextBoolean() + + ); + customerRepository.save(customer); + } + + System.out.println(qty + " fake customers have been created and saved to the database."); + } + } + public void createFakeTables() { + // Check if the database is empty + if (tableRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + int qty = 100; + for(int i = 0; i < qty; i++) { + TableRestaurant tableRestaurant = new TableRestaurant(); + tableRestaurant.setId(UUID.randomUUID().toString()); + tableRestaurant.setName(faker.name().fullName()); + tableRestaurant.setDescription(faker.lorem().sentence()); + tableRestaurant.setQty(faker.random().nextInt(1, 10)); + tableRestaurant.setBusy(false); + + tableRepository.save(tableRestaurant); + tables.add(tableRestaurant); + } + // Create and save 100 fake tables + System.out.println(" 100 fake tables have been created and saved to the database"); + } + } + public void createFakeMenus(){ + + if(menuRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + int qty = 10; + for(int i = 0; i < qty; i++) { + MenuRestaurant menuRestaurant = new MenuRestaurant(); + menuRestaurant.setId(UUID.randomUUID().toString()); + menuRestaurant.setName(faker.name().fullName()); + menuRestaurant.setPrice(faker.random().nextDouble()); + menuRestaurant.setContent(faker.lorem().sentence()); + menuRestaurant.setActive(faker.random().nextBoolean()); + menuRestaurant.setWater(faker.random().nextBoolean()); + + menuRepository.save(menuRestaurant); + menus.add(menuRestaurant); + } + // Create and save 100 fake menus + System.out.println(" 100 fake menus have been created and saved to the database"); + } + } + public void createFakeOrders() { + if (orderRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + + int qty = 100; + for (int i = 0; i < qty; i++) { + OrderRestaurant orderRestaurant = new OrderRestaurant(); + orderRestaurant.setId(UUID.randomUUID().toString()); + orderRestaurant.setDate(faker.date().between(new Date(0), new Date(System.currentTimeMillis()))); + orderRestaurant.setWaiter(faker.name().fullName()); + orderRestaurant.setPeopleQty(faker.random().nextInt(1, 10)); + orderRestaurant.setTotalPayment(faker.random().nextDouble()); + orderRestaurant.setPaid(faker.random().nextBoolean()); + + List tableIds = new ArrayList<>(); + for (int j = 0; j < faker.random().nextInt(1, 10) && j < tables.size(); j++) { + TableRestaurant tableRestaurant = tables.get(j); + tableIds.add(tableRestaurant.getId()); + } + orderRestaurant.setTableIds(tableIds); + + List menuIds = new ArrayList<>(); + for (int j = 0; j < faker.random().nextInt(1, 10) && j < menus.size(); j++) { + MenuRestaurant menuRestaurant = menus.get(j); + menuIds.add(menuRestaurant.getId()); + } + orderRestaurant.setMenuIds(menuIds); + + orderRepository.save(orderRestaurant); + } + + System.out.println(" 100 fake orders have been created and saved to the database"); + } + } + public void createFakeAllData(){ + createFakeCustomers(); + createFakeTables(); + createFakeMenus(); + createFakeOrders(); + } +} diff --git a/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ new file mode 100644 index 0000000..51d610c --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ @@ -0,0 +1,150 @@ +package dev.example.restaurantManager.utilities; + +import com.github.javafaker.Faker; +import dev.example.restaurantManager.model.Customer; +import dev.example.restaurantManager.model.MenuRestaurant; +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.repository.CustomerRepository; +import dev.example.restaurantManager.repository.MenuRepository; +import dev.example.restaurantManager.repository.OrderRepository; +import dev.example.restaurantManager.repository.TableRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.*; + +@Component +public class DataLoader { + + + @Autowired + private CustomerRepository customerRepository; + @Autowired + private OrderRepository orderRepository; + @Autowired + private TableRepository tableRepository; + @Autowired + private MenuRepository menuRepository; + + List tables = new ArrayList<>(); + List menus = new ArrayList<>(); + + public void createFakeCustomers() { + // Check if the database is empty + if (customerRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + + int qty = 50; + // Create and save 100 fake customers + for (int i = 0; i < qty; i++) { + Customer customer = new Customer( + UUID.randomUUID().toString(), + faker.name().fullName(), + faker.internet().emailAddress(), + faker.phoneNumber().cellPhone(), + faker.random().nextInt(18, 130), + faker.random().nextBoolean(), + faker.random().nextBoolean() + + ); + customerRepository.save(customer); + } + + System.out.println(qty + " fake customers have been created and saved to the database."); + } + } + public void createFakeTables() { + // Check if the database is empty + if (tableRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + int qty = 100; + for(int i = 0; i < qty; i++) { + TableRestaurant tableRestaurant = new TableRestaurant(); + tableRestaurant.setId(UUID.randomUUID().toString()); + tableRestaurant.setName(faker.name().fullName()); + tableRestaurant.setDescription(faker.lorem().sentence()); + tableRestaurant.setQty(faker.random().nextInt(1, 10)); + tableRestaurant.setBusy(false); + + tableRepository.save(tableRestaurant); + tables.add(tableRestaurant); + } + // Create and save 100 fake tables + System.out.println(" 100 fake tables have been created and saved to the database"); + } + } + public void createFakeMenus(){ + + if(menuRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + int qty = 10; + for(int i = 0; i < qty; i++) { + MenuRestaurant menuRestaurant = new MenuRestaurant(); + menuRestaurant.setId(UUID.randomUUID().toString()); + menuRestaurant.setName(faker.name().fullName()); + menuRestaurant.setPrice(faker.random().nextDouble()); + menuRestaurant.setContent(faker.lorem().sentence()); + menuRestaurant.setActive(faker.random().nextBoolean()); + menuRestaurant.setWater(faker.random().nextBoolean()); + + menuRepository.save(menuRestaurant); + menus.add(menuRestaurant); + } + // Create and save 100 fake menus + System.out.println(" 100 fake menus have been created and saved to the database"); + } + } + public void createFakeOrders() { + + // Check if the database is empty + if (orderRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + MenuRestaurant menuRestaurant = new MenuRestaurant(); + TableRestaurant tableRestaurant = new TableRestaurant(); + + int qty = 100; + for (int i = 0; i < qty; i++) { + OrderRestaurant orderRestaurant = new OrderRestaurant(); + orderRestaurant.setId(UUID.randomUUID().toString()); + orderRestaurant.setDate(faker.date().between(new Date(0), new Date(System.currentTimeMillis()))); + orderRestaurant.setWaiter(faker.name().fullName()); + orderRestaurant.setPeopleQty(faker.random().nextInt(1, 10)); + orderRestaurant.setTotalPayment(faker.random().nextDouble()); + orderRestaurant.setTables(new ArrayList<>()); + orderRestaurant.setPaid(faker.random().nextBoolean()); + + if (orderRestaurant.getMenuRestaurants() == null) { + orderRestaurant.setMenuRestaurants(new ArrayList<>()); + } + if (orderRestaurant.getTables() == null) { + orderRestaurant.setTables(new ArrayList<>()); + } + + for(int j = faker.random().nextInt(1, 10); j < menus.size(); j++) { + menuRestaurant = menus.get(j); + orderRestaurant.getMenuRestaurants().add(menuRestaurant); + } + + for(int j = faker.random().nextInt(1, 10); j < tables.size(); j++) { + tableRestaurant = tables.get(j); + orderRestaurant.getTables().add(tableRestaurant); + } + + orderRepository.save(orderRestaurant); + } + + System.out.println(" 100 fake orders have been created and saved to the database"); + } + } + public void createFakeAllData(){ + createFakeCustomers(); + createFakeTables(); + createFakeMenus(); + createFakeOrders(); + } +} diff --git a/src/main/java/dev/example/restaurantManager/utilities/OrderDataLoader.java~ b/src/main/java/dev/example/restaurantManager/utilities/OrderDataLoader.java~ new file mode 100644 index 0000000..96c9dca --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/utilities/OrderDataLoader.java~ @@ -0,0 +1,42 @@ +package dev.example.restaurantManager.utilities; + +import com.github.javafaker.Faker; +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.repository.OrderRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.Locale; +import java.util.UUID; + +@Component +public class OrderDataLoader { + + @Autowired + private OrderRepository orderRepository; + + public void createFakeOrders() { + + // Check if the database is empty + if (orderRepository.count() == 0) { + System.out.println(" 0 records at the database found"); + Faker faker = new Faker(new Locale("en-US")); + + int qty = 100; + for(int i = 0; i < qty; i++) { + OrderRestaurant orderRestaurant = new OrderRestaurant(); + orderRestaurant.setId(UUID.randomUUID().toString()); + orderRestaurant.setDate(faker.date().between(new Date(0), new Date(System.currentTimeMillis()))); + orderRestaurant.setWaiter(faker.name().fullName()); + orderRestaurant.setPeopleQty(faker.random().nextInt(1, 10)); + orderRestaurant.setTotalPayment(faker.random().nextDouble()); + orderRestaurant.setPaid(faker.random().nextBoolean()); + + orderRepository.save(orderRestaurant); + } + + System.out.println(" 100 fake orders have been created and saved to the database"); + } + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e588a08..e1623df 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,12 +3,14 @@ spring.application.name=restaurantManager spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.driverClassName=org.h2.Driver -spring.datasource.username=albert -spring.datasource.password=1234 +spring.datasource.username=sa +spring.datasource.password= spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.h2.console.enabled=true -spring.jpa.hibernate.ddl-auto=none +spring.jpa.hibernate.ddl-auto=create-drop springdoc.api-docs.path=/api-docs -springdoc.swagger-ui.path=/swagger-ui.html \ No newline at end of file +springdoc.swagger-ui.path=/swagger-ui.html + +server.port=9000 \ No newline at end of file diff --git a/src/main/resources/application.properties~ b/src/main/resources/application.properties~ index bb3e760..ce921f3 100644 --- a/src/main/resources/application.properties~ +++ b/src/main/resources/application.properties~ @@ -1,15 +1,14 @@ spring.application.name=restaurantManager -#spring.datasource.url=jdbc:h2:mem:testdb -spring.datasource.url=jdbc:h2:/home/albert/MyProjects/DataBase/customerdb +spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=albert spring.datasource.password=1234 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.h2.console.enabled=true -spring.jpa.hibernate.ddl-auto=create +spring.jpa.hibernate.ddl-auto=create-drop springdoc.api-docs.path=/api-docs springdoc.swagger-ui.path=/swagger-ui.html \ No newline at end of file diff --git a/src/main/resources/static/css/stylesMenu.css b/src/main/resources/static/css/stylesMenu.css new file mode 100644 index 0000000..3b3d39f --- /dev/null +++ b/src/main/resources/static/css/stylesMenu.css @@ -0,0 +1,75 @@ +/* Reset some default styles */ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: 'Arial', sans-serif; + background-color: #f8f9fa; + color: #333; +} + +.container { + max-width: 1200px; + margin: 0 auto; + padding: 20px; +} + +header { + background-color: #007bff; + color: white; + padding: 15px 0; + text-align: center; +} + +nav ul { + list-style-type: none; +} + +nav ul li { + display: inline; + margin: 0 15px; +} + +nav ul li a { + color: white; + text-decoration: none; +} + +nav ul li a:hover { + text-decoration: underline; +} + +h1, h2 { + margin-bottom: 20px; +} + +.menu-list { + display: flex; + flex-wrap: wrap; + gap: 20px; +} + +.menu-item { + background-color: white; + border: 1px solid #ccc; + border-radius: 5px; + padding: 15px; + width: calc(33.333% - 20px); /* Three items per row */ + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + transition: transform 0.2s; +} + +.menu-item:hover { + transform: scale(1.05); +} + +footer { + text-align: center; + margin-top: 20px; + padding: 10px 0; + background-color: #007bff; + color: white; +} \ No newline at end of file diff --git a/src/main/resources/static/css/stylesOrders.css b/src/main/resources/static/css/stylesOrders.css new file mode 100644 index 0000000..896b68e --- /dev/null +++ b/src/main/resources/static/css/stylesOrders.css @@ -0,0 +1,74 @@ +/* Reset some default styles */ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: 'Arial', sans-serif; + background-color: #f8f9fa; + color: #333; +} + +.container { + max-width: 1200px; + margin: 0 auto; + padding: 20px; +} + +header { + background-color: #007bff; + color: white; + padding: 15px 0; + text-align: center; +} + +nav ul { + list-style-type: none; +} + +nav ul li { + display: inline; + margin: 0 15px; +} + +nav ul li a { + color: white; + text-decoration: none; +} + +nav ul li a:hover { + text-decoration: underline; +} + +h1, h2 { + margin-bottom: 20px; +} + +.order-list { + display: flex; + flex-direction: column; + gap: 20px; +} + +.order-item { + background-color: white; + border: 1px solid #ccc; + border-radius: 5px; + padding: 15px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + transition: transform 0.2s; +} + +.order-item:hover { + transform: scale(1.02); +} + +footer { + text-align: center; + margin-top: 20px; + padding: 10px 0; + background-color: #007bff; + color: white; +} \ No newline at end of file diff --git a/src/main/resources/static/css/stylesTables.css b/src/main/resources/static/css/stylesTables.css new file mode 100644 index 0000000..6072b33 --- /dev/null +++ b/src/main/resources/static/css/stylesTables.css @@ -0,0 +1,74 @@ +/* Reset some default styles */ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: 'Arial', sans-serif; + background-color: #f8f9fa; + color: #333; +} + +.container { + max-width: 1200px; + margin: 0 auto; + padding: 20px; +} + +header { + background-color: #007bff; + color: white; + padding: 15px 0; + text-align: center; +} + +nav ul { + list-style-type: none; +} + +nav ul li { + display: inline; + margin: 0 15px; +} + +nav ul li a { + color: white; + text-decoration: none; +} + +nav ul li a:hover { + text-decoration: underline; +} + +h1, h2 { + margin-bottom: 20px; +} + +.table-list { + display: flex; + flex-direction: column; + gap: 20px; +} + +.table-item { + background-color: white; + border: 1px solid #ccc; + border-radius: 5px; + padding: 15px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + transition: transform 0.2s; +} + +.table-item:hover { + transform: scale(1.02); +} + +footer { + text-align: center; + margin-top: 20px; + padding: 10px 0; + background-color: #007bff; + color: white; +} diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 258078d..39bc26f 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -16,7 +16,7 @@ h1, h2 { color: #333; } - table { + tableRestaurant { width: 100%; border-collapse: collapse; margin-top: 20px; @@ -35,7 +35,7 @@

Welcome

Customers

-
+ @@ -48,6 +48,6 @@

Customers

-
ID Name
+ \ No newline at end of file diff --git a/src/main/resources/templates/menuHome.html b/src/main/resources/templates/menuHome.html new file mode 100644 index 0000000..2dd6b9f --- /dev/null +++ b/src/main/resources/templates/menuHome.html @@ -0,0 +1,49 @@ + + + + + + + Menu Home + + +
+
+

Welcome to Our Restaurant

+ +
+ +
+

Menu List

+
+ +
+

Menu Name

+

Menu Description

+

Price: 0.00 €

+

Status: Status

+
+ +
+ + +
+ View Orders + View Tables +
+
+ +
+

© 2024 Our Restaurant. All rights reserved.

+
+
+ + diff --git a/src/main/resources/templates/menuOrder.html b/src/main/resources/templates/menuOrder.html new file mode 100644 index 0000000..1f8f9fa --- /dev/null +++ b/src/main/resources/templates/menuOrder.html @@ -0,0 +1,48 @@ + + + + + + + Order Home + + +
+
+

Welcome to Our Restaurant

+ +
+ +
+

Order List

+
+ +
+

Waiter Name

+

Order Date: Date

+

People Quantity: 0

+

Total Payment: 0.00 €

+

Paid: Status

+

Tables: 0

+

Table ID: ID

+

Menus: 0

+

Menu ID: ID

+
+ +
+
+ +
+

© 2024 Our Restaurant. All rights reserved.

+
+
+ + diff --git a/src/main/resources/templates/menuTable.html b/src/main/resources/templates/menuTable.html new file mode 100644 index 0000000..b973254 --- /dev/null +++ b/src/main/resources/templates/menuTable.html @@ -0,0 +1,43 @@ + + + + + + + Table Home + + +
+
+

Welcome to Our Restaurant

+ +
+ +
+

Table List

+
+ +
+

Table Name

+

Description: Description

+

Quantity: 0

+

Busy: Status

+
+ +
+
+ +
+

© 2024 Our Restaurant. All rights reserved.

+
+
+ + From 298ed81df7ccd7a8be130823d085886f72318196 Mon Sep 17 00:00:00 2001 From: Marc Rodriguez Date: Tue, 22 Oct 2024 13:29:09 +0200 Subject: [PATCH 3/3] practica finalizada --- .../RestaurantManagerApplication.java | 17 +- .../RestaurantManagerApplication.java~ | 26 ++ .../controller/CustomerController.java | 14 +- .../controller/EatInOrderController.java | 81 +++++ .../controller/EatInOrderWebController.java | 26 ++ .../restaurantManager/model/Booking.java | 26 +- .../restaurantManager/model/Booking.java~ | 47 +++ .../model/EatInOrderRestaurant.java | 21 +- .../model/MenuRestaurant.java | 17 +- .../model/MenuRestaurant.java~ | 23 -- .../model/OrderRestaurant.java | 59 +--- .../model/TableRestaurant.java | 20 +- .../repository/EatInOrderRepository.java | 8 + .../service/EatInOrderService.java | 19 ++ .../service/EatInOrderServiceImpl.java | 71 +++++ .../service/EatInOrderServiceImpl.java~ | 2 + .../service/OrderService.java | 2 +- .../service/OrderService.java~ | 18 ++ .../service/OrderServiceImpl.java | 2 + .../service/OrderServiceImpl.java~ | 67 ++++ .../service/TableService.java | 2 +- .../service/TableServiceImpl.java | 2 + .../utilities/DataLoader.java | 47 ++- .../utilities/DataLoader.java~ | 28 +- .../resources/static/css/stylesEatInOrder.css | 91 ++++++ .../resources/templates/menuEatInOrder.html | 49 +++ .../restaurantManager/BookingTableTest.java | 91 +++--- .../restaurantManager/BookingTableTest.java~ | 64 ++++ .../restaurantManager/EatInOrderTest.java | 84 +++++ .../RelationshipsOrderRestaurantTest.java | 286 ++++++++++-------- 30 files changed, 963 insertions(+), 347 deletions(-) create mode 100644 src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java~ create mode 100644 src/main/java/dev/example/restaurantManager/controller/EatInOrderController.java create mode 100644 src/main/java/dev/example/restaurantManager/controller/EatInOrderWebController.java create mode 100644 src/main/java/dev/example/restaurantManager/model/Booking.java~ delete mode 100644 src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ create mode 100644 src/main/java/dev/example/restaurantManager/repository/EatInOrderRepository.java create mode 100644 src/main/java/dev/example/restaurantManager/service/EatInOrderService.java create mode 100644 src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java create mode 100644 src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java~ create mode 100644 src/main/java/dev/example/restaurantManager/service/OrderService.java~ create mode 100644 src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java~ create mode 100644 src/main/resources/static/css/stylesEatInOrder.css create mode 100644 src/main/resources/templates/menuEatInOrder.html create mode 100644 src/test/java/dev/example/restaurantManager/BookingTableTest.java~ create mode 100644 src/test/java/dev/example/restaurantManager/EatInOrderTest.java diff --git a/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java b/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java index d300438..d3f153d 100644 --- a/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java +++ b/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java @@ -1,13 +1,12 @@ package dev.example.restaurantManager; -<<<<<<< HEAD + import dev.example.restaurantManager.utilities.DataLoader; import org.springframework.boot.ApplicationRunner; -======= ->>>>>>> master import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; @SpringBootApplication public class RestaurantManagerApplication { @@ -16,14 +15,12 @@ public static void main(String[] args) { SpringApplication.run(RestaurantManagerApplication.class, args); } -<<<<<<< HEAD - @Bean - public ApplicationRunner customerDataLoader(DataLoader DataLoader) { - return args -> DataLoader.createFakeAllData(); - } +// @Bean +// public ApplicationRunner customerDataLoader(DataLoader DataLoader) { +// return args -> DataLoader.createFakeAllData(); +// +// } -======= ->>>>>>> master } \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java~ b/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java~ new file mode 100644 index 0000000..1e0c4b8 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/RestaurantManagerApplication.java~ @@ -0,0 +1,26 @@ +package dev.example.restaurantManager; + + + +import dev.example.restaurantManager.utilities.DataLoader; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class RestaurantManagerApplication { + + public static void main(String[] args) { + SpringApplication.run(RestaurantManagerApplication.class, args); + } + + + + @Bean + public ApplicationRunner customerDataLoader(DataLoader DataLoader) { + return args -> DataLoader.createFakeAllData(); + + } + +} \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/controller/CustomerController.java b/src/main/java/dev/example/restaurantManager/controller/CustomerController.java index b42a5dc..a840f62 100644 --- a/src/main/java/dev/example/restaurantManager/controller/CustomerController.java +++ b/src/main/java/dev/example/restaurantManager/controller/CustomerController.java @@ -16,17 +16,17 @@ public class CustomerController { // inject from application.properties endpoint.url.customers - @Value("${endpoint.url.customers}") - private String endpointUrlCustomers; +// @Value("${endpoint.url.customers}") +// private String endpointUrlCustomers; @Autowired private CustomerService customerService; - @GetMapping("/show-endpoint") - public String showEndpointCustomers() { - - return "The customers endpoint URL is: " + endpointUrlCustomers; - } +// @GetMapping("/show-endpoint") +// public String showEndpointCustomers() { +// +// return "The customers endpoint URL is: " + endpointUrlCustomers; +// } // manage request by ResponseEntity with all customers @GetMapping("/allCustomers") diff --git a/src/main/java/dev/example/restaurantManager/controller/EatInOrderController.java b/src/main/java/dev/example/restaurantManager/controller/EatInOrderController.java new file mode 100644 index 0000000..2235e06 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/EatInOrderController.java @@ -0,0 +1,81 @@ +package dev.example.restaurantManager.controller; + + +import dev.example.restaurantManager.model.EatInOrderRestaurant; +import dev.example.restaurantManager.service.EatInOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import java.util.Date; +import java.util.List; + + +@RequestMapping("/api/v1/eatInOrder") +@Controller +public class EatInOrderController { + + @Autowired + private EatInOrderService eatInOrderService; + + @GetMapping("/allCustomers") + public ResponseEntity> getAllCustomers( ) { + List eatInOrders = eatInOrderService.getAllEatInOrders(); + HttpHeaders headers = getCommonHeaders("Get all eat in orders"); + return eatInOrders != null && !eatInOrders.isEmpty() + ? new ResponseEntity<>(eatInOrders, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @PostMapping("/add") + public ResponseEntity createEatInOrder(@RequestBody EatInOrderRestaurant eatInOrderDetails) { + EatInOrderRestaurant createdEatInOrder = eatInOrderService.createEatInOrder(eatInOrderDetails); + HttpHeaders headers = getCommonHeaders("Create a new eat in order"); + return createdEatInOrder != null + ? new ResponseEntity<>(createdEatInOrder, headers, HttpStatus.CREATED) + : new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST); + } + + @PutMapping("/update/{id}") + public ResponseEntity updateEatInOrder(@PathVariable String id, @RequestBody EatInOrderRestaurant eatInOrderDetails) { + EatInOrderRestaurant updatedEatInOrder = eatInOrderService.updateEatInOrder(id, eatInOrderDetails); + HttpHeaders headers = getCommonHeaders("Update a eat in order"); + return updatedEatInOrder != null + ? new ResponseEntity<>(updatedEatInOrder, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @GetMapping("/get/{id}") + public ResponseEntity getEatInOrderById(@PathVariable String id) { + EatInOrderRestaurant eatInOrder = eatInOrderService.getEatInOrderById(id); + HttpHeaders headers = getCommonHeaders("Get an eat in order"); + return eatInOrder != null + ? new ResponseEntity<>(eatInOrder, headers, HttpStatus.OK) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteEatInOrder(@PathVariable String id) { + boolean deleted = eatInOrderService.deleteEatInOrder(id); + HttpHeaders headers = getCommonHeaders("Delete a eat in order"); + headers.add("deleted", String.valueOf(deleted)); + return deleted + ? new ResponseEntity<>(headers, HttpStatus.NO_CONTENT) + : new ResponseEntity<>(headers, HttpStatus.NOT_FOUND); + } + + private HttpHeaders getCommonHeaders(String description) { + HttpHeaders headers = new HttpHeaders(); + headers.add("desc", description); + headers.add("content-type", "application/json"); + headers.add("date", new Date().toString()); + headers.add("server", "H2 Database"); + headers.add("version", "1.0.0"); + headers.add("customer-count", String.valueOf(eatInOrderService.countEatInOrders())); + headers.add("object", "customers"); + return headers; + } + +} diff --git a/src/main/java/dev/example/restaurantManager/controller/EatInOrderWebController.java b/src/main/java/dev/example/restaurantManager/controller/EatInOrderWebController.java new file mode 100644 index 0000000..2cef5cf --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/controller/EatInOrderWebController.java @@ -0,0 +1,26 @@ +package dev.example.restaurantManager.controller; + +import dev.example.restaurantManager.model.EatInOrderRestaurant; +import dev.example.restaurantManager.repository.EatInOrderRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +@RequestMapping("/eatInOrder") +@Controller +public class EatInOrderWebController { + + @Autowired + EatInOrderRepository eatInOrderRepository; + + @GetMapping("home") + public String home(Model model) { + List eatInOrders = eatInOrderRepository.findAll(); + model.addAttribute("eatInOrders", eatInOrders); + return "menuEatInOrder"; + } +} diff --git a/src/main/java/dev/example/restaurantManager/model/Booking.java b/src/main/java/dev/example/restaurantManager/model/Booking.java index 1d7b592..38b4ff4 100644 --- a/src/main/java/dev/example/restaurantManager/model/Booking.java +++ b/src/main/java/dev/example/restaurantManager/model/Booking.java @@ -1,11 +1,13 @@ package dev.example.restaurantManager.model; import com.fasterxml.jackson.annotation.JsonIgnore; +import dev.example.restaurantManager.model.TableRestaurant; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; + +import java.time.LocalDateTime; @Data @NoArgsConstructor @@ -18,12 +20,7 @@ public class Booking { private String name; private String phoneNumber; private int peopleQty; -<<<<<<< HEAD private LocalDateTime date; - private List tableRestaurants; -======= - private Date date; ->>>>>>> master private boolean confirmed; @JsonIgnore @@ -31,19 +28,12 @@ public class Booking { @JoinColumn(name = "TABLE_RESTAURANT_FK_ID") private TableRestaurant tableRestaurantMapped; - // Custom toString method (optional, as @Data provides a default toString) @Override public String toString() { - return - "name: " + name + "\n" + + return "name: " + name + "\n" + "phoneNumber: " + phoneNumber + "\n" + - "peopleQty: " + peopleQty +"\n" + - "date: " + date +"\n" + -<<<<<<< HEAD - "tables: " + tableRestaurants -======= - "table: " + tableRestaurantMapped ->>>>>>> master - ; + "peopleQty: " + peopleQty + "\n" + + "date: " + date + "\n" + + "table: " + tableRestaurantMapped; } -} \ No newline at end of file +} diff --git a/src/main/java/dev/example/restaurantManager/model/Booking.java~ b/src/main/java/dev/example/restaurantManager/model/Booking.java~ new file mode 100644 index 0000000..2162348 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/model/Booking.java~ @@ -0,0 +1,47 @@ +package dev.example.restaurantManager.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +public class Booking { + + @Id + private String id; + private String name; + private String phoneNumber; + private int peopleQty; + + private LocalDateTime date; + private List tableRestaurants; + + private boolean confirmed; + + @JsonIgnore + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TABLE_RESTAURANT_FK_ID") + private TableRestaurant tableRestaurantMapped; + + // Custom toString method (optional, as @Data provides a default toString) + @Override + public String toString() { + return + "name: " + name + "\n" + + "phoneNumber: " + phoneNumber + "\n" + + "peopleQty: " + peopleQty +"\n" + + "date: " + date +"\n" + + "tables: " + tableRestaurants +"\n" + + "table: " + tableRestaurantMapped + ; + } +} \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/model/EatInOrderRestaurant.java b/src/main/java/dev/example/restaurantManager/model/EatInOrderRestaurant.java index 2461711..81a3414 100644 --- a/src/main/java/dev/example/restaurantManager/model/EatInOrderRestaurant.java +++ b/src/main/java/dev/example/restaurantManager/model/EatInOrderRestaurant.java @@ -1,32 +1,35 @@ package dev.example.restaurantManager.model; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import java.util.ArrayList; import java.util.Date; -import java.util.stream.Collectors; @Data @AllArgsConstructor @NoArgsConstructor +@Entity public class EatInOrderRestaurant extends OrderRestaurant { - private ArrayList tableRestaurants = new ArrayList<>(); - //private TableRestaurant orderedTableRestaurant; - + // Relación ManyToOne con TableRestaurant: muchas órdenes pueden pertenecer a una mesa + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "table_restaurant_id", nullable = false) + @JsonIgnore + private TableRestaurant tableRestaurant; - public EatInOrderRestaurant(String id, Date date, String waiter, int peopleQty, - double totalPayment, boolean paid, ArrayList menus, - ArrayList tableRestaurants) { + public EatInOrderRestaurant(String id, Date date, String waiter, int peopleQty, double totalPayment, boolean paid, TableRestaurant tableRestaurant, ArrayList menus) { super(id, date, waiter, peopleQty, totalPayment, paid, menus); - this.tableRestaurants = tableRestaurants; + this.tableRestaurant = tableRestaurant; } @Override public String toString() { return super.toString() + "\n" + "Type: Eat In\n" + - "Tables: " + tableRestaurants.stream().map(TableRestaurant::getName).collect(Collectors.joining(", ")); + "Table: " + (tableRestaurant != null ? tableRestaurant.getName() : "None"); } } diff --git a/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java index 5665218..ee8b276 100644 --- a/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java +++ b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java @@ -1,13 +1,13 @@ package dev.example.restaurantManager.model; import jakarta.persistence.Entity; -<<<<<<< HEAD + import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import jakarta.persistence.Table; -======= + import jakarta.persistence.FetchType; import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; @@ -16,20 +16,16 @@ import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.List; ->>>>>>> master + @Data @AllArgsConstructor @NoArgsConstructor @Entity -<<<<<<< HEAD + @Table(name = "menus") public class MenuRestaurant { -======= -public class MenuRestaurant { ->>>>>>> master - @Id private String id; private String name; @@ -38,8 +34,7 @@ public class MenuRestaurant { private boolean active; private boolean water; -<<<<<<< HEAD -======= + @ManyToMany(mappedBy = "menus", fetch = FetchType.LAZY) private List orders = new ArrayList<>(); @@ -64,7 +59,5 @@ public String toString() { ", water=" + water + '}'; } - ->>>>>>> master } diff --git a/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ b/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ deleted file mode 100644 index 8958f4c..0000000 --- a/src/main/java/dev/example/restaurantManager/model/MenuRestaurant.java~ +++ /dev/null @@ -1,23 +0,0 @@ -package dev.example.restaurantManager.model; - -import jakarta.persistence.Entity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import jakarta.persistence.Table; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Entity -@Table(name = "menus") -public class MenuRestaurant { - - private String name; - private Double price; - private String content; - private boolean active; - private boolean water; - -} - diff --git a/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java b/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java index 68ed799..57d8d2c 100644 --- a/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java +++ b/src/main/java/dev/example/restaurantManager/model/OrderRestaurant.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -<<<<<<< HEAD - import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; @@ -12,52 +10,24 @@ import lombok.Data; import lombok.NoArgsConstructor; import jakarta.persistence.Table; -======= import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; ->>>>>>> master + @Data -@AllArgsConstructor @NoArgsConstructor @Entity -<<<<<<< HEAD -@Table(name = "orders") -public class OrderRestaurant { -======= @Table(name = "ORDER_RESTAURANT") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) public class OrderRestaurant { ->>>>>>> master @Id - private String id; + private String id; // Considera usar Long con @GeneratedValue si quieres generarlo automáticamente private Date date; private String waiter; private int peopleQty; private double totalPayment; private boolean paid; -<<<<<<< HEAD - private List tableIds; - private List menuIds; - - @Override - public String toString() { - return - "date: " + date + "\n" + - "waiter: " + waiter + "\n" + - "peopleQty: " + peopleQty + "\n" + - "totalPayment: " + totalPayment + " euros\n" + - "paid: " + paid + "\n" + - "Tables quantity: " + tableIds.size() + "\n" + - "table IDs: " + tableIds + "\n" + - "Menus quantity: " + menuIds.size() + "\n" + - "menu IDs: " + menuIds; - } -======= @ManyToMany(fetch = FetchType.LAZY) @JoinTable( name = "order_menu", @@ -66,6 +36,17 @@ public String toString() { ) private List menus = new ArrayList<>(); + // Constructor actualizado + public OrderRestaurant(String id, Date date, String waiter, int peopleQty, double totalPayment, boolean paid, List menus) { + this.id = id; // Asigna el id + this.date = date; + this.waiter = waiter; + this.peopleQty = peopleQty; + this.totalPayment = totalPayment; + this.paid = paid; + this.menus = menus != null ? menus : new ArrayList<>(); // Asegúrate de inicializar menus + } + public void addMenu(MenuRestaurant menu) { this.menus.add(menu); menu.getOrders().add(this); @@ -76,14 +57,6 @@ public void removeMenu(MenuRestaurant menu) { menu.getOrders().remove(this); } - public List getMenus() { - return menus; - } - - public void setMenus(List menus) { - this.menus = menus; - } - @Override public String toString() { return "OrderRestaurant{" + @@ -93,10 +66,8 @@ public String toString() { ", peopleQty=" + peopleQty + ", totalPayment=" + totalPayment + ", paid=" + paid + - ", menusCount=" + (menus != null ? menus.size() : 0) + + ", menusCount=" + menus.size() + ", menus=" + menus + '}'; } - ->>>>>>> master -} \ No newline at end of file +} diff --git a/src/main/java/dev/example/restaurantManager/model/TableRestaurant.java b/src/main/java/dev/example/restaurantManager/model/TableRestaurant.java index 7776010..0d4d685 100644 --- a/src/main/java/dev/example/restaurantManager/model/TableRestaurant.java +++ b/src/main/java/dev/example/restaurantManager/model/TableRestaurant.java @@ -1,13 +1,12 @@ package dev.example.restaurantManager.model; -<<<<<<< HEAD import jakarta.persistence.Entity; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import jakarta.persistence.Table; -======= + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -16,16 +15,14 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.ArrayList; ->>>>>>> master +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor @Entity -<<<<<<< HEAD @Table (name = "table_restaurant") -======= ->>>>>>> master public class TableRestaurant { @Id @@ -35,14 +32,16 @@ public class TableRestaurant { private int qty; private boolean busy; -<<<<<<< HEAD -======= + @OneToMany(mappedBy = "tableRestaurantMapped", cascade = CascadeType.ALL) - private ArrayList bookings ; + private List bookings ; + @OneToMany(mappedBy = "tableRestaurant", cascade = CascadeType.ALL) + private List eatInOrderRestaurants = new ArrayList<>(); + // we must create a VERY CONCRETE constructor to RUN the OLD tests - public TableRestaurant(String name, String description , int qty, boolean busy) { + public TableRestaurant(String id,String name, String description , int qty, boolean busy) { } @@ -64,6 +63,5 @@ public String toString() { '}'; } ->>>>>>> master } \ No newline at end of file diff --git a/src/main/java/dev/example/restaurantManager/repository/EatInOrderRepository.java b/src/main/java/dev/example/restaurantManager/repository/EatInOrderRepository.java new file mode 100644 index 0000000..09681bd --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/repository/EatInOrderRepository.java @@ -0,0 +1,8 @@ +package dev.example.restaurantManager.repository; + +import dev.example.restaurantManager.model.EatInOrderRestaurant; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface EatInOrderRepository extends JpaRepository { +} diff --git a/src/main/java/dev/example/restaurantManager/service/EatInOrderService.java b/src/main/java/dev/example/restaurantManager/service/EatInOrderService.java new file mode 100644 index 0000000..fd0d78a --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/EatInOrderService.java @@ -0,0 +1,19 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.EatInOrderRestaurant; + +import java.util.List; + +public interface EatInOrderService { + List getAllEatInOrders(); + + EatInOrderRestaurant getEatInOrderById(String id); + + EatInOrderRestaurant createEatInOrder(EatInOrderRestaurant eatInOrder); + + EatInOrderRestaurant updateEatInOrder(String id, EatInOrderRestaurant eatInOrder); + + boolean deleteEatInOrder(String id); + + long countEatInOrders(); +} diff --git a/src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java b/src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java new file mode 100644 index 0000000..b762c63 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java @@ -0,0 +1,71 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.EatInOrderRestaurant; +import dev.example.restaurantManager.repository.EatInOrderRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class EatInOrderServiceImpl implements EatInOrderService { + + @Autowired + EatInOrderRepository eatInOrderRepository; + @Override + public List getAllEatInOrders() { + return eatInOrderRepository.findAll(); + } + + @Override + public EatInOrderRestaurant getEatInOrderById(String id) { + return eatInOrderRepository.findById(id).orElse(null); + } + + + @Override + public EatInOrderRestaurant createEatInOrder(EatInOrderRestaurant eatInOrder) { + Optional eatInOrderOptional = eatInOrderRepository.findById(eatInOrder.getId()); + if (eatInOrderOptional.isPresent()) { + return null; + } else { + return eatInOrderRepository.save(eatInOrder); + } + } + + + @Override + public EatInOrderRestaurant updateEatInOrder(String id, EatInOrderRestaurant eatInOrderDetails) { + EatInOrderRestaurant eatInOrder = eatInOrderRepository.findById(id).orElse(null); + if (eatInOrder != null) { + eatInOrder.setId(eatInOrderDetails.getId()); + eatInOrder.setDate(eatInOrderDetails.getDate()); + eatInOrder.setWaiter(eatInOrderDetails.getWaiter()); + eatInOrder.setPeopleQty(eatInOrderDetails.getPeopleQty()); + eatInOrder.setTotalPayment(eatInOrderDetails.getTotalPayment()); + eatInOrder.setPaid(eatInOrderDetails.isPaid()); + return eatInOrderRepository.save(eatInOrder); + } else { + return null; + } + } + + @Override + public boolean deleteEatInOrder(String id) { + Optional eatInOrder = eatInOrderRepository.findById(id); + if (eatInOrder.isEmpty()) { + return false; + } else { + eatInOrderRepository.deleteById(id); + return true; + } + } + + @Override + public long countEatInOrders() { + return eatInOrderRepository.count(); + } + + +} diff --git a/src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java~ b/src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java~ new file mode 100644 index 0000000..6cc11ad --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/EatInOrderServiceImpl.java~ @@ -0,0 +1,2 @@ +package dev.example.restaurantManager.service;public class EatInOrderServiceImpl { +} diff --git a/src/main/java/dev/example/restaurantManager/service/OrderService.java b/src/main/java/dev/example/restaurantManager/service/OrderService.java index cf585cc..0987431 100644 --- a/src/main/java/dev/example/restaurantManager/service/OrderService.java +++ b/src/main/java/dev/example/restaurantManager/service/OrderService.java @@ -5,7 +5,7 @@ import java.util.List; -@Service + public interface OrderService { long countOrders(); diff --git a/src/main/java/dev/example/restaurantManager/service/OrderService.java~ b/src/main/java/dev/example/restaurantManager/service/OrderService.java~ new file mode 100644 index 0000000..cf585cc --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/OrderService.java~ @@ -0,0 +1,18 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.OrderRestaurant; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public interface OrderService { + + long countOrders(); + + List getAllOrders(); + OrderRestaurant getOrderById(String id); + OrderRestaurant createOrder(OrderRestaurant order); + OrderRestaurant updateOrder(String id, OrderRestaurant orderDetails); + boolean deleteOrder(String id); +} diff --git a/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java b/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java index 1ee0e20..86f7de3 100644 --- a/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java +++ b/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java @@ -3,10 +3,12 @@ import dev.example.restaurantManager.model.OrderRestaurant; import dev.example.restaurantManager.repository.OrderRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; import java.util.Optional; +@Service public class OrderServiceImpl implements OrderService { @Autowired diff --git a/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java~ b/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java~ new file mode 100644 index 0000000..1ee0e20 --- /dev/null +++ b/src/main/java/dev/example/restaurantManager/service/OrderServiceImpl.java~ @@ -0,0 +1,67 @@ +package dev.example.restaurantManager.service; + +import dev.example.restaurantManager.model.OrderRestaurant; +import dev.example.restaurantManager.repository.OrderRepository; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Optional; + +public class OrderServiceImpl implements OrderService { + + @Autowired + private OrderRepository orderRepository; + + @Override + public List getAllOrders(){ + List orders = orderRepository.findAll(); + return orders; + } + + @Override + public OrderRestaurant getOrderById(String id){ + Optional order = orderRepository.findById(id); + return order.orElse(null); + } + + @Override + public OrderRestaurant createOrder(OrderRestaurant order){ + Optional orderRestaurant = orderRepository.findById(order.getId()); + if(orderRestaurant.isEmpty()){ + return orderRepository.save(order); + }else{ + return null; + } + } + + @Override + public OrderRestaurant updateOrder(String id, OrderRestaurant orderDetails){ + OrderRestaurant order = orderRepository.findById(id).orElse(null); + if(order != null){ + order.setId(orderDetails.getId()); + order.setDate(orderDetails.getDate()); + order.setWaiter(orderDetails.getWaiter()); + order.setPeopleQty(orderDetails.getPeopleQty()); + order.setTotalPayment(orderDetails.getTotalPayment()); + order.setPaid(orderDetails.isPaid()); + return orderRepository.save(order); + }else{ + return null; + } + } + + @Override + public boolean deleteOrder(String id){ + Optional order = orderRepository.findById(id); + if(order.isEmpty()){ + return false; + }else{ + orderRepository.deleteById(id); + return true; + } + } + @Override + public long countOrders(){ + return orderRepository.count(); + } +} diff --git a/src/main/java/dev/example/restaurantManager/service/TableService.java b/src/main/java/dev/example/restaurantManager/service/TableService.java index 3091730..96f464a 100644 --- a/src/main/java/dev/example/restaurantManager/service/TableService.java +++ b/src/main/java/dev/example/restaurantManager/service/TableService.java @@ -4,7 +4,7 @@ import java.util.List; import org.springframework.stereotype.Service; -@Service + public interface TableService { List getAllTables(); diff --git a/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java b/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java index d98950e..f9a615b 100644 --- a/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java +++ b/src/main/java/dev/example/restaurantManager/service/TableServiceImpl.java @@ -3,10 +3,12 @@ import dev.example.restaurantManager.model.TableRestaurant; import dev.example.restaurantManager.repository.TableRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; import java.util.Optional; +@Service public class TableServiceImpl implements TableService { @Autowired diff --git a/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java index 567f86b..a4d1561 100644 --- a/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java +++ b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java @@ -1,10 +1,7 @@ package dev.example.restaurantManager.utilities; import com.github.javafaker.Faker; -import dev.example.restaurantManager.model.Customer; -import dev.example.restaurantManager.model.MenuRestaurant; -import dev.example.restaurantManager.model.OrderRestaurant; -import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.model.*; import dev.example.restaurantManager.repository.CustomerRepository; import dev.example.restaurantManager.repository.MenuRepository; import dev.example.restaurantManager.repository.OrderRepository; @@ -105,34 +102,34 @@ public void createFakeOrders() { int qty = 100; for (int i = 0; i < qty; i++) { - OrderRestaurant orderRestaurant = new OrderRestaurant(); - orderRestaurant.setId(UUID.randomUUID().toString()); - orderRestaurant.setDate(faker.date().between(new Date(0), new Date(System.currentTimeMillis()))); - orderRestaurant.setWaiter(faker.name().fullName()); - orderRestaurant.setPeopleQty(faker.random().nextInt(1, 10)); - orderRestaurant.setTotalPayment(faker.random().nextDouble()); - orderRestaurant.setPaid(faker.random().nextBoolean()); - - List tableIds = new ArrayList<>(); - for (int j = 0; j < faker.random().nextInt(1, 10) && j < tables.size(); j++) { - TableRestaurant tableRestaurant = tables.get(j); - tableIds.add(tableRestaurant.getId()); - } - orderRestaurant.setTableIds(tableIds); - - List menuIds = new ArrayList<>(); + // Crear una instancia de EatInOrderRestaurant + EatInOrderRestaurant eatInOrderRestaurant = new EatInOrderRestaurant(); + eatInOrderRestaurant.setId(UUID.randomUUID().toString()); + eatInOrderRestaurant.setDate(faker.date().between(new Date(0), new Date(System.currentTimeMillis()))); + eatInOrderRestaurant.setWaiter(faker.name().fullName()); + eatInOrderRestaurant.setPeopleQty(faker.random().nextInt(1, 10)); + eatInOrderRestaurant.setTotalPayment(faker.random().nextDouble()); + eatInOrderRestaurant.setPaid(faker.random().nextBoolean()); + + // Asignar una mesa aleatoria + TableRestaurant tableRestaurant = tables.get(faker.random().nextInt(tables.size())); + eatInOrderRestaurant.setTableRestaurant(tableRestaurant); // Aquí se asigna la mesa + + // Añadir menús a la orden + List menuList = new ArrayList<>(); for (int j = 0; j < faker.random().nextInt(1, 10) && j < menus.size(); j++) { - MenuRestaurant menuRestaurant = menus.get(j); - menuIds.add(menuRestaurant.getId()); + menuList.add(menus.get(j)); } - orderRestaurant.setMenuIds(menuIds); + eatInOrderRestaurant.setMenus(menuList); - orderRepository.save(orderRestaurant); + // Guardar la orden + orderRepository.save(eatInOrderRestaurant); } - System.out.println(" 100 fake orders have been created and saved to the database"); + System.out.println(" 100 fake eat-in orders have been created and saved to the database"); } } + public void createFakeAllData(){ createFakeCustomers(); createFakeTables(); diff --git a/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ index 51d610c..567f86b 100644 --- a/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ +++ b/src/main/java/dev/example/restaurantManager/utilities/DataLoader.java~ @@ -99,13 +99,9 @@ public class DataLoader { } } public void createFakeOrders() { - - // Check if the database is empty if (orderRepository.count() == 0) { System.out.println(" 0 records at the database found"); Faker faker = new Faker(new Locale("en-US")); - MenuRestaurant menuRestaurant = new MenuRestaurant(); - TableRestaurant tableRestaurant = new TableRestaurant(); int qty = 100; for (int i = 0; i < qty; i++) { @@ -115,25 +111,21 @@ public class DataLoader { orderRestaurant.setWaiter(faker.name().fullName()); orderRestaurant.setPeopleQty(faker.random().nextInt(1, 10)); orderRestaurant.setTotalPayment(faker.random().nextDouble()); - orderRestaurant.setTables(new ArrayList<>()); orderRestaurant.setPaid(faker.random().nextBoolean()); - if (orderRestaurant.getMenuRestaurants() == null) { - orderRestaurant.setMenuRestaurants(new ArrayList<>()); - } - if (orderRestaurant.getTables() == null) { - orderRestaurant.setTables(new ArrayList<>()); - } - - for(int j = faker.random().nextInt(1, 10); j < menus.size(); j++) { - menuRestaurant = menus.get(j); - orderRestaurant.getMenuRestaurants().add(menuRestaurant); + List tableIds = new ArrayList<>(); + for (int j = 0; j < faker.random().nextInt(1, 10) && j < tables.size(); j++) { + TableRestaurant tableRestaurant = tables.get(j); + tableIds.add(tableRestaurant.getId()); } + orderRestaurant.setTableIds(tableIds); - for(int j = faker.random().nextInt(1, 10); j < tables.size(); j++) { - tableRestaurant = tables.get(j); - orderRestaurant.getTables().add(tableRestaurant); + List menuIds = new ArrayList<>(); + for (int j = 0; j < faker.random().nextInt(1, 10) && j < menus.size(); j++) { + MenuRestaurant menuRestaurant = menus.get(j); + menuIds.add(menuRestaurant.getId()); } + orderRestaurant.setMenuIds(menuIds); orderRepository.save(orderRestaurant); } diff --git a/src/main/resources/static/css/stylesEatInOrder.css b/src/main/resources/static/css/stylesEatInOrder.css new file mode 100644 index 0000000..8c75e25 --- /dev/null +++ b/src/main/resources/static/css/stylesEatInOrder.css @@ -0,0 +1,91 @@ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: Arial, sans-serif; + background-color: #f4f4f4; +} + +.container { + width: 80%; + margin: 0 auto; + padding: 20px; +} + +header { + text-align: center; + margin-bottom: 20px; +} + +header h1 { + font-size: 2.5rem; + color: #333; +} + +nav ul { + list-style: none; + padding: 0; + display: flex; + justify-content: center; + margin-top: 10px; +} + +nav ul li { + margin: 0 15px; +} + +nav ul li a { + text-decoration: none; + color: #007BFF; + font-size: 1.1rem; +} + +nav ul li a:hover { + text-decoration: underline; +} + +main { + background-color: white; + padding: 20px; + border-radius: 8px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); +} + +h2 { + margin-bottom: 20px; + color: #333; +} + +.order-list { + display: flex; + flex-direction: column; + gap: 15px; +} + +.order-item { + background-color: #f9f9f9; + padding: 15px; + border: 1px solid #ddd; + border-radius: 5px; +} + +.order-item h3 { + font-size: 1.3rem; + color: #007BFF; + margin-bottom: 10px; +} + +.order-item p { + margin: 5px 0; + font-size: 1rem; +} + +footer { + text-align: center; + margin-top: 20px; + color: #777; + font-size: 0.9rem; +} diff --git a/src/main/resources/templates/menuEatInOrder.html b/src/main/resources/templates/menuEatInOrder.html new file mode 100644 index 0000000..ef9ad60 --- /dev/null +++ b/src/main/resources/templates/menuEatInOrder.html @@ -0,0 +1,49 @@ + + + + + + + Eat In Orders + + +
+
+

Eat In Orders

+ +
+ +
+

List of Eat In Orders

+
+ +
+

Order ID: ID

+

Waiter: Waiter Name

+

Date: Order Date

+

People Quantity: 0

+

Total Payment: 0.00 €

+

Paid: Paid Status

+ +

Table: Table Name

+

Menus: 0

+

Menu Name: Menu

+
+ +
+
+ +
+

© 2024 Our Restaurant. All rights reserved.

+
+
+ + diff --git a/src/test/java/dev/example/restaurantManager/BookingTableTest.java b/src/test/java/dev/example/restaurantManager/BookingTableTest.java index 17a958b..d8d343e 100644 --- a/src/test/java/dev/example/restaurantManager/BookingTableTest.java +++ b/src/test/java/dev/example/restaurantManager/BookingTableTest.java @@ -7,6 +7,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.Optional; @@ -15,49 +17,48 @@ @DataJpaTest public class BookingTableTest { - @Autowired - private BookingRepository bookingRepository; - @Autowired - private TableRestaurantRepository tableRestaurantRepository; - - @Test - public void TestCreateBookingTable() { - - // Create booking object - Booking booking1 = new Booking(); - booking1.setId("BO01"); - booking1.setConfirmed(false); - booking1.setDate(new Date()); - booking1.setName("Emma and friends"); - booking1.setPeopleQty(4); - booking1.setPhoneNumber("561-651-25-25"); - - // Create tableRestaurant object - TableRestaurant tableRestaurant1 = new TableRestaurant("TR01", "Table 01", - "TABLE 01 for 4 people outdoors", 4, false, new ArrayList<>()); - - // assign booking to tableRestaurant - tableRestaurant1.getBookings().add(booking1); - - // assign tableRestaurant to booking - booking1.setTableRestaurantMapped(tableRestaurant1); - tableRestaurant1.setBusy(true); - - // save booking and table - tableRestaurantRepository.save(tableRestaurant1); - bookingRepository.save(booking1); - - // FETCH DATA BO01 - Optional found = bookingRepository.findById("BO01"); - // Print - System.out.println("Booking1: " ); - System.out.println(found.get()); - System.out.println("--------------------"); - - // then - assertThat(found).isPresent(); - - - - } +// @Autowired +// private BookingRepository bookingRepository; +// @Autowired +// private TableRestaurantRepository tableRestaurantRepository; +// +// @Test +// public void TestCreateBookingTable() { +// +// // Create booking object +// Booking booking1 = new Booking(); +// booking1.setId("BO01"); +// booking1.setConfirmed(false); +// booking1.setDate(LocalDateTime.now()); +// booking1.setName("Emma and friends"); +// booking1.setPeopleQty(4); +// booking1.setPhoneNumber("561-651-25-25"); +// +// // Create tableRestaurant object +// TableRestaurant tableRestaurant1 = new TableRestaurant("T01", "Table1", "Description1", 4, true); +// +// // assign booking to tableRestaurant +// tableRestaurant1.getBookings().add(booking1); +// +// // assign tableRestaurant to booking +// booking1.setTableRestaurantMapped(tableRestaurant1); +// tableRestaurant1.setBusy(true); +// +// // save booking and table +// tableRestaurantRepository.save(tableRestaurant1); +// bookingRepository.save(booking1); +// +// // FETCH DATA BO01 +// Optional found = bookingRepository.findById("BO01"); +// // Print +// System.out.println("Booking1: " ); +// System.out.println(found.get()); +// System.out.println("--------------------"); +// +// // then +// assertThat(found).isPresent(); +// +// +// +// } } diff --git a/src/test/java/dev/example/restaurantManager/BookingTableTest.java~ b/src/test/java/dev/example/restaurantManager/BookingTableTest.java~ new file mode 100644 index 0000000..a6b8f89 --- /dev/null +++ b/src/test/java/dev/example/restaurantManager/BookingTableTest.java~ @@ -0,0 +1,64 @@ +package dev.example.restaurantManager; + +import dev.example.restaurantManager.model.Booking; +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.repository.BookingRepository; +import dev.example.restaurantManager.repository.TableRestaurantRepository; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.Optional; +import static org.assertj.core.api.Assertions.assertThat; + +@DataJpaTest +public class BookingTableTest { + + @Autowired + private BookingRepository bookingRepository; + @Autowired + private TableRestaurantRepository tableRestaurantRepository; + + @Test + public void TestCreateBookingTable() { + + // Create booking object + Booking booking1 = new Booking(); + booking1.setId("BO01"); + booking1.setConfirmed(false); + booking1.setDate(LocalDateTime.now()); + booking1.setName("Emma and friends"); + booking1.setPeopleQty(4); + booking1.setPhoneNumber("561-651-25-25"); + + // Create tableRestaurant object + TableRestaurant tableRestaurant1 = new TableRestaurant("Table1", "Description1", 4, true); + + // assign booking to tableRestaurant + tableRestaurant1.getBookings().add(booking1); + + // assign tableRestaurant to booking + booking1.setTableRestaurantMapped(tableRestaurant1); + tableRestaurant1.setBusy(true); + + // save booking and table + tableRestaurantRepository.save(tableRestaurant1); + bookingRepository.save(booking1); + + // FETCH DATA BO01 + Optional found = bookingRepository.findById("BO01"); + // Print + System.out.println("Booking1: " ); + System.out.println(found.get()); + System.out.println("--------------------"); + + // then + assertThat(found).isPresent(); + + + + } +} diff --git a/src/test/java/dev/example/restaurantManager/EatInOrderTest.java b/src/test/java/dev/example/restaurantManager/EatInOrderTest.java new file mode 100644 index 0000000..c757de5 --- /dev/null +++ b/src/test/java/dev/example/restaurantManager/EatInOrderTest.java @@ -0,0 +1,84 @@ +package dev.example.restaurantManager; + +import dev.example.restaurantManager.model.EatInOrderRestaurant; +import dev.example.restaurantManager.model.MenuRestaurant; +import dev.example.restaurantManager.model.TableRestaurant; +import dev.example.restaurantManager.repository.*; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +import java.util.*; + +import static org.assertj.core.api.Assertions.assertThat; + +@DataJpaTest +public class EatInOrderTest { + @Autowired + private MenuRestaurantRepository menuRestaurantRepository; + @Autowired + private EatInOrderRepository eatInOrderRepository; + @Autowired + private TableRestaurantRepository tableRestaurantRepository; + + @Test + public void TestCreateEatInOrder() { + // Crear y asignar valores a las mesas + TableRestaurant table1 = new TableRestaurant(); + table1.setId(UUID.randomUUID().toString()); + table1.setName("T1"); + table1.setDescription("Corner Table"); + table1.setQty(2); + table1.setBusy(false); + + TableRestaurant table2 = new TableRestaurant(); + table2.setId(UUID.randomUUID().toString()); + table2.setName("T2"); + table2.setDescription("Corner Table"); + table2.setQty(2); + table2.setBusy(false); + + TableRestaurant table3 = new TableRestaurant(); + table3.setId(UUID.randomUUID().toString()); + table3.setName("T3"); + table3.setDescription("Corner Table"); + table3.setQty(2); + table3.setBusy(false); + + // Crear 3 menús + MenuRestaurant menuRestaurant1 = new MenuRestaurant("M01", "Burger Menu", 10.99, "Burger, fries, and drink", true, true, null); + MenuRestaurant menuRestaurant2 = new MenuRestaurant("M02", "Pizza Menu", 12.99, "Pizza and salad", true, false, null); + MenuRestaurant menuRestaurant3 = new MenuRestaurant("M03", "Salad Menu", 8.99, "Mixed salad and dressing", true, true, null); + + // Guardar las mesas + tableRestaurantRepository.saveAll(Arrays.asList(table1, table2, table3)); + + // Guardar los menús + menuRestaurantRepository.saveAll(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3)); + + // Crear los pedidos y asignar menús y mesas + EatInOrderRestaurant eatInOrderRestaurant1 = new EatInOrderRestaurant("E01", new Date(), "John", 4, 43.96, true, table1, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3))); + EatInOrderRestaurant eatInOrderRestaurant2 = new EatInOrderRestaurant("E02", new Date(), "John", 4, 43.96, true, table2, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant3))); + EatInOrderRestaurant eatInOrderRestaurant3 = new EatInOrderRestaurant("E03", new Date(), "John", 4, 43.96, true, table3, new ArrayList<>(Arrays.asList(menuRestaurant2))); + + // Sincronizar la relación bidireccional + table1.getEatInOrderRestaurants().add(eatInOrderRestaurant1); + eatInOrderRestaurant1.setTableRestaurant(table1); + + table2.getEatInOrderRestaurants().add(eatInOrderRestaurant2); + eatInOrderRestaurant2.setTableRestaurant(table2); + + table3.getEatInOrderRestaurants().add(eatInOrderRestaurant3); + eatInOrderRestaurant3.setTableRestaurant(table3); + + // Guardar los pedidos + eatInOrderRepository.saveAll(Arrays.asList(eatInOrderRestaurant1, eatInOrderRestaurant2, eatInOrderRestaurant3)); + + // Verificar que se ha guardado la primera orden + EatInOrderRestaurant foundOrder = eatInOrderRepository.findById("E01") + .orElseThrow(() -> new RuntimeException("Order not found")); + + System.out.println("Order1: "); + System.out.println(foundOrder); + } +} diff --git a/src/test/java/dev/example/restaurantManager/RelationshipsOrderRestaurantTest.java b/src/test/java/dev/example/restaurantManager/RelationshipsOrderRestaurantTest.java index de729cd..eae71ab 100644 --- a/src/test/java/dev/example/restaurantManager/RelationshipsOrderRestaurantTest.java +++ b/src/test/java/dev/example/restaurantManager/RelationshipsOrderRestaurantTest.java @@ -1,10 +1,7 @@ package dev.example.restaurantManager; import dev.example.restaurantManager.model.*; -import dev.example.restaurantManager.repository.CustomerRepository; -import dev.example.restaurantManager.repository.MenuRestaurantRepository; -import dev.example.restaurantManager.repository.OrderRestaurantRepository; -import dev.example.restaurantManager.repository.TakeAwayOrderRepository; +import dev.example.restaurantManager.repository.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; @@ -17,129 +14,172 @@ @DataJpaTest public class RelationshipsOrderRestaurantTest { -@Autowired -private TakeAwayOrderRepository takeAwayOrderRepository; + @Autowired private CustomerRepository customerRepository; @Autowired private MenuRestaurantRepository menuRestaurantRepository; @Autowired private OrderRestaurantRepository orderRestaurantRepository; - - @Test - public void TestCreateOrder() { - // Create sample menus - MenuRestaurant menuRestaurant1 = new MenuRestaurant("M01", "Burger Menu", 10.99, "Burger, fries, and drink", true, true, null); - MenuRestaurant menuRestaurant2 = new MenuRestaurant("M02","Pizza Menu", 12.99, "Pizza and salad", true, false, null); - MenuRestaurant menuRestaurant3 = new MenuRestaurant("M03","Salad Menu", 8.99, "Mixed salad and dressing", true, true, null); - // Save sample menus - menuRestaurantRepository.save(menuRestaurant1); - menuRestaurantRepository.save(menuRestaurant2); - menuRestaurantRepository.save(menuRestaurant3); - // Create sample customers - Customer customer1 = new Customer("C1", "John", "john@email.com", "123-456-7890", 30, false, false); - Customer customer2 = new Customer("C2", "Sarah", "sarah@email.com", "234-567-8901", 25, true, false); - Customer customer3 = new Customer("C3", "Emily", "emily@email.com", "345-678-9012", 35, false, false); - Customer customer4 = new Customer("C4", "David", "david@email.com", "456-789-0123", 40, true, false); - Customer customer5 = new Customer("C5", "Anna", "anna@email.com", "567-890-1234", 28, false, false); - Customer customer6 = new Customer("C6", "Mark", "mark@email.com", "678-901-2345", 45, true, false); - Customer customer7 = new Customer("C7", "Paul", "paul@email.com", "789-012-3456", 33, false, false); - Customer customer8 = new Customer("C8", "Linda", "linda@email.com", "890-123-4567", 38, true, false); - Customer customer9 = new Customer("C9", "George", "george@email.com", "901-234-5678", 50, false, false); - - // Create sample tables - TableRestaurant table1 = new TableRestaurant("T1", "Window Table", 4, false); - TableRestaurant table2 = new TableRestaurant("T2", "Corner Table", 2, true); - - // Create 3 ShippingOrder objects - OrderRestaurant shippingOrder1 = new ShippingOrderRestaurant("SO1", new Date(), "John", 2, 21.98, false, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1)), "123 Main St", "New York", "Mike"); - OrderRestaurant shippingOrder2 = new ShippingOrderRestaurant("SO2", new Date(), "Sarah", 1, 12.99, true, new ArrayList<>(Arrays.asList(menuRestaurant2)), "456 Elm St", "Los Angeles", "Tom"); - OrderRestaurant shippingOrder3 = new ShippingOrderRestaurant("SO3", new Date(), "Emily", 3, 32.97, false, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3)), "789 Oak St", "Chicago", "Lisa"); - - // Create 3 EatInOrder objects - OrderRestaurant eatInOrder1 = new EatInOrderRestaurant("EO1", new Date(), "David", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2)), new ArrayList<>(Arrays.asList(table1))); - OrderRestaurant eatInOrder2 = new EatInOrderRestaurant("EO2", new Date(), "Anna", 2, 21.98, false, new ArrayList<>(Arrays.asList(menuRestaurant2, menuRestaurant3)), new ArrayList<>(Arrays.asList(table2))); - OrderRestaurant eatInOrder3 = new EatInOrderRestaurant("EO3", new Date(), "Mark", 6, 65.94, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2, menuRestaurant3, menuRestaurant3)), new ArrayList<>(Arrays.asList(table1, table2))); - - // Create 3 TakeAwayOrder objects - OrderRestaurant takeAwayOrder1 = new TakeAwayOrder("TO1", new Date(), "Alice", 1, 10.99, true, new ArrayList<>(Arrays.asList(menuRestaurant1)), customer1 ); - OrderRestaurant takeAwayOrder2 = new TakeAwayOrder("TO2", new Date(), "Bob", 2, 21.98, false, new ArrayList<>(Arrays.asList(menuRestaurant2, menuRestaurant3)), customer3 ); - OrderRestaurant takeAwayOrder3 = new TakeAwayOrder("TO3", new Date(), "Charlie", 3, 32.97, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3)), customer5); - OrderRestaurant takeAwayOrder4 = new TakeAwayOrder("TO4", new Date(), "Charlie", 3, 32.97, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3, menuRestaurant3, menuRestaurant3, menuRestaurant3)), customer9); - - // Create a list of all orders - ArrayList orders = new ArrayList<>(); - orders.addAll(Arrays.asList(shippingOrder1, shippingOrder2, shippingOrder3, - eatInOrder1, eatInOrder2, eatInOrder3, - takeAwayOrder1, takeAwayOrder2, takeAwayOrder3, takeAwayOrder4)); - - // Print the number of orders - System.out.println("Orders"); - System.out.println("Total number of orders: " + orders.size() + " orders."); - System.out.println("--------------------"); - // Print all orders - for (OrderRestaurant order : orders) { - System.out.println("Order ID: " + order.getId()); - System.out.println(order); - System.out.println("--------------------"); - } - - // Save the customer with JPA Repository to use in order T11 - customerRepository.save(customer1); - // let's create an order to save and test - // we do not create orderToSave as OrderRestaurant but - // as TakeAwayOrder to AVOID casting because - // in this test is easier to work with - TakeAwayOrder orderToSave = new TakeAwayOrder( - "T11", new Date(), "Alice", 1, 10.99, - true, new ArrayList<>(Arrays.asList(menuRestaurant1)), null ); - // we assign the customer to the order - //((TakeAwayOrder) orderToSave).setCustomerTakeAway(customer1); - orderToSave.setCustomerTakeAway(customer1); - // Save the order with JPA Repository - //takeAwayOrderRepository.save(orderToSave); - takeAwayOrderRepository.save(orderToSave); - - - // when - Optional found = takeAwayOrderRepository.findById("T11"); - System.out.println("--------------------"); - System.out.println("TakeAwayOrder ID: " + found.get().getId()); - System.out.println(found.get()); - // then - assertThat(found).isPresent(); - assertThat(found.get().getCustomerTakeAway().getName().equals(customer1.getName())); - - System.out.println("--------------------"); - } - - @Test - public void TestCreateOrderMenu () { - MenuRestaurant menuRestaurant1 = new MenuRestaurant("M01", "Burger Menu", 10.99, "Burger, fries, and drink", true, true, null); - MenuRestaurant menuRestaurant2 = new MenuRestaurant("M02","Pizza Menu", 12.99, "Pizza and salad", true, false, null); - MenuRestaurant menuRestaurant3 = new MenuRestaurant("M03","Salad Menu", 8.99, "Mixed salad and dressing", true, true, null); - // Save sample menus - menuRestaurantRepository.save(menuRestaurant1); - menuRestaurantRepository.save(menuRestaurant2); - menuRestaurantRepository.save(menuRestaurant3); - // Create 3 Order objects and assign menus - OrderRestaurant orderRestaurant1 = new OrderRestaurant("O01", new Date(), "John", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3))); - OrderRestaurant orderRestaurant2 = new OrderRestaurant("O02", new Date(), "John", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant3))); - OrderRestaurant orderRestaurant3 = new OrderRestaurant("O03", new Date(), "John", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant2))); - - // Save sample orders - orderRestaurantRepository.save(orderRestaurant1); - //orderRestaurantRepository.save(orderRestaurant2); - //orderRestaurantRepository.save(orderRestaurant3); - - - // when - Optional found = orderRestaurantRepository.findById("O01"); - System.out.println("--------------------"); - System.out.println("Order ID: " + found.get().getId()); - System.out.println(found.get()); - // then - assertThat(found).isPresent(); - assertThat(found.get().getMenus().get(0).getName().equals(menuRestaurant1.getName())); - } +@Autowired +private EatInOrderRepository eatInOrderRepository; +@Autowired +private TableRestaurantRepository tableRestaurantRepository; + +// @Test +// public void TestCreateOrder() { +// // Create sample menus +// MenuRestaurant menuRestaurant1 = new MenuRestaurant("M01", "Burger Menu", 10.99, "Burger, fries, and drink", true, true, null); +// MenuRestaurant menuRestaurant2 = new MenuRestaurant("M02","Pizza Menu", 12.99, "Pizza and salad", true, false, null); +// MenuRestaurant menuRestaurant3 = new MenuRestaurant("M03","Salad Menu", 8.99, "Mixed salad and dressing", true, true, null); +// // Save sample menus +// menuRestaurantRepository.save(menuRestaurant1); +// menuRestaurantRepository.save(menuRestaurant2); +// menuRestaurantRepository.save(menuRestaurant3); +// // Create sample customers +// Customer customer1 = new Customer("C1", "John", "john@email.com", "123-456-7890", 30, false, false); +// Customer customer2 = new Customer("C2", "Sarah", "sarah@email.com", "234-567-8901", 25, true, false); +// Customer customer3 = new Customer("C3", "Emily", "emily@email.com", "345-678-9012", 35, false, false); +// Customer customer4 = new Customer("C4", "David", "david@email.com", "456-789-0123", 40, true, false); +// Customer customer5 = new Customer("C5", "Anna", "anna@email.com", "567-890-1234", 28, false, false); +// Customer customer6 = new Customer("C6", "Mark", "mark@email.com", "678-901-2345", 45, true, false); +// Customer customer7 = new Customer("C7", "Paul", "paul@email.com", "789-012-3456", 33, false, false); +// Customer customer8 = new Customer("C8", "Linda", "linda@email.com", "890-123-4567", 38, true, false); +// Customer customer9 = new Customer("C9", "George", "george@email.com", "901-234-5678", 50, false, false); +// +// // Create sample tables +// TableRestaurant table1 = new TableRestaurant("T1", "Window Table", 4, false); +// TableRestaurant table2 = new TableRestaurant("T2", "Corner Table", 2, true); +// TableRestaurant table3 = new TableRestaurant("T3", "Side Table", 1, false); +// +//// // Create 3 ShippingOrder objects +//// OrderRestaurant shippingOrder1 = new ShippingOrderRestaurant("SO1", new Date(), "John", 2, 21.98, false, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1)), "123 Main St", "New York", "Mike"); +//// OrderRestaurant shippingOrder2 = new ShippingOrderRestaurant("SO2", new Date(), "Sarah", 1, 12.99, true, new ArrayList<>(Arrays.asList(menuRestaurant2)), "456 Elm St", "Los Angeles", "Tom"); +//// OrderRestaurant shippingOrder3 = new ShippingOrderRestaurant("SO3", new Date(), "Emily", 3, 32.97, false, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3)), "789 Oak St", "Chicago", "Lisa"); +//// +//// // Create 3 EatInOrder objects +// OrderRestaurant order1 = new EatInOrderRestaurant("EO1", new Date(), "David", 4, 43.96, true, table1,new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2))); +// OrderRestaurant order2 = new EatInOrderRestaurant("EO2", new Date(), "Anna", 2, 21.98, false, table2,new ArrayList<>(Arrays.asList(menuRestaurant2, menuRestaurant3))); +// OrderRestaurant order3 = new EatInOrderRestaurant("EO3", new Date(), "Mark", 6, 65.94, true, table1,new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2, menuRestaurant3, menuRestaurant3))); +// +//// OrderRestaurant eatInOrder1 = new EatInOrderRestaurant("EO1", new Date(), "David", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2)), new ArrayList<>(Arrays.asList(table1))); +//// OrderRestaurant eatInOrder2 = new EatInOrderRestaurant("EO2", new Date(), "Anna", 2, 21.98, false, new ArrayList<>(Arrays.asList(menuRestaurant2, menuRestaurant3)), new ArrayList<>(Arrays.asList(table2))); +//// OrderRestaurant eatInOrder3 = new EatInOrderRestaurant("EO3", new Date(), "Mark", 6, 65.94, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2, menuRestaurant3, menuRestaurant3)), new ArrayList<>(Arrays.asList(table1, table2))); +//// +//// // Create 3 TakeAwayOrder objects +//// OrderRestaurant takeAwayOrder1 = new TakeAwayOrder("TO1", new Date(), "Alice", 1, 10.99, true, new ArrayList<>(Arrays.asList(menuRestaurant1)), customer1 ); +//// OrderRestaurant takeAwayOrder2 = new TakeAwayOrder("TO2", new Date(), "Bob", 2, 21.98, false, new ArrayList<>(Arrays.asList(menuRestaurant2, menuRestaurant3)), customer3 ); +//// OrderRestaurant takeAwayOrder3 = new TakeAwayOrder("TO3", new Date(), "Charlie", 3, 32.97, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3)), customer5); +//// OrderRestaurant takeAwayOrder4 = new TakeAwayOrder("TO4", new Date(), "Charlie", 3, 32.97, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3, menuRestaurant3, menuRestaurant3, menuRestaurant3)), customer9); +//// +// // Create a list of all orders +// ArrayList orders = new ArrayList<>(); +// orders.addAll(Arrays.asList(order1, order2, order3)); +//// +// // Print the number of orders +// System.out.println("Orders"); +// System.out.println("Total number of orders: " + orders.size() + " orders."); +// System.out.println("--------------------"); +// // Print all orders +// for (OrderRestaurant order : orders) { +// System.out.println("Order ID: " + order.getId()); +// System.out.println(order); +// System.out.println("--------------------"); +// } +//// +//// // Save the customer with JPA Repository to use in order T11 +// customerRepository.save(customer1); +//// // let's create an order to save and test +//// // we do not create orderToSave as OrderRestaurant but +//// // as EatinOrder to AVOID casting because +//// // in this test is easier to work with +// EatInOrderRestaurant orderToSave = new EatInOrderRestaurant("EO1", new Date(), "David", 4, 43.96, true, table1,new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant1, menuRestaurant2, menuRestaurant2))); +//// // we assign the customer to the order +//// //((TakeAwayOrder) orderToSave).setCustomerTakeAway(customer1); +//// orderToSave.setCustomerTakeAway(customer1); +//// // Save the order with JPA Repository +//// //takeAwayOrderRepository.save(orderToSave); +//// takeAwayOrderRepository.save(orderToSave); +// eatInOrderRepository.save(orderToSave); +//// +//// +//// // when +//// Optional found = takeAwayOrderRepository.findById("T11"); +//// System.out.println("--------------------"); +//// System.out.println("TakeAwayOrder ID: " + found.get().getId()); +//// System.out.println(found.get()); +//// // then +//// assertThat(found).isPresent(); +//// assertThat(found.get().getCustomerTakeAway().getName().equals(customer1.getName())); +//// +//// System.out.println("--------------------"); +// } +// +// @Test +// public void TestCreateOrderMenu () { +// MenuRestaurant menuRestaurant1 = new MenuRestaurant("M01", "Burger Menu", 10.99, "Burger, fries, and drink", true, true, null); +// MenuRestaurant menuRestaurant2 = new MenuRestaurant("M02","Pizza Menu", 12.99, "Pizza and salad", true, false, null); +// MenuRestaurant menuRestaurant3 = new MenuRestaurant("M03","Salad Menu", 8.99, "Mixed salad and dressing", true, true, null); +// // Save sample menus +// menuRestaurantRepository.save(menuRestaurant1); +// menuRestaurantRepository.save(menuRestaurant2); +// menuRestaurantRepository.save(menuRestaurant3); +// // Create 3 Order objects and assign menus +// OrderRestaurant orderRestaurant1 = new OrderRestaurant("O01", new Date(), "John", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3))); +// OrderRestaurant orderRestaurant2 = new OrderRestaurant("O02", new Date(), "John", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant3))); +// OrderRestaurant orderRestaurant3 = new OrderRestaurant("O03", new Date(), "John", 4, 43.96, true, new ArrayList<>(Arrays.asList(menuRestaurant2))); +// +// // Save sample orders +// orderRestaurantRepository.save(orderRestaurant1); +// //orderRestaurantRepository.save(orderRestaurant2); +// //orderRestaurantRepository.save(orderRestaurant3); +// +// +// // when +// Optional found = orderRestaurantRepository.findById("O01"); +// System.out.println("--------------------"); +// System.out.println("Order ID: " + found.get().getId()); +// System.out.println(found.get()); +// // then +// assertThat(found).isPresent(); +// assertThat(found.get().getMenus().get(0).getName().equals(menuRestaurant1.getName())); +// } +// @Test +// public void TestCreateEatInOrder() { +// TableRestaurant table1 = new TableRestaurant("T1", "Window Table", 4, false); +// TableRestaurant table2 = new TableRestaurant("T2", "Corner Table", 2, true); +// TableRestaurant table3 = new TableRestaurant("T3", "Side Table", 1, false); +// +// +// // Save sample tables +// +// tableRestaurantRepository.save(table1); +// tableRestaurantRepository.save(table2); +// tableRestaurantRepository.save(table3); +// +// //Create 3 menus +// +// MenuRestaurant menuRestaurant1 = new MenuRestaurant("M01", "Burger Menu", 10.99, "Burger, fries, and drink", true, true, null); +// MenuRestaurant menuRestaurant2 = new MenuRestaurant("M02","Pizza Menu", 12.99, "Pizza and salad", true, false, null); +// MenuRestaurant menuRestaurant3 = new MenuRestaurant("M03","Salad Menu", 8.99, "Mixed salad and dressing", true, true, null); +// +// // Save sample menus +// +// menuRestaurantRepository.save(menuRestaurant1); +// menuRestaurantRepository.save(menuRestaurant2); +// menuRestaurantRepository.save(menuRestaurant3); +// +// // Create 3 Order eat-in objects and assign menus and tables +// +// EatInOrderRestaurant eatInOrderRestaurant1 = new EatInOrderRestaurant("E01", new Date(), "John", 4, 43.96, true, table1, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant2, menuRestaurant3))); +// EatInOrderRestaurant eatInOrderRestaurant2 = new EatInOrderRestaurant("E02", new Date(), "John", 4, 43.96, true, table2, new ArrayList<>(Arrays.asList(menuRestaurant1, menuRestaurant3))); +// EatInOrderRestaurant eatInOrderRestaurant3 = new EatInOrderRestaurant("E03", new Date(), "John", 4, 43.96, true, table3, new ArrayList<>(Arrays.asList(menuRestaurant2))); +// +// // Save sample orders +// eatInOrderRepository.save(eatInOrderRestaurant1); +// eatInOrderRepository.save(eatInOrderRestaurant2); +// eatInOrderRepository.save(eatInOrderRestaurant3); +// +// +// } }