From daa17230aff45781ec43a686c8031fb9d6345771 Mon Sep 17 00:00:00 2001 From: GurramkondaYaswanth Date: Sun, 16 Aug 2020 18:58:40 +0530 Subject: [PATCH] FSJ0620C106 --- .classpath | 6 +- build/classes/.gitignore | 3 - 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 build/classes/model/Bus.class | Bin 0 -> 1297 bytes build/classes/model/Flight.class | Bin 0 -> 1761 bytes build/classes/model/Hotel.class | Bin 0 -> 1782 bytes build/classes/model/Train.class | Bin 0 -> 1297 bytes build/classes/services/Booking.class | Bin 0 -> 421 bytes build/classes/services/FareCalculator.class | Bin 0 -> 2709 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 | 62 +++++++++++- src/model/Hotel.java | 66 ++++++++++++- src/model/Train.java | 46 ++++++++- src/services/Booking.java | 9 +- src/services/FareCalculator.java | 90 +++++++++++++++++- 22 files changed, 330 insertions(+), 23 deletions(-) delete mode 100644 build/classes/.gitignore create mode 100644 build/classes/model/Bus.class create mode 100644 build/classes/model/Flight.class create mode 100644 build/classes/model/Hotel.class create mode 100644 build/classes/model/Train.class create mode 100644 build/classes/services/Booking.class create mode 100644 build/classes/services/FareCalculator.class diff --git a/.classpath b/.classpath index 2846539..20c137d 100644 --- a/.classpath +++ b/.classpath @@ -8,10 +8,6 @@ - - - - - + diff --git a/build/classes/.gitignore b/build/classes/.gitignore deleted file mode 100644 index 0b6c10d..0000000 --- a/build/classes/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/controller/ -/model/ -/services/ diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..82c83026472ce525039057db73cae0f946776981 100644 GIT binary patch literal 3098 zcma)8S#TW18U9+@-5HHW1}zAC1qK;>NM6}PAa;V*F}5WOFUXS68rjA<811&Ck#}d7 znORv*Ot?w7%zfVpRlL9hP$k*wrwd%+5%KVO!iH5-Oi z>j)o(x=p8632seO*?g!=_rd;2B@ z5`$hz8fe7^69(D^t{8D#Ia;esN&lEVRh9zj5wA!CHqG!o7AC@3ClKf!SLA4!O?9$LLuR1g@rcak7V;plXN3S?LSxxts^9z*uuE z*Nz|IRt>iZ+_2JzHCs)ReGfyP_WU!pUlKU5nh`Nv>ky%_+JwL6*GVI=W0j|?@5qu; z0o|8%4FanjSbHe8MW&USQnh83u{E)h_otJcnrfNZWwkmau z@Q$)b_z`1A6*0$H5qk5AeRorxT@0j69}N_6kA`C_??}W{6O%a3kO_ueWrjB3HTr6muGGL>qVQT4Wg-%6U zQGFVsqb5pV!AeGH5U`pPJ2-3m1w|RR$O2No%qvglG|bSY3JYRcRbm6va8y;C6X@^F z=j&&hZ|P;V^i8URWfK*Z%?*JJN4>G>@j4CEl4qi-mUJ#n(Cf$$Aq-SmFes$$W5h@8 zt(lm|8Dd7UijXBC4r-O}eUlo_3T$LIn0JaYu!e144%+2nt!#%L5nR9q^*CqZ0sNLI zPkG*Hy4O3>h&R_aq$<}#iU$uX9t3Dk z_McS+lAcboQmPWky6i@6tdV?n#=L50%hxCNmcf>y0y;j8wp_ud!L2|S64;04tL z@&skwpP@V5vxpnB>E27&*@Dqs+5StoxfRP6($UUq>Cko5x)~WZVr6M(T|;b%y08~N ziL7_yr?`#QI?;v!5_DIMNsgIBdVCQRZ=k(1@%`S^M;NE%L@Y`ESxNR&a&IirbS3GhtkFI(<2v(YsQMa5K8{=zb2` zBEm1RaPk6vJv&20u<-DE7{!EE}GjD87^wIZAT{U+lgo{C?dj}kv%X3VD4 zw?cvYBDV6mm5^;CblcH`9sKQug+8V_%LdkuVeCSl9~1>jPvB;p;)j65Etn%?Ds1&< zum|S|&4WDgB!M|kXkH*FuVO#m!2x_iEuZ5MzQ7>9W>@=$8o$L6d`GR{<4*h)ci~@b zPOUg9OpHd*e@tiz+7k4f#n5wBhu#!|-oHfXufad5n+a delta 147 zcmbOwv7ejk)W2Q(7#J8#7@Rk9-D952%5jiYjDdwgV)AK@SY8LU21X$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*yvM(jda*3+c=5dsZ+oT3x#6{zdz91)23xMMPbIy4(dASuw&?-b=g zc`7HplXk8k1ycQPo(621;dA9M9!xsEKzsjV0>}u|kGY3sATZR?|M)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~RL=a~fhF`(ht{Y(#>DQSfT+-nEYz#xv(tKccuMm4{{_Tv0AwoLEj!~#|s{~Hqr0N`}1cp1Z+2~qzaz9kjV-BnDc8)0h zrwzP-QGsS(1_SQk`0dy7sbxb9jaR@~}tIaPo4A-E1Cg z_X{wzlQWP9D@NmmK9a?rP{F4LhREo+fe9sEPw|tk21j5Sd-1fBm%i0!d$PwaX3(X2iS2BuJ?=Q-EC!0hViuLd*I*{h>OipRrApz@gM=7Tw=f;bQ`VRGewL2Rrh zt`bBQ^!Kx2M8`CXDpEI2mlBx4s~RrPORrwH%)V~mHN4K?r`5a|99KZ~RpexI0ynTdRbvm$ z7!EO6Bn8d$VN}J&UlT`R4n#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!PiO?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(i7x3zPCtj4^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 zcma)8+jARN8UGzw_DZX@U8_l(4N23qO=3k&mNsc z)!ic};no77g+dE%xs^MGf#IpZgOku1242fE!wWMEZw&bt7~pqyWkr&0z?VH|&pF?B zzVG+@F8kiUe)~HB$MG`*34z@e-&28KtI5DQ=POwoYrPvt3fydA@5%DfC_-T9gn$d>&IFK~Gc-~hYZJ#(ZqG48BZ<(1H>dJFRE(Mw@HgT2^i;68x^|Cb9E?#F(C9ZOO* zohnwtx~nS7G7xwy2EwVi-jXw;f~vPv$aOirNvx2;gE(N|A%T6JHf%a-;UEqP7>j;z z#SIn&PIn{Ugk>ARTf1#I8$nEtz@aWnyQ6VKsX!`_u?B%|12zja?;@iMZBXs+x@?oL zjIX{0f65P43h$@Sb*2DgK@;|H*i;^(&!)D7X1!FOq{^u20kD#6opGf zR>@OxNd^|4zzF@TyFn3Y7~5bMO~}Q6qs;nzfx(`U9WO2h11Nu#lT-l z;fz2+`6h}OH*j_%LRED|I#J#gT_r6%g>%fN=u!cv{l>9nH<-}`c@?HbgqhPRT}Xii zAu&2;qKpXxPqS#;@hc8O3zL{4o>b)4nAaUnP0nAE6;;SRm&P<^4a{^ZxE3n8V&PdZ zCwu&ch9owFX*R_OSG+>HD+LoD!E**KZ1~u@ZQ*%*RI{ihY98?!F6HL5%*XZCC%SCf z$elR@u0UpmRjd{lP!ktX(Z!6>KQmm4O=-`!Eta-~ZOcV%(nTy9Va?Gt&8Z}q>fr$nN^y8X^PvTRAb>8Twzab3UJ(Y&aewOC?u#<61G?#Q{@9`SF3?K(otE+X1A`Yx*Z( zm$zYr*Ce$l%_vfOM!A*CPrLP~uNwFPt5j!=->zP=T+aB7pd!bsx=Ziq`g%C3wa|>| zhNpd)tATB;f$b zI7ny@5x8M~$L3Jr>w}`vlBJOsRI17Kp*YI@`cMtwVt!t$E ze*BTT*BFEc`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..72c29862546ec983c793d876de437d8047ea9f8f 100644 GIT binary patch literal 2954 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 WA>(AppQ@+Xl3$Ek{BLw44*vrPUAQ9v literal 0 HcmV?d00001 diff --git a/build/classes/services/Booking.class b/build/classes/services/Booking.class new file mode 100644 index 0000000000000000000000000000000000000000..399892d705aacacc15cdb0ed16fe300e4ae79ca9 GIT binary patch literal 421 zcmZ8cyH3ME5S(-DIB^UK;Z;CG7pK4t9f$%DQcy$?LFv!tNG=$kWIOo9<*`3|}{`vd@aDsgwjzFhW#ZsrLj4zCN*7?+j%j#S%Wt_=;8jq5>N-Kf- zna*`}E>P=569M+`HpDgZsYC-JRY^dJwu%xID_{hRfIz8Qsa?VXtD9`xY-s71wzakP zL;Bs?&U8A{Y5lR&PKz^jrhh>HsJ7?5Y(kA+umOv-*N%h=6ulx8`)m6z`tV=dPG} z1(D5U)gYO(J~p0V8Y?ksyM{Fo9|@ru+f}qE*ix~fVFy|jgqIC>!k%23GMv1fWoRND z6COJ?>_U`2JTPtBnc1}*K{dzX#mU(#yuK3 zMGTF`$#lAq)3fO{v9VXfKI|_BPdRpGksegO6x=m4Mncjb;f9PK(-0RPbqqCYi}NA$ z;Gl{F3YsLMY9|f7NDz*hA2OC~htc=Nipb@;^onC=?ZmMB*~}EbT!+JWM#aZ2Js+OiW#2^ z;v_pKPh~BVJcZLLo~?!>W!Er-VIDMY6m*M)s|q%`aLq`&1M$nE+sPd1|h zza#pOtzws2jy_A}F7ql^-7aEQUD;OjE0b2Bj1bX`tEaD@*K^(sHk1Y|Wtqz>6qysY zEGBG)onD-<;*K!4i{-iot2770mY&axVGe-J6%{@4TaJu z&N^n!rFRgoCn&Q z(k(&hZ5E(NNp6I2OE9{H+Zx`J#U#if!*N%H@s5TMN^Hd7l7lP4Z5Fi{opxSxF6HtS z2R~d=bf}P*xz|PRPl>#ko8}PKMdo#Uq2WuBIV3U{JSEq0hl9CLVAZ#H>_sTi^2H-O zKVui1w2?B!-P%-rYxas6z#d-5wfqn$e0V3zl@So6rH*ey+!cHE-47A!euUaf{QVQ! zZ?x4Q%rz|iHTbX<+o16QSLuU#H1Lho(O8V9WOyz_+r6F*G@axUnc&ja=i}Ou^mBbG z8Q|KLRKxwjNFbtap!+_q{*FTt{|5RZ{>Bp<7`%_(sP9L_yZ?X|ZSiejq(8_bk1%?v z@!Ug6SMf5d(#iNb|5KUY!~)W+&muAJM$LcRs#Bq; zXy$WDJSuwl$Evo=WQHgGA*K=1&r{wdA-y@s>-Z>OnZ!)dPL{7_8d z1T`3}P;b7h-aK_#lY}mo)tix;3H8q7HEJf*JB!z;lu++9-tg2Lz?<9^>K%Vvy-82K zWo1)3YDo1$GTB>2_3$&*3sSu| literal 0 HcmV?d00001 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..d6f2abc 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..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..d869866 100644 --- a/src/model/Bus.java +++ b/src/model/Bus.java @@ -1,3 +1,45 @@ package model; +import java.time.LocalDate; + // Type your code +//parent class called Bus +public class Bus{ + private int noOfPersons; + private int rates; + private String busType; + private LocalDate date; + public int getNoOfPersons() { + return noOfPersons; + } + public void setNoOfPersons(int noOfPersons) { + this.noOfPersons = noOfPersons; + } + public int getRates() { + return rates; + } + public void setRates(int rates) { + this.rates = rates; + } + public String getBusType() { + return busType; + } + public void setBusType(String busType) { + this.busType = busType; + } + public LocalDate getDate() { + return date; + } + public void setDate(LocalDate date) { + this.date = date; + } + public Bus(int noOfPersons, int rates, String busType, LocalDate date) { + super(); + this.noOfPersons = noOfPersons; + this.rates = rates; + this.busType = busType; + this.date = date; + } + + +} \ No newline at end of file diff --git a/src/model/Flight.java b/src/model/Flight.java index 9ac54b5..1a99186 100644 --- a/src/model/Flight.java +++ b/src/model/Flight.java @@ -1,3 +1,63 @@ package model; -//Type your code \ No newline at end of file +import java.time.LocalDate; + +//Type your code +//parent class called Flight +public class Flight{ + private int noOfPersons; + private int rates; + private String classType; + private LocalDate from; + private LocalDate to; + private String triptype; + //appropriate getters and setters + public int getNoOfPersons() { + return noOfPersons; + } + public void setNoOfPersons(int noOfPersons) { + this.noOfPersons = noOfPersons; + } + public int getRates() { + return rates; + } + public void setRates(int rates) { + this.rates = rates; + } + public String getClassType() { + return classType; + } + public void setClassType(String classType) { + this.classType = classType; + } + 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.rates = rates; + this.classType = classType; + 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..4ed1d4a 100644 --- a/src/model/Hotel.java +++ b/src/model/Hotel.java @@ -1,2 +1,66 @@ package model; -// Type your code \ No newline at end of file + +import java.time.LocalDate; + +// Type your code + +public class Hotel{ + //parent class called Hotel + private int noOfPersons; + private String roomType; + private int rates; + private String occupancy; + private LocalDate fromdate; + private LocalDate todate; + //appropriate getters and setters + 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) { + super(); + this.noOfPersons = noOfPersons; + this.roomType = roomType; + this.rates = rates; + this.occupancy = occupancy; + this.fromdate = fromdate; + this.todate = todate; + } + + //constructor + + + +} \ No newline at end of file diff --git a/src/model/Train.java b/src/model/Train.java index b21180d..fca0c64 100644 --- a/src/model/Train.java +++ b/src/model/Train.java @@ -1,2 +1,46 @@ package model; -// Type your code \ No newline at end of file +// Type your code + +import java.time.LocalDate; + +//parent class called Train +public class Train{ + private int noOfPersons; + private int rates; + private String berth; + private LocalDate date; + //appropriate getters and setters + public int getNoOfPersons() { + return noOfPersons; + } + public void setNoOfPersons(int noOfPersons) { + this.noOfPersons = noOfPersons; + } + public int getRates() { + return rates; + } + public void setRates(int rates) { + this.rates = rates; + } + public String getBerth() { + return berth; + } + public void setBerth(String berth) { + this.berth = berth; + } + 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.rates = rates; + this.berth = berth; + this.date = date; + } + +} \ No newline at end of file diff --git a/src/services/Booking.java b/src/services/Booking.java index fe2c822..3c914fd 100644 --- a/src/services/Booking.java +++ b/src/services/Booking.java @@ -1,4 +1,11 @@ package services; // Type your code - +//class called as Booking +public class Booking{ + //method public double booking(int noOfPersons,int rates). + public double booking(int noOfPersons,int rates) { + double totalRate =noOfPersons*rates; + return totalRate; + } +} diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java index 6d38ab5..35e757a 100644 --- a/src/services/FareCalculator.java +++ b/src/services/FareCalculator.java @@ -1,3 +1,91 @@ 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; +import services.Booking; + +// Type your code +public class FareCalculator extends Booking{ + Booking book = new Booking(); //obj of booking + //methods + 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 totalFare = 0; + //Check-In date should be less than Check-Out date + //Single occupancy can be given only for 1 guest + //If there are 3 guests then the rooms alloted should be 1 Double Occupancy room and 1 Single Occupancy + if(fromdate.isBefore(todate)) { + System.out.println(occupancy); + if((occupancy.equals("single") && noOfPersons == 1)) { + totalFare= book.booking(noOfPersons, rates); + System.out.println("totalFare: "+totalFare); + } + else if((occupancy.equals("double") )) { + if(noOfPersons <=2 && noOfPersons>0) { + totalFare= book.booking(noOfPersons, rates); + } + } + } + + return totalFare; + + } + public double book(Flight flight) { + int noOfPersons = flight.getNoOfPersons(); + int rates = flight.getRates(); + String classType = flight.getClassType(); + LocalDate from = flight.getFrom(); + LocalDate to = flight.getTo(); + String triptype =flight.getTriptype(); + double totalFare = 0; + //If one way trip is selected then departure date is not considered for fare calculation.* + //For round trips Start date should be less than return date.* + System.out.println(triptype); + if(triptype.equals("round-trip")) { + if((from.isBefore(to))){ + totalFare= book.booking(noOfPersons, rates); + } + + } + else + totalFare= book.booking(noOfPersons, rates); + + return totalFare; + + } + public double book(Train train) { + int noOfPersons = train.getNoOfPersons(); + int rates= train.getRates(); + String berth = train.getBerth(); + LocalDate date = train.getDate(); + double totalFare = 0; + + totalFare= book.booking(noOfPersons, rates); + + return totalFare; + + } + public double book(Bus bus) { + double totalFare = 0; + int noOfPersons = bus.getNoOfPersons(); + int rates= bus.getRates(); + String busType = bus.getBusType(); + LocalDate date = bus.getDate(); + + totalFare= book.booking(noOfPersons, rates); + + return totalFare; + } + + + +} \ No newline at end of file