From 46a9a738672a4d21ed35e2d69b1dc5d4f586f4c1 Mon Sep 17 00:00:00 2001 From: Le Deng Date: Wed, 8 Mar 2017 12:44:19 -0500 Subject: [PATCH] latest --- bookstore-api/.idea/workspace.xml | 99 +++++++++++------- .../com/bookstore/domain/UserBilling.java | 3 + .../com/bookstore/domain/UserPayment.java | 3 + .../com/bookstore/domain/UserBilling.class | Bin 2873 -> 2925 bytes .../com/bookstore/domain/UserPayment.class | Bin 3342 -> 3394 bytes .../my-profile/my-profile.component.html | 2 +- .../my-profile/my-profile.component.ts | 5 +- 7 files changed, 73 insertions(+), 39 deletions(-) diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml index 597616a..469d240 100644 --- a/bookstore-api/.idea/workspace.xml +++ b/bookstore-api/.idea/workspace.xml @@ -26,7 +26,7 @@ - + @@ -38,6 +38,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,8 +151,6 @@ @@ -943,16 +973,16 @@ - + - - + @@ -965,13 +995,13 @@ - + - + @@ -996,11 +1026,6 @@ - - file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/UserSecurityService.java - 26 - - file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java 56 @@ -1095,16 +1120,6 @@ - - - - - - - - - - @@ -1168,20 +1183,6 @@ - - - - - - - - - - - - - - @@ -1373,5 +1374,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bookstore-api/src/main/java/com/bookstore/domain/UserBilling.java b/bookstore-api/src/main/java/com/bookstore/domain/UserBilling.java index 936211f..6bb01aa 100644 --- a/bookstore-api/src/main/java/com/bookstore/domain/UserBilling.java +++ b/bookstore-api/src/main/java/com/bookstore/domain/UserBilling.java @@ -1,5 +1,7 @@ package com.bookstore.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; + import javax.persistence.*; import java.io.Serializable; @@ -23,6 +25,7 @@ public class UserBilling implements Serializable { private String userBillingZipcode; @OneToOne(cascade = CascadeType.ALL) + @JsonIgnore private UserPayment userPayment; public Long getId() { diff --git a/bookstore-api/src/main/java/com/bookstore/domain/UserPayment.java b/bookstore-api/src/main/java/com/bookstore/domain/UserPayment.java index 9413f99..8653f59 100644 --- a/bookstore-api/src/main/java/com/bookstore/domain/UserPayment.java +++ b/bookstore-api/src/main/java/com/bookstore/domain/UserPayment.java @@ -1,5 +1,7 @@ package com.bookstore.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; + import javax.persistence.*; import java.io.Serializable; @@ -25,6 +27,7 @@ public class UserPayment implements Serializable { @ManyToOne @JoinColumn(name = "user_id") + @JsonIgnore private User user; @OneToOne(cascade = CascadeType.ALL, mappedBy = "userPayment") diff --git a/bookstore-api/target/classes/com/bookstore/domain/UserBilling.class b/bookstore-api/target/classes/com/bookstore/domain/UserBilling.class index c48f58dc08b72c1baaaf39f3a19744919546d86d..1655a69b7d287e7e1702f6a31902d67c8927015d 100644 GIT binary patch literal 2925 zcma);ZEqVz5XWbo*iIZb33d`_2{e=hoV4k+rGY}y(9}s=2RBLU2g;Mg#a_&%_Fd#V zqXzM1c*`r0sF3=C55O1T+f@C}`egf7dxaOB_0G-A{$_S|(tlpQ_?w7s(pMSEQhAc5 z=pl;(7Kbd3SUh6!m_>y}l|?O0^)!8%rYC}Cec5&Fc3pOT$8&3?T|r`B(7B@L`ho2R zb-Ue@$&FvLzdU;W?{9(f{RKk9Ir&c`_ zG}A+7cb#_Iaa#v=M+(Y~P*;L3^svs2m_aFJaNVT55e-;$0^rO>e8Cv?EP5zO7j~m( zeC?bzye2HC*!jpl>qs}?%o<+DI`+J$e&BVb)$}^H<65<$4OkZqQYuSU_v-YtswOlaagw&SfI>EM} zvBGK{l`g7GX3CB$4|<(r*{#~Rdn8=;8t5q-orQg<91nhU&p>=F{bcZnx^tmWbzj1QW zL;K2n)Utx-gHq0K5V zSuC-5kHsYx@6&RY-lj!COR-sp4F-teFg!dykqtcOIi+$utD>f>^E1B##Gk^b#&D$! zU7%^2!S7kj@C3bqf55_i9(&#`V0{z&woFjFHC(<=jUeMX$TcI#XJ(Lb9polJHex`yHyC8o z2$Ix6ZW%$g%pge}WD6j-V?ek$8RWJRB&CDgF@kKHK~g%%E?a`O3-~{MKU_b_ePKh=89x=kS0K635XXCDOR{BQEAj^)NSRAo9X7QB835!z}RTi~0)zj2S)0cvBzU(`8w;}t!JPs^#j`t z8g_RelRH0We>!>j&o6=!P8&{@7xwqI)wSJ@Rq@=;uAqyj12=Gbvf=nnvnz|P>jidz zkiMW5W&VS8#+&$obX(FYx8byASa>8|*|!7PRy)IJ#t(SjIe)D^cB-A9N!U*p>$PJ+ z3j>^N-|2Q8w{v9oq@er+bv5Wi59|Dd8I)26TPEdpG+@aIfRl^(f-&k@@{p1~>?Zek z=A5;>HZ14Z`Kf*0lWxE#Yk57Z>3QGzf!CK-+w0kmYt_d#U|lt&>)4ew4+6{SmhHD} zj(x>oSQ;*dNt!BFDuPn?9M=i<1Wgq-8pvEpku6jlR~`*|P1xJw+M;)>)hTvmfc_ zL;F#^T}Sr*N5##Dv?IUu!hgGQTD3HV4={T6p)ynT2K|W@&>qv$RM{S-MQCS$c=X6&6=nTw}4u;$6C)rMGES(AC&ehXn?RadSIvzK|_E z&n2aDJgcg@rSl`d1H_+0>qWDq3|*pmTEKS>Jvl)a@B>8Tza{A+j1x?w zOaZP&u&WXHYQzcDh(o9m=TIY#5{AuTT*vRdZ%9abp9px_ifsOj5_~LiC?jppt191qw_X>7&`C4Isu>5=8cz>7;l|X z+H2TwO+{E4T7}y)+AwJXf7W&kAX7TXx)J1K`osh>rGsn$WHSbYuZ7e1sS#va2f1kk zxnl;I)PC=SGl6=8R-?5E~%P X7!dBR_-B>AP@Su++Auf1L!y5HdCd(r diff --git a/bookstore-api/target/classes/com/bookstore/domain/UserPayment.class b/bookstore-api/target/classes/com/bookstore/domain/UserPayment.class index 426556727e42fb1f10f278f9a1c7a3826f6de8db..213b6798c2c91ee032822bfbc380acc7f1ae3791 100644 GIT binary patch literal 3394 zcmaKtZC4vb6vyuZArJ!cP|!k4Yb_e6bZxb2ON;Ws1N+j=8PPH4GtC ziw0XzH$vZ0uw6yrmsUju>lyX8R@sxjMLqJQ>iG2)&kYYzhdh>}nH?#x++KWH#MGfz zE=fOf?<>iDQ7eZ}M7<*25Kg-YT|-eV8Y>jNioNG~$3f`%(k^)w;kfn|7J+%$ko$^o z>zm%1%V~@o)|WlUUGU1aipzPrDuFZyd(Njat>WzqRMH9`>Af%4HOVYnwJk?exU+rCwBT)C=FYg3@j_$r1<~SAPG4iFG+a3wi!PjTZuD6i?vcT8>jv>UZ_$e_7PuMX z4(x?TtKNt8rPiiIInb7UFgr8dk;|WM7tKc<%iFc;og9vvxRc}X9|m~b($MVDs&kIq zv1nN2nAjpHBqtkLj_1xXWXvAMXk5V_W@%{sPOzxmDddb>H2^bxr6ae?`*D>xbfcNC zpU2v4XD;Izzln3mPu)0RX2YxbMfuR-7VPIO;)c4(52Hn+hW1~=`xw?|vh*2!o~2;Ryith?y_Tn3YOGQ~4rG6T~|3Q3Q+Gq$r078Eo`T(?dFkXZ{Drt-^VFKvN z6ntt#7HUKyYD6w-L^^6jMruSVYD9AJ_CwT8Q<%E}{lkE!>83J3y0O79##;z^`&+Uk zeT$k#m=)pYvWK;H{MWNGjvAHPErclarlwQDh|(RQHd>@rv(E@yACpK1X-jd z6G*!batk206F~SdxqJ_eARRi$9V5siGf0OHau*=?5X zeHA-5k7n!*rF4)vfXpX=a2qp7!3ff+gDe?AR?HxsI!GQM%LyQSj~Hat2$I%8R*WEP zW{|WF@)RKJ2_Srt8RUtvN4oSL*)oDWHTOuD4zdG~-2@PRNf>0EHX!vL>DED>89_E_ zD|T-72(E9p4k7@umjDtyVHRy0E0WPcq!Hw6b44;bhy#$L1Q33Mxgy`tj-etwdXH3$ zAiIR;Rh6?@5!{*{9pnW-`~(nw+!^FMdS(F0>J_OOLB6Nw{{z9%WOa}_Kwc$)L?4ef Q`awMyLVd>gQ?N($9~)d*P5=M^ literal 3342 zcmaKtZC4vr5XWaj9w1q0pam_ov|?KWRid@FS}GO7LxTY-52>Zvx=Ai!X|fx4H?;9n z==bo2_1NP%zVHM1b$svfKf6l^w|9AwxtV)s?)+x%+`Iq$_t)P;9!(O|*0T+gt) zve9UZMDgc^_1}Ma`L9MXvj(Tqp>bs78-`WSmu#y(r_sf&w&j^kQ8rz((hv)lWqXE) zEnSVqeDhcN76)-XVO2%GScB7)VqsNS!ZAEi^CQEk-}P9pch0m&q@7Mnz&^gPyR(VG zgR0R;59+q(m_BTO)o^MXMic94|8Kil5spR~@v3Dyopsyt4p4_8mV=om!oYH0^{9%e z1G`ZZPT)RN6Z=NH;XN`sO<{R(+C%6zimK5>scJX#72AH{dbT6-HM?n;R(=~TpE1mTYv zQdPsP8a0&Zio&oEEQV$8TPT%qSWTnV617DfmXFh|OY**Hnch5#n42yGzF_mV=Srp} zHvH=E7-$>*=lRbHBH!Fvtibv*xKV{naZU6B$f8x7>n1lEx;8KxJa0fBSDm{dhk0$Y}bTs#rAVpdWollNt;teHaka>VShydXhW{|IyAW0cyQ3+B~ zgCu2;6@aWpfbbn+kaZ|9NWTnH z2FT+G5Pn4% - + default diff --git a/store-front/src/app/components/my-profile/my-profile.component.ts b/store-front/src/app/components/my-profile/my-profile.component.ts index df6f16e..1e4aa6f 100644 --- a/store-front/src/app/components/my-profile/my-profile.component.ts +++ b/store-front/src/app/components/my-profile/my-profile.component.ts @@ -116,7 +116,9 @@ export class MyProfileComponent implements OnInit { res => { console.log(res.json()); this.user=res.json(); - // this.userPaymentList = this.user.userPaymentList; + console.log(this.user); + this.userPaymentList = this.user.userPaymentList; + console.log(this.userPaymentList); }, error => { console.log(error); @@ -132,5 +134,6 @@ export class MyProfileComponent implements OnInit { this.userPayment.expiryMonth=""; this.userPayment.expiryYear=""; this.userPayment.userBilling = this.userBilling; + } }