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 c48f58d..1655a69 100644 Binary files a/bookstore-api/target/classes/com/bookstore/domain/UserBilling.class and b/bookstore-api/target/classes/com/bookstore/domain/UserBilling.class differ diff --git a/bookstore-api/target/classes/com/bookstore/domain/UserPayment.class b/bookstore-api/target/classes/com/bookstore/domain/UserPayment.class index 4265567..213b679 100644 Binary files a/bookstore-api/target/classes/com/bookstore/domain/UserPayment.class and b/bookstore-api/target/classes/com/bookstore/domain/UserPayment.class differ diff --git a/store-front/src/app/components/my-profile/my-profile.component.html b/store-front/src/app/components/my-profile/my-profile.component.html index 91bf39f..3336121 100644 --- a/store-front/src/app/components/my-profile/my-profile.component.html +++ b/store-front/src/app/components/my-profile/my-profile.component.html @@ -85,7 +85,7 @@ - + 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; + } }