Changeset 07f4e8b for src/main/java/com/tourMate/dao/impl/RestaurantDaoImpl.java

Timestamp:

01/24/24 17:42:28 (5 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

0f5aa27

Parents:

5528b99

Message:

prefinal fixes

File:

• src/main/java/com/tourMate/dao/impl/RestaurantDaoImpl.java (modified) (9 diffs)

src/main/java/com/tourMate/dao/impl/RestaurantDaoImpl.java

@@ -18 +18 @@
     @Override
     @Transactional
-    public void createRestaurant(Restaurant restaurant, long userId) {
-        User u = em.find(User.class, userId);
-        Restaurant r = new Restaurant(restaurant.getRestaurantName(), restaurant.getRestaurantLocation(), restaurant.getCousineType(), restaurant.getRestaurantDescription(), restaurant.getRestaurantEdbs(), u);
-        em.persist(r);
+    public void createRestaurant(Restaurant restaurant) {
+        em.persist(restaurant);
     }
 
@@ -43 +41 @@
     @Transactional
     @Override
-    public void removeRestaurantImage(long restaurantImageId){
-        RestaurantImages restaurantImage = findRestaurantImageById(restaurantImageId);
-        em.remove(restaurantImage);
+    public void removeRestaurantImage(RestaurantImages image){
+        em.remove(image);
     }
 
@@ -55 +52 @@
 
     @Override
-    public void deleteRestaurant(long restaurantID) {
-        Restaurant r = findRestaurantByID(restaurantID);
+    public void deleteRestaurant(Restaurant r) {
         em.remove(r);
     }
@@ -67 +63 @@
     @Override
     @Transactional
-    public void addMenuToRestaurant(long restaurantId, Menu menu) {
-        Restaurant r = findRestaurantByID(restaurantId);
-        menu.setRestaurant(r);
+    public void addMenuToRestaurant(Menu menu) {
         em.persist(menu);
     }
@@ -84 +78 @@
 
     @Override
-    @Transactional
-    public void editRestaurant(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, User restaurantOwner) {
-        Restaurant res = findRestaurantByID(restaurantID);
-        res.setRestaurantName(restaurantName);
-        res.setRestaurantLocation(restaurantLocation);
-        res.setRestaurantEdbs(restaurantEdbs);
-        res.setRestaurantDescription(restaurantDescription);
-        res.setRestaurantOwner(restaurantOwner);
-        res.setCousineType(cousineType);
-        em.persist(res);
-    }
-
-    @Override
     public List<RestaurantsTable> getRestaurantTables(long restaurantID) {
-        List<RestaurantsTable> restaurantsTables = getRestaurantTables(restaurantID);
-        return restaurantsTables;
+        return em.createQuery("select rt from RestaurantsTable rt where rt.restaurant.restaurantID = :restaurantId").setParameter("restaurantId", restaurantID).getResultList();
     }
 
@@ -109 +89 @@
     @Override
     @Transactional
-    public void createTable(Restaurant restaurant, int noSeats) {
-        RestaurantsTable resTable = new RestaurantsTable(restaurant, noSeats);
+    public void saveTable(RestaurantsTable resTable) {
         em.persist(resTable);
     }
 
-    @Override
-    @Transactional
-    public void editTable(Restaurant restaurant, long tableId, int noSeats) {
-        RestaurantsTable resTable = findTableById(tableId);
-        resTable.setRestaurant(restaurant);
-        resTable.setNoSeats(noSeats);
-        em.persist(resTable);
-    }
-
-    @Override
-    @Transactional
-    public void deleteTable(long tableId) {
-        RestaurantsTable rt  = findTableById(tableId);
+
+    @Override
+    @Transactional
+    public void deleteTable(RestaurantsTable rt) {
         em.persist(rt);
     }
 
     @Override
-    public List<Restaurant> getRestaurantsByUser(long userId) {
-        User u = em.find(User.class, userId);
+    public List<Restaurant> getRestaurantsByUser(User u) {
         return em.createQuery("select r from Restaurant r where r.restaurantOwner = :u").setParameter("u", u).getResultList();
-    }
-
-    @Override
-    @Transactional
-    public void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo, int noSeats) {
-        RestaurantsAvailible ra = new RestaurantsAvailible(restaurantsTable, hourFrom, hourTo, noSeats);
-        em.persist(ra);
     }
 
@@ -151 +113 @@
     @Override
     @Transactional
-    public void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo){
-        RestaurantsAvailible rta = new RestaurantsAvailible(restaurantsTable, hourFrom, hourTo);
-        em.persist(rta);
-    }
-
-    @Override
-    @Transactional
-    public void editTableAvailable(long tableId, Restaurant restaurant, int noSeats) {
-        RestaurantsTable rt = findTableById(tableId);
-        rt.setRestaurant(restaurant);
-        rt.setNoSeats(noSeats);
-        em.persist(rt);
-    }
-
-    @Override
-    @Transactional
-    public void deleteTableAvailable(long tableId) {
-        RestaurantsAvailible ra = findAvailableReservationByID(tableId);
+    public void saveTableAvailable(RestaurantsAvailible ra){
+        em.persist(ra);
+    }
+
+    @Override
+    @Transactional
+    public void deleteTableAvailable(RestaurantsAvailible ra) {
         em.remove(ra);
     }
@@ -183 +134 @@
     }
 
-    @Override
-    @Transactional
-    public void editReservation(long restaurantsTableId, RestaurantsTable rt, Date hourFrom, Date hourTo, int noSeats, User user) {
-        RestaurantReservations r = findReservationByID(restaurantsTableId);
-        r.setTable(rt);
-        r.setTimeFrom(hourFrom);
-        r.setTimeTo(hourTo);
-        r.setNoSeats(noSeats);
-        r.setUser(user);
-        em.persist(r);
-    }
-
-    @Override
-    @Transactional
-    public void deleteReservation(long restaurantsTableId) {
-        RestaurantReservations r = findReservationByID(restaurantsTableId);
+
+    @Override
+    @Transactional
+    public void deleteReservation(RestaurantReservations r) {
         em.remove(r);
     }
@@ -259 +198 @@
 
     }
+
+    @Override
+    public List<MenuImages> getMenuImages(long menuId) {
+        return em.createQuery("select ri from MenuImages ri where ri.menu.id = :menuId").setParameter("menuId", menuId).getResultList();
+    }
+
+    @Override
+    public List<MenuImages> getMenuImagesByRestaurant(Restaurant resta) {
+        return em.createQuery("select mi from MenuImages mi where mi.menu.restaurant = :restaurant")
+                .setParameter("restaurant", resta)
+                .getResultList();
+    }
+
+    @Transactional
+    @Override
+    public void addMenuImage(MenuImages menuImages) {
+        em.persist(menuImages);
+    }
+
+    @Override
+    public Menu findMenuId(Long menuId) {
+        return em.find(Menu.class, menuId);
+    }
+
+    @Override
+    @Transactional
+    public void saveReservation(RestaurantReservations restaurantReservations) {
+        em.persist(restaurantReservations);
+    }
 }