updated modules in line with main project

ShopifyOrderAndReview/src/main/java/com/shopify/cart/controller/OrderController.java

@@ -43,7 +43,6 @@ public class OrderController {
 			Long num=orderRepository.maxOrderNumber();
 			orderNo=num+1;
 		}		
-
 		for(Cart c : allItems) {
 			Order orderNew=new Order();
 			orderNew.setUser(c.getUser());
@@ -52,10 +51,8 @@ public class OrderController {
 			orderNew.setQuantity(c.getQuantity());
 			orderNew.setPrice(c.getPrice());
 			orderNew.setOrderNumber(orderNo);
-			orderRepository.save(orderNew);
-			
+			orderRepository.save(orderNew);	
 		}
- 
 	} 
 	@GetMapping("/order/all")
 	public List<Order> getOrders(){

ShopifyOrderAndReview/src/main/java/com/shopify/cart/controller/ReviewController.java

@@ -60,11 +60,12 @@ public class ReviewController {
 			List<ReviewDto> dtoList=new ArrayList<>();
 			for(Review r : list) {
 				ReviewDto dto=new ReviewDto();
+				dto.setId(r.getId());
 				dto.setReviewText(r.getReviewText());
-				dto.setProduct_name(r.getProduct().getName());
+				dto.setProductName(r.getProduct().getName());
 				dto.setUsername(r.getUser().getName());
 				dto.setRating(r.getRating());
-				dto.setUser_id(r.getUser().getId());
+				dto.setUserId(r.getUser().getId());
 				dtoList.add(dto);
 			}
 			return dtoList;
@@ -88,15 +89,14 @@ public class ReviewController {
 			List<Review>list =reviewRepository.findAllByProductId(pid);
 
 			List<ReviewDto> dtoList=new ArrayList<>();
-			
 			for(Review r : list) {
 				ReviewDto dto=new ReviewDto();
+				dto.setId(r.getId());
 				dto.setReviewText(r.getReviewText());
-				dto.setProduct_name(r.getProduct().getName());
+				dto.setProductName(r.getProduct().getName());
 				dto.setUsername(r.getUser().getName());
 				dto.setRating(r.getRating());
-				dto.setUser_id(r.getUser().getId());
-				dto.setId(r.getId());
+				dto.setUserId(r.getUser().getId());
 				dtoList.add(dto);
 			}
 			return dtoList;

ShopifyOrderAndReview/src/main/java/com/shopify/cart/model/ReviewDto.java

@@ -1,29 +1,23 @@
 package com.shopify.cart.model;
 
 public class ReviewDto {
+	private Long id;
 	private String reviewText;
 	private Integer rating;
+	private Long userId;
 	private String username;
-	private String product_name;
-	private Long user_id;
-	private Long id;
-	
+	private String productName;
+	public ReviewDto() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
 	public Long getId() {
 		return id;
 	}
 	public void setId(Long id) {
 		this.id = id;
 	}
-	public Long getUser_id() {
-		return user_id;
-	}
-	public void setUser_id(Long user_id) {
-		this.user_id = user_id;
-	}
-	public ReviewDto() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
+
 	public String getReviewText() {
 		return reviewText;
 	}
@@ -36,18 +30,22 @@ public class ReviewDto {
 	public void setRating(Integer rating) {
 		this.rating = rating;
 	}
+	public Long getUserId() {
+		return userId;
+	}
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
 	public String getUsername() {
 		return username;
 	}
 	public void setUsername(String username) {
 		this.username = username;
 	}
-	public String getProduct_name() {
-		return product_name;
+	public String getProductName() {
+		return productName;
 	}
-	public void setProduct_name(String product_name) {
-		this.product_name = product_name;
+	public void setProductName(String productName) {
+		this.productName = productName;
 	}
-	
-
 }

ShopifyOrderAndReview/src/main/resources/application.properties

@@ -1,13 +1,10 @@
 server.port=8003
 
-spring.datasource.url=jdbc:mysql://10.3.117.26:3306/Shopify_DB?createDatabaseIfNotExist=true
-#spring.datasource.url=jdbc:mysql://localhost:3306/Shopify_DB?createDatabaseIfNotExist=true
-
-spring.datasource.username=testuser
+spring.datasource.url=jdbc:mysql://10.3.117.23:3306/Shopify_DB?createDatabaseIfNotExist=true
+spring.datasource.username=testuser1
 spring.datasource.password=PASSWORD123
 
-#spring.datasource.username=root
-#spring.datasource.password=root
+server.servlet.context-path=/api3
 
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect