mohiit1502/bookstore-angular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

latest

Browse Source
This commit is contained in:
Le Deng
2017-03-11 09:36:22 -05:00
parent babfea5e47
commit 98dabce14f
11 changed files with 210 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
bookstore-api/.idea/workspace.xml generated
View File

@@ -19,8 +19,8 @@
<file leaf-file-name="CheckoutResource.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/CheckoutResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="56" column="60" lean-forward="false" selection-start-line="56" selection-start-column="60" selection-end-line="56" selection-end-column="60" />
<state relative-caret-position="303">
<caret line="89" column="0" lean-forward="true" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -28,6 +28,36 @@
</provider>
</entry>
</file>
<file leaf-file-name="Order.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="149" column="17" lean-forward="true" selection-start-line="149" selection-start-column="17" selection-end-line="149" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CartItem.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-162">
<caret line="38" column="15" lean-forward="false" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OrderServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/OrderServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="533">
<caret line="81" column="24" lean-forward="false" selection-start-line="81" selection-start-column="17" selection-end-line="81" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Payment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
<provider selected="true" editor-type-id="text-editor">
@@ -122,12 +152,12 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/CartResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShoppingCartResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java" />
<option value="$PROJECT_DIR$/src/main/resources/templates/orderConfirmationEmailTemplate.html" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/CheckoutResource.java" />
</list>
</option>
@@ -954,12 +984,12 @@
<workItem from="1488378219247" duration="650000" />
<workItem from="1488461561430" duration="18419000" />
<workItem from="1488731165185" duration="30270000" />
<workItem from="1489159532831" duration="8291000" />
<workItem from="1489159532831" duration="11257000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="100573000" />
<option name="totallyTimeSpent" value="103539000" />
</component>
<component name="ToolWindowManager">
<frame x="72" y="23" width="1280" height="797" extended-state="0" />
@@ -1015,13 +1045,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/OrderServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/utility/USConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1377,14 +1400,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="33" column="15" lean-forward="false" selection-start-line="33" selection-start-column="15" selection-end-line="33" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="143">
@@ -1437,14 +1452,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/orderConfirmationEmailTemplate.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1890">
@@ -1477,10 +1484,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/OrderServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="533">
<caret line="81" column="24" lean-forward="false" selection-start-line="81" selection-start-column="17" selection-end-line="81" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-162">
<caret line="38" column="15" lean-forward="false" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="149" column="17" lean-forward="true" selection-start-line="149" selection-start-column="17" selection-end-line="149" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/CheckoutResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="56" column="60" lean-forward="false" selection-start-line="56" selection-start-column="60" selection-end-line="56" selection-end-column="60" />
<state relative-caret-position="303">
<caret line="89" column="0" lean-forward="true" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>

1
bookstore-api/src/main/java/com/bookstore/domain/CartItem.java
View File

@@ -36,6 +36,7 @@ public class CartItem implements Serializable {
@ManyToOne
@JoinColumn(name = "order_id")
@JsonIgnore
private Order order;
public Long getId() {

20
bookstore-api/src/main/java/com/bookstore/domain/Order.java
View File

@@ -31,12 +31,15 @@ public class Order implements Serializable {
private List<CartItem> cartItemList;
@OneToOne(cascade=CascadeType.ALL)
@JsonIgnore
private ShippingAddress shippingAddress;
@OneToOne(cascade=CascadeType.ALL)
@JsonIgnore
private BillingAddress billingAddress;
@OneToOne(cascade=CascadeType.ALL)
@JsonIgnore
private Payment payment;
@ManyToOne
@@ -130,4 +133,21 @@ public class Order implements Serializable {
public void setUser(User user) {
this.user = user;
}
@Override
public String toString() {
return "Order{" +
"id=" + id +
", orderDate=" + orderDate +
", shippingDate=" + shippingDate +
", shippingMethod='" + shippingMethod + '\'' +
", orderStatus='" + orderStatus + '\'' +
", orderTotal=" + orderTotal +
", cartItemList=" + cartItemList +
", shippingAddress=" + shippingAddress +
", billingAddress=" + billingAddress +
", payment=" + payment +
", user=" + user +
'}';
}
}

11
bookstore-api/src/main/java/com/bookstore/resource/CheckoutResource.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import java.security.Principal;
import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* Created by z00382545 on 3/10/17.
@@ -24,6 +25,8 @@ import java.util.*;
@RequestMapping("/checkout")
public class CheckoutResource {
private Order order = new Order();
@Autowired
private JavaMailSender mailSender;
@@ -43,7 +46,7 @@ public class CheckoutResource {
private MailConstructor mailConstructor;
@RequestMapping(value = "/checkout", method = RequestMethod.POST)
public ResponseEntity checkoutPost(
public Order checkoutPost(
@RequestBody HashMap<String, Object> mapper,
Principal principal
) {
@@ -78,7 +81,11 @@ public class CheckoutResource {
estimatedDeliveryDate = today.plusDays(3);
}
return new ResponseEntity("Order Checkout Successful!", HttpStatus.OK);
this.order = order;
return order;
}
}

BIN
bookstore-api/target/classes/com/bookstore/domain/CartItem.class
View File

Binary file not shown.

BIN
bookstore-api/target/classes/com/bookstore/domain/Order.class
View File

Binary file not shown.

BIN
bookstore-api/target/classes/com/bookstore/resource/CheckoutResource.class
View File

Binary file not shown.