From f8aa3de0a4c230ebb8d6c4a059e57b15bb5b9cc9 Mon Sep 17 00:00:00 2001
From: Varsha <hp@DESKTOP-4IENAI5>
Date: Thu, 14 May 2020 11:52:04 +0530
Subject: [PATCH] FSJ0420A113

---
 .classpath                                    |   6 +-
 build/classes/.gitignore                      |   2 +-
 build/classes/controller/BusController.class  | Bin 1471 -> 3098 bytes
 .../classes/controller/FlightController.class | Bin 1313 -> 2923 bytes
 .../classes/controller/HotelController.class  | Bin 1315 -> 3103 bytes
 .../classes/controller/TrainController.class  | Bin 1309 -> 2954 bytes
 src/controller/BusController.java             |   7 +-
 src/controller/FlightController.java          |   7 +-
 src/controller/HotelController.java           |   8 +--
 src/controller/TrainController.java           |   7 +-
 src/model/Bus.java                            |  42 ++++++++++++
 src/model/Flight.java                         |  59 ++++++++++++++++-
 src/model/Hotel.java                          |  62 +++++++++++++++++-
 src/model/Train.java                          |  44 ++++++++++++-
 src/services/Booking.java                     |   7 ++
 src/services/FareCalculator.java              |  46 ++++++++++++-
 16 files changed, 274 insertions(+), 23 deletions(-)

diff --git a/.classpath b/.classpath
index 2846539..20c137d 100644
--- a/.classpath
+++ b/.classpath
@@ -8,10 +8,6 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 0b6c10d..4e5d31f 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,3 @@
-/controller/
 /model/
 /services/
+/controller/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..b08c24db586938d8741f8ed613307b249643da32 100644
GIT binary patch
literal 3098
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

delta 147
zcmbOwv7ejk)W2Q(7#J8#7@Rk9-D952%5jiYjDdwgV)AK@SY8<h4hC5UK?XSnNe21J
zrkoz}4E8|9%s|Yz5lApG@B>LU21X$1&maIK6(Ev8JwiYpP#J?6gE?59k->t&5~zcT
Z!4@da#9#+DiVrB~0K|^b42;DLP5|pi5mx{J

diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class
index 40239610fbc678ebaf66d6731c462039ac68a017..c66c103ecb8ee10794c43a634b289130e392d57f 100644
GIT binary patch
literal 2923
zcma)8*;gA?9R6+y%#aLFQfWJF>1r)Bma(fXsokJxltP6{#jQ@l1%`%9Iy0fP?t5M9
ze)Q44_@FPo(4yyfJU(jwB#-*tnLtB;DogI2JHPu|zVEl>kH3HZ6~IA!tsy3`Deo2o
z&n*<BXZ01FiOHa6@jyddV9S&}W6xT?^kxb&uqK0`WIe`@;pjkM4PQBSVMKbq;})OF
z_6mr{1)8YG5A0$vVi(G?o+j0g5NJ5&6rJF>KwU@Yh(Nr@9g_*vq1iwJNr9Grrzi)?
z(>dv#w{rz4km`5yG+@&VpDTy)VAAmg+WYSjKt`Z`%zab_0z)1B_YP!8UM@>N$o!|6
zUt(Y~qkK=Cna#^mz_5J{>z83wfoM@kgDJ39xnVi3l^tAsp<|Q42J6C^(|fZ6eb$U4
zulSZz9FwzMQ+_Flc5KzKMPS$e3c<iOY!|q1LI#zfdL6%H2l+|q2^@-munKl@!Ws@d
zr#O-6tO<JAwM-H_u}j1K0$Z2*uuRmz1K2H~jl13z+Zz)&S&MuHmQ?^>d|QRH=0)TP
z?5^>&HXRp~3h17UGzio>u>4ZR78xC@f@*t>v1PF`zZ%BebFLrgc!)8VSOd%jMc94=
z2XIipAPeVg&z_cnLjQqP(O*JH0*7%#!@~ltVY-B5Ws8BFke-2~=w^H++w&#Q1lm?o
zn$>ZP>7OsyzORGj79aQAX&om8Vu7pUG*8HWNe2tIQO?SIIdEoJiG6rX!=tS0yOyIg
zF^~ldyMbKT1(x0tvxB)QnGZ6Z&m_=~0S#vtGCgpnr4<%%uN_DOgE&XGLgxjnYR`Kn
zZEsi+UCgt*LhP-jw=)`s2<bFCMxoNJ5_l5lRp)q0V7McjjjmNE_lk<{aaet~b42OC
zVBl$t3N-sN7;p#2&qXv7z>aJr@vMR8l!Q)+A%^LzYcCkMh!^QE4|^01=dYI7&6dEn
zP=KMGoPj)8F&Z!Qku3Iv3O+S3L`KIAOepbsil28iI0Eb0i)Wm?^sPSIlRb7JUoO~z
z>m@LWX7y1pFpVNT&$;d;W>-glHJF*sUL7S;JRVL0mB&msAIvco#HoM@lPd=dVs|xh
zl_091U&w|L9WyMdNZmMHN?;b(G+bShUcGLaecixIc$vY^sCh9su7K*TWI;$tB$d(e
zD!YD7uZ#?guy3k{$r(}%=SLM)BFiifiy;VENL6`T@t^dmf{5PNdx}N{ZeV+=##YQ2
z4l!9I1<gxgRK><%1<d|c2w~@lD+`>JEWf7Vz|LPfYnQ^=rr`z~#nLvrTFWB1!*1Ej
z%RWa<%C_1O-lf#gkD+o=<<N-ZJB0dFvFHYNIJY=d!pQDUczf}sbwTDT?O09HkQfqV
zMQCF?7`~e6*ob;GaMkz}gU(a>g(N=>o*dvRxYqBvg{GfEkrsX?C<?4Y92>BPJ0lW8
zD^h%lV=eBZL>u=FT-Q-bDa%oLoNFqb+BlERF%0ZYKRAyab-1g!Idp3?8kxVX*b-{r
z6Wyw4=Y4dbGqjk(9;9iZk-raOZ>Ya(CEKx9hNe8dlTKOl*cZcX96Fv(Wx{=TJe_(Z
z+SR91C!$?LI&~`AX=XgtGlw(ZBH7yBe^~z>dh6Qjhjp|5HlFBiG#k{C_ytdnwzuhK
z+-x)xrgjU%-AOaqK8F!A*{09o88d0d=kPq2#yQwr5_6EhU~=>prn(K&Fq3n*bhIg*
za?RvCF4rNQDsO1IjVqOhS3=CXTg;X!)as!4$Pr<XR0BJR_D+6@xSz=E;y1+(94A&i
zeCi`YPoN7!urP{!>?Qlz9uD9drQX0HT<6@nfg|_^-S`d}{D5Nw=@I-+4S(W9h~CWz
z!$l_UEHZJY!i0g}@ETqx6YDTXy>F7cZTOKo-ejWf!A+dxu7Nhc!CTyE^sNqW^M+3E
z-l*(`=+!%Tm#mJ`$M?8P(BF$F(aR)n9>n|jfYE+O_CLf&Xrh;iFauifF_GAb*gp(d
p*B~^sYxsmq-{K$em-==b!>1ID;WK>BwV4U^1^>T%7Q)9@{{q82@5ulF

delta 152
zcmaDYwvbEU)W2Q(7#J8#7);q2m>3zPCtj4^sIARB`5gN}R#65P2Jy*LI6^t488{ha
z7z7z)Cx7Dbh-a_|>R<+9#*ILNiGd$TvN13MNjnAsAgKV61gaMT@_@=1G#E6&@{9~x
g4B9{)Obq%!aV7=>216jt2b41cV&iBA#$pB&0QX-K_W%F@

diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class
index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..be4ceeea4e0b50ba1260581f20056bc725fe127a 100644
GIT binary patch
literal 3103
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
Xq(FiY{FvhaqwpvEfBSie5I_A7s*EN=

delta 120
zcmbO)v6zeN)W2Q(7#J8#7)&>Ec`<MH<S1Z_XRrr~Fat5;Mj*k&zz-zZ7#M-18-oCl
zRDeh_2r>u(c|c_h8Vs6Xc}4~;25q1YCI)?=I1_^bgCUUS1Iifzv2ip5V=;pX02we0
AQ~&?~

diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class
index 167c49557346d52c778488cb5592000d897d146d..94a0f167a652a04526a4c4aede0f46dd9ea0ab91 100644
GIT binary patch
literal 2954
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

delta 143
zcmeAYpUcH{>ff$?3=9k=45k~oyqG8NVBgOw#=ycLF}a2#lv9R*lR=h2kU?(pEe?-(
z2791FW*}zV2qc&o_<<xF10#@hXAl6A3J^)4dLbYWsEk2_K@%*`$e_ib4b;KJpbr#h
XVlZGZ1k!v!IU^u8j%HviW-tK&nuQRr

diff --git a/src/controller/BusController.java b/src/controller/BusController.java
index f1f8372..c91bd52 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -1,6 +1,7 @@
 package controller;
 
 import java.io.IOException;
+import services.*;
 import java.time.LocalDate;
 
 import javax.servlet.RequestDispatcher;
@@ -9,7 +10,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
+import model.*;
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -28,7 +29,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*
+
 		
 			int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String bustype=request.getParameter("bustype");
@@ -72,6 +73,6 @@ else if(bustype.equals("nonacsemisleeper")) {
 		request.setAttribute("busfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp");
 		dispatcher.forward(request, response);
-*/	}
+	}
 	
 }
diff --git a/src/controller/FlightController.java b/src/controller/FlightController.java
index 7760e3c..fd5f272 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -10,7 +10,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
+import model.*;
+import services.*;
 
 @WebServlet("/flight")
 public class FlightController extends HttpServlet {
@@ -29,7 +30,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+	int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -59,6 +60,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		request.setAttribute("flightfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/flightView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/controller/HotelController.java b/src/controller/HotelController.java
index 0c39e3b..82084e3 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -12,8 +12,8 @@
 
 
 
-/*import model.Hotel;
-import services.FareCalculator;*/
+import model.Hotel;
+import services.FareCalculator;
 
 
 
@@ -33,7 +33,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+	int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String roomtype=request.getParameter("roomtype");
 		String occupancy=request.getParameter("occupancy");
 		String from=request.getParameter("from");
@@ -67,6 +67,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp");
 		dispatcher.forward(request, response);
 	
-*/	}
+}
 	
 }
diff --git a/src/controller/TrainController.java b/src/controller/TrainController.java
index dcc07df..b894cbd 100644
--- a/src/controller/TrainController.java
+++ b/src/controller/TrainController.java
@@ -10,7 +10,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
+import model.*;
+import services.*;
 /**
  * Servlet implementation class TrainController
  */
@@ -31,7 +32,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 	
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+	int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String berth=request.getParameter("berth");
 		String date=request.getParameter("to");
 		System.out.println(numberOfPersons);
@@ -68,6 +69,6 @@ else if(berth.equals("nonac")) {
 		request.setAttribute("trainfare", trainfare);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/trainView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/model/Bus.java b/src/model/Bus.java
index 430ca5d..319f40e 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,45 @@
 package model;
 
+import java.time.LocalDate;
+
 // Type your code
+
+public class Bus
+{
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBusType() {
+		return busType;
+	}
+	public void setBusType(String busType) {
+		this.busType = busType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	public Bus(int noOfPersons, int rates,String busType,  LocalDate date) {
+		this.noOfPersons = noOfPersons;
+		this.busType = busType;
+		this.rates = rates;
+		this.date = date;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/model/Flight.java b/src/model/Flight.java
index 9ac54b5..9d43b6a 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,60 @@
 package model;
 
-//Type your code 
\ No newline at end of file
+import java.time.LocalDate;
+
+//Type your code 
+public class Flight
+{
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getClassType() {
+		return classType;
+	}
+	public void setClassType(String classType) {
+		this.classType = classType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getFrom() {
+		return from;
+	}
+	public void setFrom(LocalDate from) {
+		this.from = from;
+	}
+	public LocalDate getTo() {
+		return to;
+	}
+	public void setTo(LocalDate to) {
+		this.to = to;
+	}
+	public String getTriptype() {
+		return triptype;
+	}
+	public void setTriptype(String triptype) {
+		this.triptype = triptype;
+	}
+	public Flight(int noOfPersons, int rates, String classType, LocalDate from, LocalDate to, String triptype) {
+		this.noOfPersons = noOfPersons;
+		this.classType = classType;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.triptype = triptype;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..87f0986 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,62 @@
 package model;
-// Type your code
\ No newline at end of file
+
+import java.time.LocalDate;
+
+// Type your code
+public class Hotel
+{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getRoomType() {
+		return roomType;
+	}
+	public void setRoomType(String roomType) {
+		this.roomType = roomType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public String getOccupancy() {
+		return occupancy;
+	}
+	public void setOccupancy(String occupancy) {
+		this.occupancy = occupancy;
+	}
+	public LocalDate getFromdate() {
+		return fromdate;
+	}
+	public void setFromdate(LocalDate fromdate) {
+		this.fromdate = fromdate;
+	}
+	public LocalDate getTodate() {
+		return todate;
+	}
+	public void setTodate(LocalDate todate) {
+		this.todate = todate;
+	}
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+	
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = todate;
+	}
+	
+	
+
+}
\ No newline at end of file
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..16c1def 100644
--- a/src/model/Train.java
+++ b/src/model/Train.java
@@ -1,2 +1,44 @@
 package model;
-// Type your code
\ No newline at end of file
+
+import java.time.LocalDate;
+
+// Type your code
+public class Train
+{
+	private int noOfPersons;
+	private String berth;
+	private int rates;
+	private LocalDate date;
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBerth() {
+		return berth;
+	}
+	public void setBerth(String berth) {
+		this.berth = berth;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	public Train(int noOfPersons, int rates,String berth,  LocalDate date) {
+		this.noOfPersons = noOfPersons;
+		this.berth = berth;
+		this.rates = rates;
+		this.date = date;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/services/Booking.java b/src/services/Booking.java
index fe2c822..89b3396 100644
--- a/src/services/Booking.java
+++ b/src/services/Booking.java
@@ -2,3 +2,10 @@
 
 // Type your code
 
+public class Booking
+{
+	public double booking(int noOfPersons,int rates)
+	{
+		return noOfPersons * rates;
+	}
+}
\ No newline at end of file
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..87a527a 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,47 @@
 package services;
 
-// Type your code
\ No newline at end of file
+import model.*;
+
+// Type your code
+public class FareCalculator extends Booking
+{
+	double fare=0;
+	public double book(Hotel hotel)
+	{
+		
+		if(hotel.getFromdate().isBefore(hotel.getTodate()))
+		{
+			if(hotel.getNoOfPersons()==1)
+				hotel.setOccupancy("Single");
+			else if(hotel.getNoOfPersons()==3)
+				hotel.setOccupancy("Double "+"Single");
+			fare= hotel.getNoOfPersons()*hotel.getRates();
+		}
+		 return fare;
+	}
+	public double book(Flight flight)
+	{
+		
+		 if(flight.getTriptype()=="one-way") {
+			 fare=flight.getNoOfPersons()*flight.getRates();
+			 return fare;
+		 }
+		 else if(flight.getTriptype()=="round") {
+			 if(flight.getFrom().isBefore(flight.getTo())) {
+				 fare=flight.getNoOfPersons()*flight.getRates();
+				 return fare;
+			 }
+			 System.out.println("Enter valid date");
+		 }
+		 return fare;
+	}
+	public double book(Train train)
+	{
+		return booking(train.getNoOfPersons(),train.getRates());
+	}
+	public double book(Bus bus)
+	{
+		return booking(bus.getNoOfPersons() ,bus.getRates());
+	}
+
+}
\ No newline at end of file