Whatever

pvepamb1 · Sep 23, 2019 · 2bbfdc8 · 2bbfdc8
1 parent 3655413
commit 2bbfdc8
Show file tree

Hide file tree

Showing 18 changed files with 131 additions and 40 deletions.
diff --git a/...a/com/pcf/flights/FlightMicroservice.java → ...cf/tripit/flights/FlightMicroservice.java b/...a/com/pcf/flights/FlightMicroservice.java → ...cf/tripit/flights/FlightMicroservice.java
@@ -1,4 +1,4 @@
-package com.pcf.flights;
+package com.pcf.tripit.flights;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...lights/src/main/resources/application.yml → ...hts-ms/src/main/resources/application.yml b/...lights/src/main/resources/application.yml → ...hts-ms/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
     name: flights-ms
 
   jpa:
-    hibernate.ddl-auto: create
+    generate-ddl: true
     properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
 
   datasource:

diff --git a/...ava/com/pcf/hotels/HotelMicroservice.java → .../pcf/tripit/hotels/HotelMicroservice.java b/...ava/com/pcf/hotels/HotelMicroservice.java → .../pcf/tripit/hotels/HotelMicroservice.java
@@ -1,4 +1,4 @@
-package com.pcf.hotels;
+package com.pcf.tripit.hotels;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...hotels/src/main/resources/application.yml → ...els-ms/src/main/resources/application.yml b/...hotels/src/main/resources/application.yml → ...els-ms/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
     name: hotels-ms
 
   jpa:
-    hibernate.ddl-auto: create
+    generate-ddl: true
     properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
 
   datasource:

diff --git a/applications/tripit/build.gradle b/applications/tripit/build.gradle
@@ -15,6 +15,7 @@ dependencyManagement {
 }
 
 dependencies {
+    compile project(':components:ui')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('taglibs:standard:1.1.2')
     compile('javax.servlet:jstl:1.2')

diff --git a/applications/tripit/src/main/java/com/pcf/tripit/MainController.java b/applications/tripit/src/main/java/com/pcf/tripit/MainController.java
diff --git a/applications/tripit/src/main/java/com/pcf/tripit/TripitApplication.java b/applications/tripit/src/main/java/com/pcf/tripit/TripitApplication.java
@@ -1,13 +1,34 @@
 package com.pcf.tripit;
 
+import com.pcf.tripit.hotelui.HotelClient;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestOperations;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 public class TripitApplication {
 
+	@Value("${hotels.ms.url}")
+	private String url;
+
 	public static void main(String[] args) {
 		SpringApplication.run(TripitApplication.class, args);
 	}
+	//@Bean
+	/*public MovieClient movieClient(RestOperations restOperations) {
+		return new MovieClient("//movies-ms/movies", restOperations);
+	}*/
+
+	@Bean
+	public HotelClient hotelClient(RestOperations restOperations) {
+		return new HotelClient(url, restOperations);
+	}
 
+	@Bean
+	public RestOperations restOperations() {
+		return new RestTemplate();
+	}
 }
diff --git a/applications/tripit/src/main/resources/application.properties b/applications/tripit/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 spring.mvc.view.prefix=/WEB-INF/
 spring.mvc.view.suffix=.jsp
+hotels.ms.url=http://localhost:8081/hotels
diff --git a/applications/tripit/src/main/webapp/WEB-INF/hotel.jsp b/applications/tripit/src/main/webapp/WEB-INF/hotel.jsp
@@ -6,6 +6,11 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:set var="language" value="${pageContext.request.locale}"/>
+<fmt:setLocale value="${language}"/>
 <html>
 <head>
     <title>Hotel</title>
@@ -99,13 +104,12 @@
         </thead>
 
         <tbody>
-        <c:forEach items="${hotels}" var="hotels">
+        <c:forEach items="${hotels}" var="hotel">
             <tr>
-                <td><c:out value="${hotels.name}"/></td>
-                <td><c:out value="${hotels.address}"/></td>
-                <td><c:out value="${hotels.city}"/></td>
-                <td><c:out value="${hotels.price}"/></td>
-                <td><c:out value="${hotels.cost}"/></td>
+                <td><c:out value="${hotel.name}"/></td>
+                <td><c:out value="${hotel.address}"/></td>
+                <td><c:out value="${hotel.city}"/></td>
+                <td><c:out value="${hotel.price}"/></td>
                 <td><button class="button button2">Book</button></td>
             </tr>
         </c:forEach>
@@ -114,15 +118,14 @@
 
     <c:if test="${count > 0}">
         <c:if test="${page > 1}">
-            <a href="<c:url value="hotels"><c:param name="page" value="${page - 1}"/><c:param name="field" value="${field}"/><c:param name="key" value="${key}"/></c:url>">&lt; Prev</a>&nbsp;
+          <a href="<c:url value="moviefun"><c:param name="page" value="${page - 1}"/><c:param name="field" value="${field}"/><c:param name="key" value="${key}"/></c:url>">&lt; Prev</a>&nbsp;
         </c:if>
         Showing records ${start} to ${end} of ${count}
         <c:if test="${page < pageCount}">
-            &nbsp;<a href="<c:url value="hotels"><c:param name="page" value="${page + 1}"/><c:param name="field" value="${field}"/><c:param name="key"
-                                                                                                                                             value="${key}"/></c:url>">Next &gt;</a>
+          &nbsp;<a href="<c:url value="moviefun"><c:param name="page" value="${page + 1}"/><c:param name="field" value="${field}"/><c:param name="key"
+                                                                                                                                            value="${key}"/></c:url>">Next &gt;</a>
         </c:if>
-    </c:if>
-
+      </c:if>
 </div>
 </body>
 </html>
diff --git a/applications/tripit/src/main/webapp/WEB-INF/index.jsp b/applications/tripit/src/main/webapp/WEB-INF/index.jsp
@@ -31,7 +31,7 @@
 
     <div class="hotelside">
         <img src="../../assests/img/hotel.png" width="360px" height="360px" style="padding-left:150px; padding-top: 30px">
-        <button class="button" style="vertical-align:middle;  margin-left: 250px; margin-top:90px"><span>Book Hotel </span></button>
+        <button onclick="window.location.href = '/hotels';" class="button" style="vertical-align:middle;  margin-left: 250px; margin-top:90px"><span>Book Hotel </span></button>
     </div>
 </div>
 </body>

diff --git a/components/hotels/src/main/java/com/pcf/tripit/hotels/HotelController.java b/components/hotels/src/main/java/com/pcf/tripit/hotels/HotelController.java
@@ -1,19 +1,59 @@
 package com.pcf.tripit.hotels;
 
+import com.pcf.tripit.hotels.bookings.Booking;
+import com.pcf.tripit.hotels.bookings.BookingID;
+import com.pcf.tripit.hotels.bookings.BookingRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 @RestController
 @RequestMapping("/hotels")
 public class HotelController {
 
     private HotelRepository hotelRepository;
+    private BookingRepository bookingRepository;
 
     public HotelController(HotelRepository hotelRepository) {
         this.hotelRepository = hotelRepository;
     }
 
+    /*@GetMapping
+    public Iterable<Hotel> getAvailable(@RequestParam String begin, @RequestParam String end) throws ParseException {
+
+        Date startDate = new SimpleDateFormat("YYYY/MM/DD").parse(begin);
+        Date endDate = new SimpleDateFormat("YYYY/MM/DD").parse(end);
+
+        List<Hotel> available = new ArrayList<>();
+        for(Hotel hotel: hotelRepository.findAll()){
+            boolean isAvailable = true;
+            Set<String> roomIdSet = new HashSet<>();
+            for(Booking booking: bookingRepository.findAll()){
+                if(hotel.getId()==booking.getId().getHotelId().getId() &&
+                        !checkDateRange(startDate, endDate, booking.getBegin(), booking.getEnd())){
+                    roomIdSet.add(booking.getId().getRoomId());
+                }
+            }
+            if(roomIdSet.size()>=hotel.getCapacity()) isAvailable = false;
+            if(isAvailable) available.add(hotel);
+        }
+
+        return available;
+    }*/
+
+    @GetMapping
+    private Iterable<Hotel> getavai(){
+        return hotelRepository.findAll();
+    }
+
+    private static boolean checkDateRange(Date start1, Date end1, Date start2, Date end2){
+        return((start1.before(start2) && end1.before(start2)) || (start1.after(end2) && end1.after(end2)));
+    }
+
     @PostMapping
     public ResponseEntity<Hotel> create(@RequestBody Hotel hotel){
         hotelRepository.save(hotel);

diff --git a/components/hotels/src/main/java/com/pcf/tripit/hotels/bookings/BookingController.java b/components/hotels/src/main/java/com/pcf/tripit/hotels/bookings/BookingController.java
diff --git a/components/hotels/src/main/java/com/pcf/tripit/hotels/bookings/BookingRepository.java b/components/hotels/src/main/java/com/pcf/tripit/hotels/bookings/BookingRepository.java
@@ -4,5 +4,5 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface BookingRepository extends CrudRepository<BookingID, Long> {
+public interface BookingRepository extends CrudRepository<Booking, BookingID> {
 }
diff --git a/components/ui/build.gradle b/components/ui/build.gradle
@@ -0,0 +1,7 @@
+apply from: "../../common.gradle"
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+    compile('commons-lang:commons-lang:2.4')
+    //compile("io.pivotal.spring.cloud:spring-cloud-services-starter-circuit-breaker:$SCSClientStartersVersion")
+}
diff --git a/components/ui/src/main/java/com/pcf/tripit/MainController.java b/components/ui/src/main/java/com/pcf/tripit/MainController.java
@@ -0,0 +1,37 @@
+package com.pcf.tripit;
+
+import com.pcf.tripit.hotelui.HotelClient;
+import com.pcf.tripit.hotelui.HotelInitialList;
+import com.pcf.tripit.hotelui.HotelUI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+import java.util.Map;
+
+@Controller
+public class MainController {
+
+    private HotelInitialList hotelInitialList;
+    private HotelClient hotelClient;
+
+    @Autowired
+    public MainController(HotelInitialList hotelInitialList, HotelClient hotelClient) {
+        this.hotelInitialList = hotelInitialList;
+        this.hotelClient = hotelClient;
+    }
+
+    @GetMapping("/")
+    public String message(Map<String, Object> model){
+        hotelInitialList.asList().forEach(hotelClient::create);
+        return "index";
+    }
+
+   /* @GetMapping("/setup")
+    public String setDatabase(){
+        model.put("hotels", hotelClient.getAll());
+        return "hotel";
+    }*/
+
+}
diff --git a/components/ui/src/main/java/com/pcf/tripit/hotelui/HController.java b/components/ui/src/main/java/com/pcf/tripit/hotelui/HController.java
@@ -16,6 +16,6 @@ public HController(HotelClient hotelClient) {
     @GetMapping("/hotels")
     public String allHotels(Map<String, Object> model) {
         model.put("hotels", hotelClient.getAll() );
-        return "hotels";
+        return "hotel";
     }
 }
diff --git a/components/ui/src/main/java/com/pcf/tripit/hotelui/HotelClient.java b/components/ui/src/main/java/com/pcf/tripit/hotelui/HotelClient.java
@@ -27,7 +27,7 @@ public HotelClient(String hotelURL, RestOperations restOperations) {
         this.restOperations = restOperations;
     }
 
-    public void create(HotelClient hotel) {
+    public void create(HotelUI hotel) {
         restOperations.postForEntity(hotelURL, hotel, HotelUI.class);
     }
 

diff --git a/settings.gradle b/settings.gradle
@@ -3,4 +3,5 @@ include "applications:tripit"
 include "applications:hotels-ms"
 include "applications:flights-ms"
 include "components:flights"
-include "components:hotels"
+include "components:hotels"
+include "components:ui"