From 1c2deb2878b052354a276c56a28297f8d835033d Mon Sep 17 00:00:00 2001
From: subhamBakshi <your_email_address@example.comsubhambakshi1>
Date: Tue, 18 Aug 2020 15:20:49 +0530
Subject: [PATCH] FSJ0620D111

---
 .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           |  10 +-
 src/controller/TrainController.java           |   7 +-
 src/model/Bus.java                            |  47 +++++++++
 src/model/Flight.java                         |  64 ++++++++++++-
 src/model/Hotel.java                          |  63 ++++++++++++-
 src/model/Train.java                          |  49 +++++++++-
 src/services/Booking.java                     |  14 +++
 src/services/FareCalculator.java              |  89 +++++++++++++++++-
 16 files changed, 345 insertions(+), 20 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..a6ecc5f 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,3 @@
-/controller/
 /model/
+/controller/
 /services/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..82c83026472ce525039057db73cae0f946776981 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..ea3fef41a39fa856eae6ca868f4d2fc23343fc19 100644
GIT binary patch
literal 2923
zcma)8*;f-+9R6+y%#aKqQPk1m(z*aqr>#4&ZXlY9prBZ^t(}AmjD}2{nILx8Zg#c%
zX&?2a5A91|Q0qB8J$-EblX}{IcP3&8YRi&)=g#l`mhby5`Qz_jeg&`%-)e{ntjxQ`
zz;g=)=~;aRXJRtwnLE%B7g%-Pp0;N!UwYF88Ca7+P_mBjV>mhxSj1P3T^Ny`@3_TN
z*<Jzhyg(E6_<>yvM(jda*3+c=5dsZ+oT3x#6{zdz91)23xMMPbIy4(dASuw&?-b=g
zc`7HplXk8k1ycQPo(621;dA9M9!xsEKzsjV0>}u|kGY3sATZR?|M)<L<i)b|gUo-5
z`6UJ>Gs^eGp_#la1q|EQuxtTV6^Q19G?)U5l^d4hTG_$57dlo7EVoV{I=DGI&}U6M
z@{(^k#W6Xv<-A`?q8+O>tP)uNzd|su25SYDOvs=TRIlTg>>xiWJ%Q~J5LUr1PFTZ%
z=M*P0oi#x(xRy!cDXiD9PGI$X9~Ouj*no`!+PLdovb`~Z{k6zfV0i@Kb8o9~*1U)u
zfsHku)~4fqr2@JqBMkzz4lKM>u|-D5s-Rk1V{AdJ%&&$q_qgi^I-X|CCDs6QK@s+>
zfvwmkV3395wr5YtK%u|kk?7AOB!L~+rD3N)YnUz}S=nMBC!}X!H@X>L$@YB7Gl8~;
zDb4EG!}QM=Y~R<xa*L09?v#%G0<pl=agZluzodf&+bCybz8pByti(PX(Que`{lIdR
zCI+%#VK<NqyTH<$XLc}mUgm>L=a~fhF`(ht{Y(#>DQSfT+-nEYz#xv(t<ZS^tJ?FP
zN!uG%L>KccuMm4{{_Tv0AwoLEj!~#|s{~Hqr0N`}1cp1Z+2~qzaz9kjV-BnDc8)0h
zrwzP-QGsS(1_SQk`0<El0@#s_B+eRmQAy~O7-E>dy7sbxb9jaR@~}tIaPo4A-E1Cg
z_X{wzlQWP9D@NmmK9a?rP{F4LhREo+fe9sEPw|tk21j5Sd-1fBm%i0!d$Pwa<jVy+
zaJ>X3(X2iS2BuJ?=Q-EC!0hViuLd*I*{h>OipRrApz@gM=7Tw=f;bQ`VRGewL2Rrh
zt`bBQ^!Kx2M8`CXDpEI2mlBx4s~RrPORrwH%)V~mHN4K?r`5a|99KZ~R<a<ZB$CSL
zc#~bfrdLJ=M%Xu1!{iJphV!F}Dv@QDhs6+tETpQut@uy+R6#`V>pexI0ynTdRbvm$
z7!EO6Bn8d$VN}J&U<J(nM-al!5my#CD_MR`!-1W@aLg`+vrWTwHj4Re_E9a1;10WG
zFE9HXH7VO_NB9<{hJFl{iz<gk9N!_-2Z}{Eu*12<p%O;+V8YvTFRjxuS82y;l7_^P
zAS*%}Yr*i<Oveh;qk*f&rx<je(k~?WY4Bt#SHZQu>lT`R4n<n{nV=}J9C2P>#GMfd
zp%p1U#jzMmDAC4!1J|XLRLXKx9_N}$r&ip-6EO^IPH(z{C+qM)b93m{Dl}p>wXF%Y
zcSW}<+Ib%x=nO5U(1kQDH1c;7Hi!DRJj`~im7yt5@1;}L9Xu1mZEWA0PG!P<cRZbX
zF51<nQ~RP_LppUJ+G%Dy)iaAj-y_-D-oHct0eb7=Yddta{x*(wH<}G<N!-PW(e^go
zjGK*S!qjeIxI1Yk+h;LiCfoE`oH3JTd=@WpX`F@4B{2(m7n7s6aK76x4Kq253%i@r
zDc4Ni!NoeHQ|0ANw{fZR@J5JPcZ=Clg<2gHA2}inj(G#?i1vEowt>iO<Tu4G>?J}y
zM5hm1a1>8t2+v@Y#7^<8kL`Gs^XdwA;u?10I=b;4_TUDd!;idq8~gA(_Tx_+2+_M4
zVK~Rcy*VcCRhTgF8{Wd(WMV01srM?mTZ5md>nani3pc6lDzjo6?YzUCM&Ii2E^p}c
z?n-4hM6ce%`($;LK7PPmg8rUEiC!joa~nRyM~wCcWBVANpov~4!VGA^ry&xte;BZ?
oL1<{#@EMoBxj*19_3b!@&nX(i7x<EEGZX47{(pTI!pArN0ux8@0{{R3

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..d6b28874b15d5b6773459211e9f468f7fbcbf99f 100644
GIT binary patch
literal 3103
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
V1R?k_#{ov+Px$}V3lJfG`X30XCWHV0

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/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..2e78db4 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Bus;
+import services.FareCalculator;
+
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -28,7 +31,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 +75,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..645d836 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Flight;
+import services.FareCalculator;
+
 
 
 @WebServlet("/flight")
@@ -29,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 classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -59,6 +62,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..2775534 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -10,10 +10,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Hotel;
 
 
-/*import model.Hotel;
-import services.FareCalculator;*/
+
+import model.Hotel;
+import services.FareCalculator;
 
 
 
@@ -33,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"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String roomtype=request.getParameter("roomtype");
 		String occupancy=request.getParameter("occupancy");
 		String from=request.getParameter("from");
@@ -67,6 +69,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..3764d7e 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);
-	*/}
+	}
 
 }
diff --git a/src/model/Bus.java b/src/model/Bus.java
index 430ca5d..a14d993 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,50 @@
 package model;
 
+import java.time.LocalDate;
+
 // Type your code
+public class Bus{
+
+	//instance variables/arguments
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	public Bus(int noOfPersons, int rates, String busType, LocalDate date) {
+		super();
+		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..5f4fab9 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,65 @@
 package model;
 
-//Type your code 
\ No newline at end of file
+import java.time.LocalDate;
+
+//Type your code 
+public class Flight{
+	
+	//instance variables/arguments
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	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;
+	}
+		
+}
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..ed62a09 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,63 @@
 package model;
-// Type your code
\ No newline at end of file
+// Type your code
+import java.time.LocalDate;
+
+//class hotel
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	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;
+	}
+		
+}
\ No newline at end of file
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..35b55fa 100644
--- a/src/model/Train.java
+++ b/src/model/Train.java
@@ -1,2 +1,49 @@
 package model;
-// Type your code
\ No newline at end of file
+import java.time.LocalDate;
+
+//Type your code
+
+//class train
+public class Train{
+	private int noOfPersons;
+	private String berth;
+	private int rates;
+	private LocalDate date;
+	
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	public Train(int noOfPersons, int rates, String berth, LocalDate date) {
+		super();
+		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..2a8ef71 100644
--- a/src/services/Booking.java
+++ b/src/services/Booking.java
@@ -2,3 +2,17 @@
 
 // Type your code
 
+//parent class
+public class Booking{
+	
+	//method returning rates
+	public double booking(int noOfPersons,int rates)
+	{
+	
+      double d=(double)noOfPersons*rates;
+      return d;
+		
+}
+	
+	
+}
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..a084063 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,90 @@
 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
+//child class inherited from parent
+public class FareCalculator extends Booking
+{
+	Booking b=new Booking();
+	
+		//method hotel
+		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;
+			
+			//condition check
+			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 ;
+			
+		}
+
+	//method bus
+	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 ;
+	}
+	
+}