From 5e0081e9fd1e23c716467db1538de2ad3bee7fe9 Mon Sep 17 00:00:00 2001 From: mms37 Date: Tue, 2 Aug 2022 14:18:31 -0700 Subject: [PATCH] update --- assignment4/.idea/vcs.xml | 1 + assignment4/list.json | 2 +- .../control/PackageDeliveriesTracker$1.class | Bin 1779 -> 1779 bytes .../control/PackageDeliveriesTracker$2.class | Bin 930 -> 930 bytes .../control/PackageDeliveriesTracker$3.class | Bin 0 -> 1006 bytes .../control/PackageDeliveriesTracker$4.class | Bin 0 -> 974 bytes .../control/PackageDeliveriesTracker.class | Bin 8277 -> 9274 bytes .../client/view/Input$1$1.class | Bin 1454 -> 1454 bytes .../client/view/Input$1.class | Bin 2453 -> 2453 bytes .../packagedeliveries/client/view/Input.class | Bin 7285 -> 9752 bytes .../client/view/JavaSwingUI$1.class | Bin 1208 -> 991 bytes .../client/view/JavaSwingUI$2.class | Bin 1265 -> 1265 bytes .../client/view/JavaSwingUI$3.class | Bin 1423 -> 1145 bytes .../client/view/JavaSwingUI$4.class | Bin 1081 -> 1081 bytes .../JavaSwingUI$PACKAGE_FILTER_OPTION.class | Bin 1560 -> 1560 bytes .../client/view/JavaSwingUI.class | Bin 6659 -> 6551 bytes .../control/PackageDeliveriesTracker.java | 21 ++++++ .../packagedeliveries/client/view/Input.java | 37 +++++++++- .../client/view/JavaSwingUI.java | 10 +-- webappserver/docs/curlCommands.txt | 6 +- webappserver/list.json | 1 - .../webappserver/control/PackageManager.java | 69 ++++++++---------- .../controllers/PackageController.java | 16 +++- .../webappserver/model/PackageInfo.java | 5 ++ 24 files changed, 114 insertions(+), 54 deletions(-) create mode 100644 assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$3.class create mode 100644 assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$4.class diff --git a/assignment4/.idea/vcs.xml b/assignment4/.idea/vcs.xml index 4fce1d8..ff8c91d 100644 --- a/assignment4/.idea/vcs.xml +++ b/assignment4/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/assignment4/list.json b/assignment4/list.json index 7cab810..405d4a6 100644 --- a/assignment4/list.json +++ b/assignment4/list.json @@ -1 +1 @@ -[{"author":"test","name":"test","note":"","price":12.0,"weight":12.0,"expectedDate":"2022-07-29T12:01","delivered":false,"type":"book"}] \ No newline at end of file +curl -i -H "Content-Type: application/json" -X POST -d '{/"author/":/"a/",/"name/":/"as/",/"note/":/"as/",/"price/":32.0,/"weight/":12.0,/"expectedDate/":/"2022-08-26T21:30/",/"delivered/":false,/"type/":/"book/"}' localhost:8080/addBook \ No newline at end of file diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$1.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$1.class index 5e84cea0d9d576be424304ebc2b6492bb8cef272..10a309bcab41ea41df879dee9bd469eec70794d0 100644 GIT binary patch delta 41 ucmey&`C$q8z0!72wyn*Cmwg3R|VhWxB diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$2.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$2.class index 797285567bb54c7e7b4d8695bc27a5edd3c96040..2180129de425e0cf76a7848c926e0f5b22a8c215 100644 GIT binary patch delta 13 UcmZ3)zKDH8ATwk5Yx15PeRQY#Tyb3Y5=EMarS!fN8@8rOKs%sI)DVta5iZ)2*r3j%=qA{3}jK z9QXlT_(zD@wCV*_s8THLzM1jc*_k)?uRlM20vKSUg&GzT)Z1vFDex?Jr7WB)49Oxm zD?ObU%A?G_Oek|_WCfbL+UhtESlH^05-bXQ$jeFG+3radf-Y=HHolS*m7l4C#$@z4 zc}+p)M)Qu$osHfZ`SF7A=8BMcj*##41U_x0bIsZBjs)s^ZcG9zskU@DEsx1(>ez5( zEp@pvBjt7FUk2;(R0n~h`4-aY^;y9xb>}4uH{ax(dTGc5P;u(HElU48&E1<7P_lqm zgWIx<9oT(SCZZEjr9wm6`8>c$Bk2pr6H*lj$*V}aGc z$4(jjl`cyX$ZmM7{_VG$R&7Y5Y$1oya~mwc;vt3j-i0X8-nW+gp5dE70h>tpepO5G z)4&pAi>=p;RlM>1JH$6OYPiMk=8X0mZMN4h2)K=9_NtFpu*&-l++nYVHQb%yJ=|xk TGyfr;%p&V}%GhFV!pQ3{h=njm literal 0 HcmV?d00001 diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$4.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker$4.class new file mode 100644 index 0000000000000000000000000000000000000000..3f0945029992c7f8fc5ad5d115f8bb6a85ac0d0b GIT binary patch literal 974 zcmb_bO>Yx15PeRQY#RcF(w6d338Wm-9xxxdphS^S0a0mNJ`&~bZl+teUOTd#N=5xs zoRB#11Gw{d5VJ|u8$w9&YWK}Nznz_(8UOtK{Re|6Z9z76DyK0S zeNJ9ekeSiEBQs~CcSe4k3*KA{hMpPnt&YIwcDm4*-JOv@b?Z0*VX_){w<*m((3)8;n)fZ{gvL*~BBp25S>WUVi|<^CUI^ literal 0 HcmV?d00001 diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/control/PackageDeliveriesTracker.class index 30bd6edfdd426f839762018d90a75fc524e1c7be..55f081ebb3774f064ad288b1fef6d7731f7cdc14 100644 GIT binary patch delta 2699 zcmbVOX>3$g7(L(2lsA10)Ali?Erl+W!BT{=6be#lk&4hwfwD>g3yhOuoz`hZO2jG{ z{h^5@&nTiO8VzxmHW`$Oke$2NZ_}qub@P%M}vAxX-G*yhRU*Ei;In>%5jf9exUkZxWwp|m7 zw6#TA!=Xq=TQpS5p|LC4*}QSi#^UvS zwXgK&dQF@HJwKzINiQ`q05`V;J`r)*PYqk=JtZEWq{t9E#~yuP5dvEpExTU!F zKt`J@klqoFwKTW3YzohBUVC+OB&?9OrO#gfPv-?G?Tg4vki9PacQZ#IL9qTms8b;@ zm2!@eJu}ecpKr6`Cd1IA^ z9^sfIplK{4C08+)QH}?8ZdTROa+nS(N9bn>+~2 z3wPmcYNt|kf}GEM%CIMmY|`2}Xq$<4BU7^*xwx5VTZpn1GwD(_=QX%Zqm{tJy&*D@ zp1VEK1RT%c3Dls>2|)jKko$SOu@a1S8Y!0-VWl6e}zM2VE~@cBat1OrISrr29~Y`%!_NOr{4I_XioXU5xAwbm9@J^QdOK zkd|er&=E73bc;3HA-r=_f~}fOQEc_zR4Jz~Uc_WtIXB$|y+)?Xg>*W=#ORY5EI8$s zQvozp<>VM}=9Vmb)u<9H;ZX%Wz9^yf&e7R+&!}00^nQ$Hj}znx7R8g~_B6)h8BE8s zsN#GMdb9^q*c7HyD5bZDQ5mZ}P=!4=sdts5H}5K!nH*h7ieB)YQr>wd=_>Fl2o~ID zkk26KIEb7^(O+SZ$|UJ!g9yh-crPzvd%*J~+(*JMklc$T+(*JM|1ZK-|3bLxzY?A$ z7gOsDdsp7bsj7ZVosqAR@avkC6Ry-`%u}_Bs$tD$`6|m3dHJQv(&?~o46^bkt^DV# za43OSm0zF*a`4__w(cKfnU=InJ7+1E$Q*@7q$Nx*6~{my4lie$e?N{78hQ|97yj^B z?mHddx%nN|(E)w4YLv7|-W<3r(R+RDJeTSoBr=zcLW9Tz9#5gcmOk_=kWb?HRD+x! zN8>9P-V1*ZHn8XK!)HJoH`*t&7Ig21w}A(~+M~;&3pemjhFgDtCX)zokmI}jq8(x( zzQ^`(7>jX)1^7PO(+6x*{j~T9oAEIl$x%&PrEzt#b^2IU4%f}POU~2b+H%gRZfubn z{V`RkIvU0qgxDhuGz}nVAe?a;{!?(VogMSg>sseiz@uF(5%sIF!q(T%;ae+WwZ!p* z6}8&cBW88-(Tkt^aBBHp{BAwjhXGE`#_>lFevXSfE=Dhc-F+C&?VS`yeFsH*p2y}7 zewl`{2rYisa@hRxsq<7^z%OGd{ix%6m()uGpC*~~QUY?A(1t&ihXZOt>?@>6Rw3t42j;KJ delta 1976 zcmbVNYfzL`7=GT}Wxw5J-Ng@B77*B#i%JS2f_MXiPywfD8YMN%A>D{f27yw#S?TyE zXL9DN#L61G%xHEQV*&??X{u=&>GG@TqTQ`1y4bx4rRSX8w*A#K?aqGR`<`>&^E~hK zzUS=F>bF;TPF)xp0Z=U~Pk4?eXSndbz|qs&8S&r@J}~g17a!qcD?II8*BN~3#b8a6%7Y1%nr zIJr@iu{%7ejxUigI z)q4K`(*XRj{gvewkD?{XQJPjmX7yGTJ(F=jJyThUG^|1pt1$yj$U_4{XhZ?l=p93Z z_rMgdOyfQwIK(G@okd|3MN>3j+iYNwgFq=Upz+Mn-3sU`WbnBT)6k4`T!Boir>YxJ zi;aZ25^K@I?r+qgfIKWl+&_0N3(T8>%!8T2D zH4N@ou9I~TsavM2y4De_O-xCpDtqA~^E5I)pmRv4)dzPxn@19|DTDh0N(?MBBw+2z zE@gd=W;eB~Y>MFKvxDMw!o&^&bRkT>1>{|b8!-<%QHI{QbS6s>luUvZ!W#!$kO1a_ zJzPue*cy^0*=!nEEi+oQc2Trjh;}Rc?>1ypl`!rg%AG9w9@Nopz&?#u3!tAQap$?ILw+qgf=`(#SWndk5Z|}G~3G= zS&pT;Vg{RToo1_8+!SN0tbBdylvN;w%*BN+DXQe4ouJ!gmds|-X>5vNnS&$=F+6$# zROpmWkO8#p;?F0D4>@YjktIO=+s~=~F zF}7h4Uz<-3W1Pmf1NiP)oE^ZA1NgNcg*%6l%HhNP@Tornp$tGSZz-@u$q2F3Vcs1x z>E-jbFGV%x^IBTSd7D&7CEre})rfIfL|a|_Rs2=U3VK;=|3<#mXFU3ni=|HLk@*)y C$`Gjl diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/Input$1$1.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/Input$1$1.class index f6df2cd621a39e9f7b61fd271c773217a32dc8d5..3c4abfe060cfa172f75174a4f079b924238e1c96 100644 GIT binary patch delta 22 dcmZ3-y^edse-=jDNvx5q4h-T9j+5h90{~Lr1~&iz delta 22 dcmZ3-y^edse-=iwNvx5qmJH$yR+Hmc0{~JR1|k3e diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/Input$1.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/Input$1.class index 49966f95554e8ca0c045560903472d5b7afb513e..b81ebb7890d3283b22c1779a17a658cb494457f1 100644 GIT binary patch delta 92 zcmV-i0Hgnv6O|LNVg~^)vttKx0ZB3d3ji|!fB-cBivTtNmH;;Zq5wDmssK3vtpGa! yxBxr=!vH-1)c`{P=Kw?i^8iHv`v67&{s2e;2>?j}6aY#AAOK4NC;&~99tn5lh7^VX delta 92 zcmV-i0Hgnv6O|LNVg~^zvttKx0ZA(W3jiztfB-H4ivTYGmH;pSq5v@fssJ(otpGFt yxBxW(!vHn_)c`yI=Kwtb^8h{o`v5-x{s2J%2>?O?6aYg3AOJ)GC;tn5N?GyR{ diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/Input.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/Input.class index 3c6c280e47af3353da7c0d3accde5de6a005f581..fae189960b0c216705cf998301bb07d671e25a58 100644 GIT binary patch delta 4146 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 diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI$1.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI$1.class index f50722e14fdfa6659ab6a2a80b5edd0176785a71..2d3e7c3bf5dbaf656fec7355e6c7e60c6d356e15 100644 GIT binary patch delta 280 zcmYj~Jx;?w5Jumw6HFEp8v}uWftY{REl^U>q=|9`j*>G(mbeGP5JbTN=&88?Jzd0S zgMcaK)66`*dFs4}?sfkB0$fo{-J5eP(v65o%1?8?l(HJK7O_rm`f*)e*u1kzKV&On z`~JpW8gp9S2E$2)VW+WJtkU`70pn+ccbY7_>I-5ZV^6*JO)((XB%XG2H}&Tq*GNq5 zN_;V6*;kl~l}9%Ij9miV2eil1#O(i5C%@`M`vWOk916A^aja~Sa>7}&N%2Z2rhcdT E0_)@(%K!iX delta 416 zcma)&yG{a86h+sapaYWu6cuGedHKLWM3mT=SQrxT&J+;#T8xnKHAz+^W+Ug1ZLO%;-c-W-%4V|JqXc8s(;A z;3sBcG2i+w`9mz2ERyi9R3?xjt&=fXdU{YhN)^2i?eKmX#Y+GE8k%&&&OM{-F8ZS= zja8}R!a$s?)aZa>4O^7(jP>tTFLLO0E=*N25$yY2A|0*Sv&x6X$JiO diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI$3.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI$3.class index a4f19771aa202e1fcd4cd52b2e4cefcf4075e377..ef71f85018bb245a8147f1dd82e87e567add55fb 100644 GIT binary patch delta 376 zcmYk2y-or_6otQ;U0GZf7*~b$UlA1-P<#MrY$-G`G1w7`><7q#L}SRJCm+7KsvA@i6Fu1ZY_298*h zTKKtKVqH!#CPpgC;x$Ix2Afi2@J(Ak1T;ilnTgY6eFGe|De(XR delta 553 zcmaiy-A)s65XFD9UD$Sa3$?6#w*ppe7YbBCKm?5Of+pZc0!A@0X>c`-4VXf>+}p*X64AfD5WrPUD9+3 z&OxnF_*mbmHL4Xssx}#JSY%y#@QyAEPA`2H{VoFxhMttuDTc{eExG< zW^Ma(&=g**g|DPs+1}mRZ|*jxUTV4aDR>q%>IXry9_(E=F4~N7+oIrdhr7ahH1*_v zQ-Zq}>|cuo9|W^lExopNpQ1|%FZ?QfG9G@HvBXv}T4X6q8vRl|9x<|#Smbdyn^-%{ zAowIQ8B*AwsCS65gHFAXp|6Jt#j>(hMN`r9$6JU$(Zcd`Egb(R-9O^)NsXPV37br5 z?2Q#Xrm1MAlSI10edPw;q0$G;XpH3FYbi3!`zKgto12Pq!jOW~W;Dv$-1}>kjhA^t tlDBHKMUHp>nCAbO=9%T8dYH_`w(~3~ntG~%M=ZsqVf_v01teZT>2Fj?S9|~f diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI$4.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI$4.class index 9ae04d0adf2a26ae71e640baac3e719a1544b060..e10a20cb7fc23281730116668c364bb732f26f37 100644 GIT binary patch delta 13 VcmdnVv6ExNQ)b4wlb delta 37 ncmbQiGlOTtWfsQuldrJo14$NEJ0R)I8U`e1u?7RlcdS|f{4ot0 diff --git a/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI.class b/assignment4/out/production/assignment4/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI.class index de8ca7b13dd744e21c3c76d909c454821ba04efe..203df94e977253e754112480d0ef76a5b376f024 100644 GIT binary patch literal 6551 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 JhP1_={{rU-uVDZH literal 6659 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.getType(); + return gson.toJson(p); + } + + public void deserializePackageString(String gsonString){ + try{ + Type pType=new TypeToken>(){}.getType(); + packageList=gson.fromJson(gsonString, pType); + System.out.println(packageList + " --> packageList"); + for (PackageInfo p: packageList){ + if (p instanceof BookPackage) p.setType("book"); + else if (p instanceof PerishablePackage) p.setType("perishable"); + else if (p instanceof ElectronicPackage) p.setType("electronic"); + } + } + catch (JsonSyntaxException e){ + e.printStackTrace(); + } + } } diff --git a/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/Input.java b/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/Input.java index 7eade3b..c29ed35 100644 --- a/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/Input.java +++ b/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/Input.java @@ -12,7 +12,14 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.stream.Collectors; public class Input extends JDialog implements ActionListener, DateTimeChangeListener { private final PackageDeliveriesTracker pInstance = PackageDeliveriesTracker.getInstance(); @@ -179,6 +186,7 @@ public class Input extends JDialog implements ActionListener, DateTimeChangeList PackageFactory.PackageType type = PackageFactory.PackageType.Book; String pName = nameField.getText(); String pNote = noteField.getText(); + String pEndPoint = "addBook"; double pPrice = 0.0; pPrice = Double.parseDouble(priceField.getText()); if (pPrice < 0) { @@ -207,6 +215,10 @@ public class Input extends JDialog implements ActionListener, DateTimeChangeList return; } } else if (pType == 1) { + pEndPoint = "addPerishable"; + type = PackageFactory.PackageType.Perishable; + } else { + pEndPoint = "addElectronic"; type = PackageFactory.PackageType.Electronic; pHandlingFee = Double.parseDouble(typeTf.getText()); if (pHandlingFee < 0) { @@ -215,8 +227,6 @@ public class Input extends JDialog implements ActionListener, DateTimeChangeList "error", JOptionPane.WARNING_MESSAGE); } - } else { - type = PackageFactory.PackageType.Perishable; } if (pName.equals("")) { JOptionPane.showMessageDialog(this, @@ -226,7 +236,12 @@ public class Input extends JDialog implements ActionListener, DateTimeChangeList return; } PackageInfo p = PackageFactory.create(type, pName, pNote, pPrice, pWeight, false, deliveryDate, pAuthor, expiryDate, pHandlingFee); - pInstance.addPackage(p); + String packageString=pInstance.serializePackage(p); + System.out.println(packageString + " packageString before"); +packageString=packageString.replace("\"","\\\""); +System.out.println(packageString + " packageString"); +String postcmd="curl -i -H \"Content-Type: application/json\" -X " +"POST -d " + packageString +" localhost:8080/"; +invokeCmd(postcmd, pEndPoint); dispose(); } catch (Exception e) { JOptionPane.showMessageDialog(this, @@ -235,4 +250,20 @@ public class Input extends JDialog implements ActionListener, DateTimeChangeList JOptionPane.WARNING_MESSAGE); } } + + private void invokeCmd(String curlcmd, String endPoint){ + try { + System.out.println(curlcmd+endPoint + " curlCmd"); + Process p=Runtime.getRuntime().exec(curlcmd+endPoint); + InputStream output=p.getInputStream(); + String allP =new BufferedReader(new InputStreamReader(output, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n")); + System.out.println(allP+" allP"); + pInstance.deserializePackageString(allP); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + } + diff --git a/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI.java b/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI.java index e198ecc..112b4ff 100644 --- a/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI.java +++ b/assignment4/src/cmpt213/assignment4/packagedeliveries/client/view/JavaSwingUI.java @@ -20,7 +20,7 @@ public class JavaSwingUI implements ActionListener { ; public void displayMainPage() { - pTracker.load(); + //pTracker.load(); uiFrame = new JFrame("Package deliveries tracker"); uiFrame.setSize(500, 500); uiFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); @@ -28,7 +28,7 @@ public class JavaSwingUI implements ActionListener { uiFrame.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - pTracker.save(); + //pTracker.save(); // TODO: replace with save endpoint super.windowClosing(e); uiFrame.dispose(); } @@ -58,7 +58,6 @@ public class JavaSwingUI implements ActionListener { uiPanel.add(Box.createVerticalGlue()); uiFrame.getContentPane().add(scrollView); System.out.println(packages); - if (packages.get(0) != "No packages to show") { for (int i = 0; i < packages.size(); i++) { JPanel p = new JPanel(); JTextPane pkgPane = new JTextPane(); @@ -80,13 +79,13 @@ public class JavaSwingUI implements ActionListener { JCheckBox delivered = new JCheckBox("Delivered?"); delivered.setBounds(100, 100, 50, 50); - delivered.setSelected(pTracker.isDelivered(i)); + delivered.setSelected(false); // TODO: retrieve package's delivery status int finalI1 = i; delivered.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { delivered.setSelected(true); - pTracker.setDelivered(finalI1); + //pTracker.setDelivered(finalI1); // TODO: call setDelivered endPoint refreshPackageList(); } }); @@ -94,7 +93,6 @@ public class JavaSwingUI implements ActionListener { } uiPanel.add(p); } - } uiFrame.validate(); uiFrame.pack(); } diff --git a/webappserver/docs/curlCommands.txt b/webappserver/docs/curlCommands.txt index 41fbd48..b1a54f1 100644 --- a/webappserver/docs/curlCommands.txt +++ b/webappserver/docs/curlCommands.txt @@ -4,4 +4,8 @@ GET /ping command : curl -i -X GET localhost:8080 Returns a message "system is up". -GET /listAll \ No newline at end of file +GET /listAll + + +Test commands: +curl -i -H "Content-Type: application/json" -X POST -d '{\"author\":\"test\",\"name\":\"n\",\"note\":\"a\",\"price\":1,\"weight\":3,\"expectedDate\":\"2022-07-29T12:00\",\"delivered\":false,\"type\":\"book\"}' localhost:8080/addBook \ No newline at end of file diff --git a/webappserver/list.json b/webappserver/list.json index 7cab810..e69de29 100644 --- a/webappserver/list.json +++ b/webappserver/list.json @@ -1 +0,0 @@ -[{"author":"test","name":"test","note":"","price":12.0,"weight":12.0,"expectedDate":"2022-07-29T12:01","delivered":false,"type":"book"}] \ No newline at end of file diff --git a/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/control/PackageManager.java b/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/control/PackageManager.java index e44ab52..5df178a 100644 --- a/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/control/PackageManager.java +++ b/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/control/PackageManager.java @@ -7,6 +7,7 @@ import cmpt213.assignment4.packagedeliveries.webappserver.model.PackageInfo; import cmpt213.assignment4.packagedeliveries.webappserver.model.PerishablePackage; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; import com.google.gson.TypeAdapter; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; @@ -58,7 +59,7 @@ public class PackageManager { public void addPackage(PackageInfo p) { packageList.add(p); - Collections.sort(packageList); + //Collections.sort(packageList); } /** @@ -120,18 +121,10 @@ public class PackageManager { } } - public ArrayList getAllPackages() { - ArrayList b = new ArrayList<>(); - if (packageList.size() == 0) { - b.add("No packages to show"); - } else { - Collections.sort(packageList); - for (int i = 0; i < packageList.size(); i++) { - String bString = ("Package #" + (i + 1)) + "\n" + packageList.get(i) + "\n\n"; - b.add(bString); - } - } - return b; + public String getAllPackages() { + //Collections.sort(packageList); TODO: sorting raises error; check again + System.out.println(packageList + " packageList - server"); + return gson.toJson(packageList); } /** @@ -164,30 +157,14 @@ public class PackageManager { return sortedList; } - public ArrayList overDuePackages() { - ArrayList b = new ArrayList<>(); + public String overDuePackages() { ArrayList overdue = sortList(packageList, true); - if (overdue.size() == 0) { - b.add("no overdue packages to show"); - } - for (int i = 0; i < overdue.size(); i++) { - String bString = ("Package #" + (i + 1)) + "\n" + overdue.get(i) + "\n\n"; - b.add(bString); - } - return b; + return gson.toJson(overdue); } - public ArrayList upcomingPackages() { - ArrayList b = new ArrayList<>(); + public String upcomingPackages() { ArrayList upcoming = sortList(packageList, false); - if (upcoming.size() == 0) { - b.add("no upcoming packages to show"); - } - for (int i = 0; i < upcoming.size(); i++) { - String bString = ("Package #" + (i + 1)) + "\n" + upcoming.get(i) + "\n\n"; - b.add(bString); - } - return b; + return gson.toJson(packageList); } public void removePcakage(int i) { @@ -203,11 +180,27 @@ public class PackageManager { } public PackageInfo deserializePackage(String packageGson){ - Type lType = new TypeToken>() { - }.getType(); -PackageInfo newPackage=gson.fromJson(packageGson, lType); - System.out.println(newPackage.toString() + "-------> newPackage"); + PackageInfo newPackage = null; + try { + System.out.println(packageGson + "-------> packageGson"); + Type lType = new TypeToken() { + }.getType(); + newPackage = gson.fromJson(packageGson, lType); + System.out.println(newPackage + " newPackage"); + + //for (PackageInfo p : packageList) { + if (newPackage instanceof BookPackage) { + newPackage.setType("book"); + } else if (newPackage instanceof PerishablePackage) { + newPackage.setType("perishable"); + } else if (newPackage instanceof ElectronicPackage) { + newPackage.setType("electronic"); + } + //} + + } catch (JsonSyntaxException e) { + e.printStackTrace(); + } return newPackage; } } - diff --git a/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/controllers/PackageController.java b/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/controllers/PackageController.java index ccf25f2..bc2cf69 100644 --- a/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/controllers/PackageController.java +++ b/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/controllers/PackageController.java @@ -18,27 +18,35 @@ public class PackageController { PackageManager manager=PackageManager.getInstance(); @GetMapping("/listAll") @ResponseStatus(HttpStatus.OK) - public ArrayList getAllPackages(){ + public String getAllPackages(){ return manager.getAllPackages(); } @PostMapping("/addBook") @ResponseStatus(HttpStatus.CREATED) - public void addBook(@RequestBody String bookString){ + public String addBook(@RequestBody String bookString){ System.out.println(bookString+"----------------->bookString"); + //bookString = bookString.trim(); PackageInfo p=manager.deserializePackage(bookString); + System.out.println(p + " addBook p"); + System.out.println(p.getType() + " package type"); manager.addPackage(p); + return manager.getAllPackages(); } @PostMapping("/addPerishable") @ResponseStatus(HttpStatus.CREATED) - public void addPerishable(@RequestBody String perishableString){ + public String addPerishable(@RequestBody String perishableString){ PackageInfo p=manager.deserializePackage(perishableString); + manager.addPackage(p); + return manager.getAllPackages(); } @PostMapping("/addElectronic") @ResponseStatus(HttpStatus.CREATED) - public void addElectronic(@RequestBody String electronicString){ + public String addElectronic(@RequestBody String electronicString){ PackageInfo p=manager.deserializePackage(electronicString); + manager.addPackage(p); + return manager.getAllPackages(); } } diff --git a/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/model/PackageInfo.java b/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/model/PackageInfo.java index 517d9fc..8012b74 100644 --- a/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/model/PackageInfo.java +++ b/webappserver/src/main/java/cmpt213/assignment4/packagedeliveries/webappserver/model/PackageInfo.java @@ -17,6 +17,11 @@ public class PackageInfo implements Comparable { private final double weight; private final LocalDateTime expectedDate; private boolean delivered; + + public String getType() { + return type; + } + private String type; public PackageInfo(String name, String note, double price, double weight, boolean delivered, LocalDateTime expectedDate) {