From 4741291021db012e4425d6b314316bd1f05e4d36 Mon Sep 17 00:00:00 2001
From: VasaviKashyap123 <65177128+VasaviKashyap123@users.noreply.github.com>
Date: Thu, 16 Jul 2020 20:45:45 +0530
Subject: [PATCH] modif

---
 .classpath                                    |   6 +-
 build/classes/.gitignore                      |   1 +
 build/classes/controller/BusController.class  | Bin 1471 -> 3098 bytes
 .../classes/controller/FlightController.class | Bin 1313 -> 1561 bytes
 .../classes/controller/HotelController.class  | Bin 1315 -> 3103 bytes
 .../controller/InheritanceController.class    | Bin 1353 -> 1353 bytes
 .../classes/controller/TrainController.class  | Bin 1309 -> 2954 bytes
 src/controller/BusController.java             |  13 ++-
 src/controller/FlightController.java          |   4 +-
 src/controller/HotelController.java           |  15 ++--
 src/controller/InheritanceController.java     |  37 ++++-----
 src/controller/TrainController.java           |   9 ++-
 src/model/Bus.java                            |  43 ++++++++++
 src/model/Flight.java                         |  63 ++++++++++++++-
 src/model/Hotel.java                          |  59 +++++++++++++-
 src/model/Train.java                          |  44 +++++++++-
 src/services/Booking.java                     |   7 ++
 src/services/FareCalculator.java              |  75 +++++++++++++++++-
 18 files changed, 328 insertions(+), 48 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..683f1fd 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,4 @@
+/testing/
 /controller/
 /model/
 /services/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..44dda136cf15430ef00accdee976130689341057 100644
GIT binary patch
literal 3098
zcma)8TW}lI8UBtfY1iv@z=A+z8sbnw?8wOiX;QF4An_#;D7I?{Cn2=3mX7Upq+PMQ
za-24ldkeIsO=&4<xwkWYfd|?dCxIDecw>0umEnme9)PFLbeLfnzO!1(vK<2&d(YYb
zob%tl@BIIM_{}@-0r(02rJ+S&Q_*un-z%4;Zyl@!1C2Kg34!b9?0I{^3Zy?@mZ3Ep
zhE?k@9}{(fz?EEb?DC}a1IKgk%?}EQy9GL^CkSmfoV3d|nWR1S69TDyj_ZW`1zLN0
zCj}A%UP&5g#Rd}w+6AsCIIbM2Ri>nW)SfC!fpozu(tu4fe2;~RaMlR~x(e%gpA$%y
zyhAb+81E^3cNF9Dp_&ZB-1lw^s*FnJl;g(GLQz&j#vEw4c1@z<{4_Rc$Ov4e+^`(a
z%8xb{+Hf5<Yxof}8LgIWcgC7H6NIv2;(BahqP!Y|*cdsd4v+bc8%~72v@1CsTbZ&U
zHzWw|On1rao{^z}A7h(_8=DL^oiT9}whL%grKapsb3Hv)-EycDF+v@^<c4)@=-|%$
z$gnl<$kT!4xFxx;Yc8m^Ba59H`UJN9pwyb!1xw&+dKV{q&<Uz`Se%u<z@E!_unLSd
z$8zns1-mueDzIgx4{NrXB>NtQJni|XZNDUN*J?(@aIHgx#%dG(nqMc4!1h(1uD&Bn
zN(FRZ)-?#Mc3|zH*cO>qYD(4CRmRrDO5UeR-k2AJI(W;pDlaBEssOvo!~q->Fp0vL
z?b{Ve+6dgVZuVDD!oVPgH4F)KE)z9R=FLdo#33AJd{x^IBxUQ6DzAg3L7S=t;hCz`
zQQ#eAk?<qNjwoV|vLf{475jchb#^h3HhnZOfqOL^U3o_$rka?<F@{Vq>@o|&3NnvQ
z&B<bz>%C9M36><KuHpn`DVY=<Ck5IlT6+DtK)dU?OEz^pKy$I6ams*=qK2uZs}(vG
zX+`yEkdB%tfdwlWr9r@IPVB&}?N2DmxJ4F_`ej~uI;UZVE>&0%%c>F^n1-XO;+#NV
zPd;Bi(|k)WtEG2R9W0xusBCTsWH{oDPLI`Tpq4xnRkfsZX`Eh1h6rJx%7Q^5Z675*
zYH!WNJWdlcidBRx32{)XeD9sqa7N%-c7u7RC<ANQ_T_+GF4oF+=n=sMY*3H0CLYGG
ziSm@^ouYd^g+{!&-a%El9#uSeOz~h)@!$y-KoUmr_bC&<!Eec5I&&Z-{8KgM(e~yv
zvo5Oo)s(9x5>VGOb@ENqH3PrHA2j@a1*HbP8as@M=kQ1FoL8M|bXsw0Fa|72etj29
z?>Y9LRRxlsPO?&}63M#kMs2K-e0IjXYG=#WC-#=XmZIb)eT4@tUKUvrv?*IWqyiDh
z6xK;POF=>@q+NF9j)~ANo;qSz;|^*}cs0K$hn=X$67%KGze{;Y#p5+s!93{%4)b!r
zb-mDzIv&e@<l*v%f!$cNj>)OGVA6s1nqMBXLtbK+aV0D!2wOo+)z<*JkVJ~3#<v#e
zl#+pH=hLKQH%GxSx#I#l-j23h!KcBkKn4kR&MP@H>zmMtG~W`q3RiQ-M$S_lufe8B
znM>sf%DVo8u5|YzZpfy4E@4LtMs{ZVF5%`@EL%uNJGaoGZff01TQ@|OcGNY*mZ%GR
z@zcn97jDDtwAP6>^dlG9+IKlWS{|lX9gMvro4(@`?rgzD4D8RQ^U=INkxk!IpC#$%
z=0zOgkV(*8H6}S`66vu;jGsq)XX4YnsefaPlH;)?`H7P3r{um^qUlP~N6G!MMEp-l
zs5JeHSkm&PlIWeSpY2U$k{9t{zxFPsPi)?p$|N${1<dyA8J)hI%IF(Yi*Pf#^5`KB
z+9JYtv2fx7e%araY0Kz~_|@$OUEO3X;*o6n@r-^6PqrePetMH}5zodie~J>{Z)VJ<
z)VD%``)Az9XAdFkC3HIoKo;B42MaryYKsl*W(>3O=W#2W!fqUAYd?uSkc486J1PX?
zG@&?47#<-I&tM;~^Bp*cJMjVz;$?QRw=jhNQp-E+TJPg9KEU1h2nBqMBlr{}_#C77
z3S**`O~}M}1pS+YmY^*`&shvTXLaaJA?W?{g#H@*pBn!{vUKAM{FSpLt+mqr^928R
zV>Z{Aoo&pXYs_9?9Q6|~vtAeQH{O!B@F1SRizMbpjO#r9PP%=}Ec^p6!JxlJL_U*I
pg5*nmgS^l%!M{%azE<D!EqH}%EqE2Laoj-izRv$QPC^9u=eG<A7$E=v

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..6d9d7b5a4b7cdf8c558db5d4ae46c2839df6c070 100644
GIT binary patch
delta 363
zcmZ3;HIql+)W2Q(7#J8#7;M-Xm>3zPCtj4^sIARh&(2`L$iSbKSeB@tlbDyT?^;xp
zU&O&+#K>?gG_NSNI6tQ>HANvgKer$=C$S_mKTn~cC_gDDHMiJGfs4~ECo?^xL?Jmb
zFE77DAt_Y>uA?MhAyJ{EvLF?|A|zFbMXAn-Imx9!Yx0W-8A*a-E(U!D6CMUG22(}`
z(aDTVB8*|1!<cg!gH0HifslcLYd3>_q>$lu2IKue9uosUkYr<E1d;{}0zi@n%;sVc
cWDo+&n}JDl1`8m~2b8k}VykEd#$pC*0C4qSEC2ui

delta 128
zcmbQqvye;R)W2Q(7#J8#7);q2m>3zPCtj4^sIASsIg%xpG0q++!wkfX8-WB913!>t
zV_*c5b_@bQQUM~#AjlvD<N=j2XfSAk<rx{Y7_@;pm>Bed;!F$%42D3O4=85@#KzGK
IjKvHl0O$4%>Hq)$

diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class
index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..c4a308132d1c5f35244c0c67f58ecd96fc629355 100644
GIT binary patch
literal 3103
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
VK?r`%aez_y3;w_LEJTQ3{s+HWC7l2O

delta 143
zcmbO)v6zeN)W2Q(7#J8#7)&>Ec`;A+<T%PI$-u%OHCdQ5lvAF8lR<$&kU?>BA*V+?
zgFR3oGY~Uw1QJXP{6Lb8fe}c$F$e%j1&Ab2y%3NGRK}pepb3^|WYA*J2I^p9&<Bb$
XF&Hoy0%<;=oDmQkM>8-MGnfDXC#(;k

diff --git a/build/classes/controller/InheritanceController.class b/build/classes/controller/InheritanceController.class
index ccdac37b9ec6bc1d6d0dd443592c401239adba26..ff1d49d571543eb192c8fc7e41bd881734aa2eef 100644
GIT binary patch
delta 41
xcmX@fb&_j?DGRG00}F%jWGj|XP6-B11}O$X2ARn-STa}@7}yw;CbP1-0060j2N?hW

delta 41
xcmX@fb&_j?DGRGG0}F%bWGj|XPALXX1{nrH2D!;ISTa~u7}yxpC$qA;006442P^;p

diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class
index 167c49557346d52c778488cb5592000d897d146d..72c29862546ec983c793d876de437d8047ea9f8f 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..da4e40c 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -10,6 +10,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Bus;
+import services.FareCalculator;
+
+
+/**
+ * Servlet implementation class BusController
+ */
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -28,7 +35,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 +79,6 @@ else if(bustype.equals("nonacsemisleeper")) {
 		request.setAttribute("busfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp");
 		dispatcher.forward(request, response);
-*/	}
+	}
 	
-}
+}
\ No newline at end of file
diff --git a/src/controller/FlightController.java b/src/controller/FlightController.java
index 7760e3c..a045288 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -29,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"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -59,6 +59,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..29b5ec9 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -10,13 +10,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
-
-/*import model.Hotel;
-import services.FareCalculator;*/
-
-
-
+import model.Hotel;
+import services.FareCalculator;
 
 @WebServlet(urlPatterns={"/hotel"})
 public class HotelController extends HttpServlet {
@@ -33,7 +28,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 +62,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp");
 		dispatcher.forward(request, response);
 	
-*/	}
+	}
 	
-}
+}
\ No newline at end of file
diff --git a/src/controller/InheritanceController.java b/src/controller/InheritanceController.java
index 58b2d66..02d0e05 100644
--- a/src/controller/InheritanceController.java
+++ b/src/controller/InheritanceController.java
@@ -9,32 +9,27 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
-@WebServlet(urlPatterns= {"/index"})
+@WebServlet(urlPatterns = { "/index" })
 public class InheritanceController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
-       
-  
-    public InheritanceController() {
-        super();
-      
-    }
-
-
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-				
-				RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/index.jsp");
-			
-				dispatcher.forward(request, response);
-		
+
+	public InheritanceController() {
+		super();
+
 	}
 
+	protected void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
 
+		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/index.jsp");
+
+		dispatcher.forward(request, response);
+
+	}
 
+	protected void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		doGet(request, response);
 
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		doGet(request,response);
-			
-	
 	}
-}
+}
\ No newline at end of file
diff --git a/src/controller/TrainController.java b/src/controller/TrainController.java
index dcc07df..b62b4b0 100644
--- a/src/controller/TrainController.java
+++ b/src/controller/TrainController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Train;
+import services.FareCalculator;
+
 
 /**
  * Servlet implementation class TrainController
@@ -31,7 +34,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 +71,6 @@ else if(berth.equals("nonac")) {
 		request.setAttribute("trainfare", trainfare);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/trainView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
-}
+}
\ No newline at end of file
diff --git a/src/model/Bus.java b/src/model/Bus.java
index 430ca5d..016fbff 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,46 @@
 package model;
 
 // Type your code
+import java.time.LocalDate;
+
+public class Bus{
+	
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	
+	
+	public Bus(int noOfPersons, int rates, String busType, LocalDate date) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.busType = busType;
+		this.rates = rates;
+		this.date = 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;
+	}
+}
\ No newline at end of file
diff --git a/src/model/Flight.java b/src/model/Flight.java
index 9ac54b5..8dfeead 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,64 @@
 package model;
 
-//Type your code 
\ No newline at end of file
+//Type your code 
+import java.time.LocalDate;
+
+public class Flight{
+	
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+	
+	
+	public Flight(int noOfPersons, int rates, String classType, LocalDate from, LocalDate to, String triptype)
+	{
+		super();
+		this.noOfPersons = noOfPersons;
+		this.classType = classType;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.triptype = 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;
+	}
+}
\ No newline at end of file
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..66274db 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,59 @@
 package model;
-// Type your code
\ No newline at end of file
+// Type your code
+import java.time.LocalDate;
+
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = 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;
+	}
+}
\ No newline at end of file
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..3b9ea6d 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
+// Type your code
+import java.time.LocalDate;
+
+public class Train{
+	private int noOfPersons;
+	private String berth;
+	private int rates;
+	private LocalDate date;
+	
+	public Train(int noOfPersons, int rates, String berth, LocalDate date) 
+	{
+		super();
+		this.noOfPersons = noOfPersons;
+		this.berth = berth;
+		this.rates = rates;
+		this.date = 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;
+	}
+}
\ No newline at end of file
diff --git a/src/services/Booking.java b/src/services/Booking.java
index fe2c822..32570d7 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) {
+		double d = (double) noOfPersons * rates;
+		return d;
+
+	}
+}
\ No newline at end of file
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..f979d4b 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,76 @@
 package services;
 
-// Type your code
\ No newline at end of file
+import java.time.LocalDate;
+import model.Bus;
+import model.Flight;
+import model.Hotel;
+import model.Train;
+
+// Type your code
+
+public class FareCalculator extends Booking {
+	Booking b = new Booking();
+
+	public double book(Hotel hotel) {
+		int noOfPersons = hotel.getNoOfPersons();
+		String roomType = hotel.getRoomType();
+		int rates = hotel.getRates();
+		String occupancy = hotel.getOccupancy();
+		LocalDate fromdate = hotel.getFromdate();
+		LocalDate todate = hotel.getTodate();
+		double d = 0;
+		if (todate.isAfter(fromdate)) {
+
+			Double data1;
+
+			data1 = b.booking(noOfPersons, rates);
+			return data1;
+		} else
+			return d;
+
+	}
+
+	// method flight
+	public double book(Flight flight) {
+		int noOfPersons = flight.getNoOfPersons();
+		String classType = flight.getClassType();
+		int rates = flight.getRates();
+		LocalDate from = flight.getFrom();
+		LocalDate to = flight.getTo();
+		String triptype = flight.getTriptype();
+
+		double data = 0;
+
+		if (triptype == "One-way") {
+			data = b.booking(noOfPersons, rates);
+		} else {
+			if (to.isAfter(from))
+				data = b.booking(noOfPersons, rates);
+		}
+		return data;
+
+	}
+
+	// method train
+	public double book(Train train) {
+		int noOfPersons = train.getNoOfPersons();
+		String berth = train.getBerth();
+		int rates = train.getRates();
+		LocalDate date = train.getDate();
+		double data = b.booking(noOfPersons, rates);
+
+		return data;
+
+	}
+
+	public double book(Bus bus) {
+		int noOfPersons = bus.getNoOfPersons();
+		String busType = bus.getBusType();
+		int rates = bus.getRates();
+		LocalDate date = bus.getDate();
+		double data = b.booking(noOfPersons, rates);
+
+		return data;
+	}
+
+}
\ No newline at end of file