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-09 09:21:18 -05:00
parent d9e6af4125
commit e50a47f180
13 changed files with 333 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bookstore-api/src/main/java/com/bookstore/domain/UserShipping.java
View File

@@ -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 UserShipping implements Serializable {
@ManyToOne
@JoinColumn(name = "user_id")
@JsonIgnore
private User user;
public Long getId() {

66
bookstore-api/src/main/java/com/bookstore/resource/PaymentResource.java
View File

@@ -45,39 +45,39 @@ public class PaymentResource {
return new ResponseEntity("Payment Added(Updated) Successfully!", HttpStatus.OK);
}
@RequestMapping("/update")
public ResponseEntity updateCreditCard(
@RequestBody String id, Principal principal,
Model model
) {
User user = userService.findByUsername(principal.getName());
UserPayment userPayment = userPaymentService.findById(Long.parseLong(id));
if (user.getId()!=userPayment.getUser().getId()) {
return new ResponseEntity("Invalid Request", HttpStatus.BAD_REQUEST);
} else {
model.addAttribute("user", user);
UserBilling userBilling = userPayment.getUserBilling();
model.addAttribute("userPayment", userPayment);
model.addAttribute("userBilling", userBilling);
List<String> stateList = USConstants.listOfUSStatesCode;
Collections.sort(stateList);
model.addAttribute("stateList", stateList);
model.addAttribute("addNewCreditCard", true);
model.addAttribute("classActiveBilling", true);
model.addAttribute("listOfShippingAddresses", true);
model.addAttribute("userPaymentList", user.getUserPaymentList());
model.addAttribute("userShippingList", user.getUserShippingList());
model.addAttribute("orderList", user.getOrderList());
return new ResponseEntity("Payment Added(Updated) Successfully!", HttpStatus.OK);
}
}
// @RequestMapping("/update")
// public ResponseEntity updateCreditCard(
// @RequestBody String id, Principal principal,
// Model model
// ) {
//
// User user = userService.findByUsername(principal.getName());
// UserPayment userPayment = userPaymentService.findById(Long.parseLong(id));
//
// if (user.getId()!=userPayment.getUser().getId()) {
// return new ResponseEntity("Invalid Request", HttpStatus.BAD_REQUEST);
// } else {
//
// model.addAttribute("user", user);
// UserBilling userBilling = userPayment.getUserBilling();
// model.addAttribute("userPayment", userPayment);
// model.addAttribute("userBilling", userBilling);
//
// List<String> stateList = USConstants.listOfUSStatesCode;
// Collections.sort(stateList);
// model.addAttribute("stateList", stateList);
//
// model.addAttribute("addNewCreditCard", true);
// model.addAttribute("classActiveBilling", true);
// model.addAttribute("listOfShippingAddresses", true);
// model.addAttribute("userPaymentList", user.getUserPaymentList());
// model.addAttribute("userShippingList", user.getUserShippingList());
// model.addAttribute("orderList", user.getOrderList());
//
//
// return new ResponseEntity("Payment Added(Updated) Successfully!", HttpStatus.OK);
// }
// }
@RequestMapping(value = "/remove", method = RequestMethod.POST)
public ResponseEntity removePaymentPost(

70
bookstore-api/src/main/java/com/bookstore/resource/ShippingResource.java Normal file
View File

@@ -0,0 +1,70 @@
package com.bookstore.resource;
import com.bookstore.domain.User;
import com.bookstore.domain.UserBilling;
import com.bookstore.domain.UserPayment;
import com.bookstore.domain.UserShipping;
import com.bookstore.service.ShippingAddressService;
import com.bookstore.service.UserPaymentService;
import com.bookstore.service.UserService;
import com.bookstore.service.UserShippingService;
import com.bookstore.utility.USConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.security.Principal;
import java.util.Collections;
import java.util.List;
/**
* Created by z00382545 on 3/9/17.
*/
@RestController
@RequestMapping("/shipping")
public class ShippingResource {
@Autowired
private UserService userService;
@Autowired
private UserShippingService userShippingService;
@RequestMapping(value = "/add", method = RequestMethod.POST)
public ResponseEntity AddNewUserShippingPost(
@RequestBody UserShipping userShipping,
Principal principal, Model model) {
User user = userService.findByUsername(principal.getName());
userService.updateUserShipping(userShipping, user);
return new ResponseEntity("Shipping Added(Updated) Successfully!", HttpStatus.OK);
}
@RequestMapping(value = "/remove", method = RequestMethod.POST)
public ResponseEntity removeUserShippingPost(
@RequestBody String id,
Principal principal, Model model) {
User user = userService.findByUsername(principal.getName());
userShippingService.removeById(Long.parseLong(id));
return new ResponseEntity("Shipping Removed Successfully!", HttpStatus.OK);
}
@RequestMapping(value = "/setDefault", method = RequestMethod.POST)
public ResponseEntity setDefaultUserShippingPost(
@RequestBody String id,
Principal principal, Model model) {
User user = userService.findByUsername(principal.getName());
userService.setUserDefaultShipping(Long.parseLong(id), user);
return new ResponseEntity("Set Default Shipping Successfully!", HttpStatus.OK);
}
}