Small changes for bookings.

G3ralt · Dec 8, 2017 · f21db92 · f21db92
1 parent 0f517d1
commit f21db92
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/HolidayHomesClient/src/components/rentRentableContainer.js b/HolidayHomesClient/src/components/rentRentableContainer.js
@@ -26,11 +26,14 @@ export default class RentRentable extends Component {
         }
         // console.log("JSON:", json);
         const options = fetchHelper.makeOptions("POST", true, json);
-        fetch(URL + "api/booking/create", options).catch(err => {
+        fetch(URL + "api/booking/create", options)
+        .then(
+            window.location.href = this.state.clientOrigin + "/#/myDashboard/myBookings"
+        )
+        .catch(err => {
             console.log(err);
         })
-        alert("Booking created");
-        window.location.href = this.state.clientOrigin + "/#/myDashboard/myBookings";
+
     }
 
     render() {

diff --git a/HolidayHomesServer/src/main/java/facades/BookingFacade.java b/HolidayHomesServer/src/main/java/facades/BookingFacade.java
@@ -37,6 +37,7 @@ public void createNewBooking(Booking booking) throws DBException {
     public List<Booking> getBookingsByUser(String username) throws DBException {
         List<Booking> toReturn;
         try {
+            EM.getEntityManagerFactory().getCache().evictAll();
             Query q = EM.createQuery("SELECT b FROM Booking b WHERE b.user.username = :username", Booking.class);
             q.setParameter("username", username);
             toReturn =  q.getResultList();

diff --git a/HolidayHomesServer/src/main/java/facades/RentableFacade.java b/HolidayHomesServer/src/main/java/facades/RentableFacade.java
@@ -23,6 +23,7 @@ public RentableFacade(EntityManager EM) {
     public Rentable getRentableByName(String rentableName, String username) throws DBException {
         Rentable toReturn;
         try {
+            EM.getEntityManagerFactory().getCache().evictAll();
             Query q = EM.createQuery("SELECT r FROM Rentable r WHERE r.rentableName = :rentableName");
             q.setParameter("rentableName", rentableName);
             toReturn = (Rentable) q.getSingleResult();