diff --git a/Shopify-Cart/src/main/java/com/shopify/cart/controller/CartController.java b/Shopify-Cart/src/main/java/com/shopify/cart/controller/CartController.java index 99b1e82..18cfcb0 100644 --- a/Shopify-Cart/src/main/java/com/shopify/cart/controller/CartController.java +++ b/Shopify-Cart/src/main/java/com/shopify/cart/controller/CartController.java @@ -1,17 +1,15 @@ package com.shopify.cart.controller; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.UserDetailsRepositoryReactiveAuthenticationManager; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.shopify.cart.model.Cart; -import com.shopify.cart.model.Product; -import com.shopify.cart.model.User; import com.shopify.cart.repository.CartRepository; import com.shopify.cart.repository.ProductRepository; +import com.shopify.cart.repository.UserRepository; @RestController public class CartController { @@ -20,9 +18,12 @@ public class CartController { private CartRepository cartRepository; @Autowired private ProductRepository productRepository; + @Autowired + private UserRepository userRepository; - @PostMapping("/cart/{pid}") - public Cart postCart(@PathVariable("pid") Long pid, @RequestBody Cart cart) { + @PostMapping("/cart/{uid}/{pid}") + public Cart postCart(@PathVariable("uid") Long uid, @PathVariable("pid") Long pid, @RequestBody Cart cart) { + cart.setUser(userRepository.getById(uid)); cart.setProduct(productRepository.getById(pid)); return cartRepository.save(cart); } diff --git a/Shopify-Cart/src/main/java/com/shopify/cart/controller/ProductController.java b/Shopify-Cart/src/main/java/com/shopify/cart/controller/ProductController.java index 9d68bf1..d8acb19 100644 --- a/Shopify-Cart/src/main/java/com/shopify/cart/controller/ProductController.java +++ b/Shopify-Cart/src/main/java/com/shopify/cart/controller/ProductController.java @@ -1,5 +1,21 @@ package com.shopify.cart.controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.shopify.cart.model.Product; +import com.shopify.cart.repository.ProductRepository; + +@RestController public class ProductController { + @Autowired + private ProductRepository productRepository; + + @PostMapping("/product") + public Product postProduct(@RequestBody Product product) { + return productRepository.save(product); + } } diff --git a/Shopify-Cart/src/main/java/com/shopify/cart/controller/UserController.java b/Shopify-Cart/src/main/java/com/shopify/cart/controller/UserController.java new file mode 100644 index 0000000..c413b5d --- /dev/null +++ b/Shopify-Cart/src/main/java/com/shopify/cart/controller/UserController.java @@ -0,0 +1,28 @@ +package com.shopify.cart.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.shopify.cart.model.User; +import com.shopify.cart.repository.UserRepository; + +@RestController +public class UserController { + + @Autowired + private UserRepository userRepository; + + @PostMapping("/user") + public User postUser(@RequestBody User user) { + return userRepository.save(user); + } + + @GetMapping("/user/{uid}") + public User getUserById(@PathVariable("uid") Long uid) { + return userRepository.getById(uid); + } +} diff --git a/Shopify-Cart/src/main/java/com/shopify/cart/model/Product.java b/Shopify-Cart/src/main/java/com/shopify/cart/model/Product.java index b9896c4..9e209c3 100644 --- a/Shopify-Cart/src/main/java/com/shopify/cart/model/Product.java +++ b/Shopify-Cart/src/main/java/com/shopify/cart/model/Product.java @@ -13,7 +13,7 @@ public class Product { private Long id; private String name; private String description; - private String rating; + private Integer rating; private Double marketRetailPrice; private Integer discount; private Double discountedPrice; @@ -42,11 +42,11 @@ public class Product { this.description = description; } - public String getRating() { + public Integer getRating() { return rating; } - public void setRating(String rating) { + public void setRating(Integer rating) { this.rating = rating; } diff --git a/Shopify-Cart/src/main/java/com/shopify/cart/model/User.java b/Shopify-Cart/src/main/java/com/shopify/cart/model/User.java index 0c96516..ca3f1d7 100644 --- a/Shopify-Cart/src/main/java/com/shopify/cart/model/User.java +++ b/Shopify-Cart/src/main/java/com/shopify/cart/model/User.java @@ -10,131 +10,104 @@ public class User { @Id @GeneratedValue(strategy = GenerationType.AUTO) - private int User_id; - private String Name; - private String Username; - private String Password; - private String MobileNumber; - private String EmailID; - private String Address; - private String City; - private String State; - private String Country; - private String PinCode; + private Long id; + private String name; + private String username; + private String password; + private String mobileNumber; + private String emailId; + private String address; + private String city; + private String state; + private String country; + private String pinCode; - public int getUser_id() { - return User_id; + public Long getId() { + return id; } - public void setUser_id(int user_id) { - User_id = user_id; + public void setId(Long id) { + this.id = id; } public String getName() { - return Name; + return name; } public void setName(String name) { - Name = name; + this.name = name; } public String getUsername() { - return Username; + return username; } public void setUsername(String username) { - Username = username; + this.username = username; } public String getPassword() { - return Password; + return password; } public void setPassword(String password) { - Password = password; + this.password = password; } public String getMobileNumber() { - return MobileNumber; + return mobileNumber; } public void setMobileNumber(String mobileNumber) { - MobileNumber = mobileNumber; + this.mobileNumber = mobileNumber; } - public String getEmailID() { - return EmailID; + public String getEmailId() { + return emailId; } - public void setEmailID(String emailID) { - EmailID = emailID; + public void setEmailId(String emailId) { + this.emailId = emailId; } public String getAddress() { - return Address; + return address; } public void setAddress(String address) { - Address = address; + this.address = address; } public String getCity() { - return City; + return city; } public void setCity(String city) { - City = city; + this.city = city; } public String getState() { - return State; + return state; } public void setState(String state) { - State = state; + this.state = state; } public String getCountry() { - return Country; + return country; } public void setCountry(String country) { - Country = country; + this.country = country; } public String getPinCode() { - return PinCode; + return pinCode; } public void setPinCode(String pinCode) { - PinCode = pinCode; - } - - public User() { - super(); - } - - public User(int user_id, String name, String username, String password, String mobileNumber, String emailID, - String address, String city, String state, String country, String pinCode) { - super(); - User_id = user_id; - Name = name; - Username = username; - Password = password; - MobileNumber = mobileNumber; - EmailID = emailID; - Address = address; - City = city; - State = state; - Country = country; - PinCode = pinCode; - } - - @Override - public String toString() { - return "User [User_id=" + User_id + ", Name=" + Name + ", Username=" + Username + ", Password=" + Password - + ", MobileNumber=" + MobileNumber + ", EmailID=" + EmailID + ", Address=" + Address + ", City=" + City - + ", State=" + State + ", Country=" + Country + ", PinCode=" + PinCode + "]"; + this.pinCode = pinCode; } } diff --git a/Shopify-Cart/src/main/resources/application.properties b/Shopify-Cart/src/main/resources/application.properties index 8b13789..cbeb68c 100644 --- a/Shopify-Cart/src/main/resources/application.properties +++ b/Shopify-Cart/src/main/resources/application.properties @@ -1 +1,12 @@ +server.port=9999 +spring.datasource.url=jdbc:mysql://localhost:3306/Shopify_DB?createDatabaseIfNotExist=true +spring.datasource.username=root +spring.datasource.password=Password123 + +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect + +spring.jpa.hibernate.ddl-auto=update +spring.jackson.serialization.fail-on-empty-beans=false + +spring.jpa.properties.hibernate.format_sql=true