From f8415cc4efd4a17bdb1a58caea1819918fd334c4 Mon Sep 17 00:00:00 2001
From: Gowrisankar J g <59323@hexaware.com>
Date: Mon, 27 Sep 2021 15:50:40 +0530
Subject: [PATCH] updated orders entity class

---
 .../com/example/urbanbazaar/model/Orders.java | 139 ++----------------
 1 file changed, 16 insertions(+), 123 deletions(-)

diff --git a/UB_OrderServiceProxy/src/main/java/com/example/urbanbazaar/model/Orders.java b/UB_OrderServiceProxy/src/main/java/com/example/urbanbazaar/model/Orders.java
index c0d100e..cc31b91 100644
--- a/UB_OrderServiceProxy/src/main/java/com/example/urbanbazaar/model/Orders.java
+++ b/UB_OrderServiceProxy/src/main/java/com/example/urbanbazaar/model/Orders.java
@@ -13,174 +13,67 @@ public class Orders {
 	@Id
 	@GeneratedValue
 	private int orderid;
-	private int orderuserid;
+	private int userid;
 	private float orderamount;
-	private String ordershipaddress;
-	private String ordershipaddress2;
-	private String ordercity;
-	private String orderzip;
-	private String orderstate;
-	private String ordercountry;
-	private String orderphone;
 	private float ordershippingcost;
-	private float ordertax;
-	private String orderemail;
 	private Date orderdate;
-	private String ordershipped;
+	private boolean ordershipped;
 	private String ordertrackingnumber;
-
 	public int getOrderid() {
 		return orderid;
 	}
-
 	public void setOrderid(int orderid) {
 		this.orderid = orderid;
 	}
-
-	public int getOrderuserid() {
-		return orderuserid;
+	public int getUserid() {
+		return userid;
 	}
-
-	public void setOrderuserid(int orderuserid) {
-		this.orderuserid = orderuserid;
+	public void setUserid(int userid) {
+		this.userid = userid;
 	}
-
 	public float getOrderamount() {
 		return orderamount;
 	}
-
 	public void setOrderamount(float orderamount) {
 		this.orderamount = orderamount;
 	}
-
-	public String getOrdershipaddress() {
-		return ordershipaddress;
-	}
-
-	public void setOrdershipaddress(String ordershipaddress) {
-		this.ordershipaddress = ordershipaddress;
-	}
-
-	public String getOrdershipaddress2() {
-		return ordershipaddress2;
-	}
-
-	public void setOrdershipaddress2(String ordershipaddress2) {
-		this.ordershipaddress2 = ordershipaddress2;
-	}
-
-	public String getOrdercity() {
-		return ordercity;
-	}
-
-	public void setOrdercity(String ordercity) {
-		this.ordercity = ordercity;
-	}
-
-	public String getOrderzip() {
-		return orderzip;
-	}
-
-	public void setOrderzip(String orderzip) {
-		this.orderzip = orderzip;
-	}
-
-	public String getOrderstate() {
-		return orderstate;
-	}
-
-	public void setOrderstate(String orderstate) {
-		this.orderstate = orderstate;
-	}
-
-	public String getOrdercountry() {
-		return ordercountry;
-	}
-
-	public void setOrdercountry(String ordercountry) {
-		this.ordercountry = ordercountry;
-	}
-
-	public String getOrderphone() {
-		return orderphone;
-	}
-
-	public void setOrderphone(String orderphone) {
-		this.orderphone = orderphone;
-	}
-
 	public float getOrdershippingcost() {
 		return ordershippingcost;
 	}
-
 	public void setOrdershippingcost(float ordershippingcost) {
 		this.ordershippingcost = ordershippingcost;
 	}
-
-	public float getOrdertax() {
-		return ordertax;
-	}
-
-	public void setOrdertax(float ordertax) {
-		this.ordertax = ordertax;
-	}
-
-	public String getOrderemail() {
-		return orderemail;
-	}
-
-	public void setOrderemail(String orderemail) {
-		this.orderemail = orderemail;
-	}
-
 	public Date getOrderdate() {
 		return orderdate;
 	}
-
 	public void setOrderdate(Date orderdate) {
 		this.orderdate = orderdate;
 	}
-
-	public String getOrdershipped() {
+	public boolean isOrdershipped() {
 		return ordershipped;
 	}
-
-	public void setOrdershipped(String ordershipped) {
+	public void setOrdershipped(boolean ordershipped) {
 		this.ordershipped = ordershipped;
 	}
-
 	public String getOrdertrackingnumber() {
 		return ordertrackingnumber;
 	}
-
 	public void setOrdertrackingnumber(String ordertrackingnumber) {
 		this.ordertrackingnumber = ordertrackingnumber;
 	}
-
-	public Orders(int orderid, int orderuserid, float orderamount, String ordershipaddress, String ordershipaddress2,
-			String ordercity, String orderzip, String orderstate, String ordercountry, String orderphone,
-			float ordershippingcost, float ordertax, String orderemail, Date orderdate, String ordershipped,
-			String ordertrackingnumber) {
+	
+	public Orders() {}
+	
+	public Orders(int orderid, int userid, float orderamount, float ordershippingcost, Date orderdate,
+			boolean ordershipped, String ordertrackingnumber) {
+		super();
 		this.orderid = orderid;
-		this.orderuserid = orderuserid;
+		this.userid = userid;
 		this.orderamount = orderamount;
-		this.ordershipaddress = ordershipaddress;
-		this.ordershipaddress2 = ordershipaddress2;
-		this.ordercity = ordercity;
-		this.orderzip = orderzip;
-		this.orderstate = orderstate;
-		this.ordercountry = ordercountry;
-		this.orderphone = orderphone;
 		this.ordershippingcost = ordershippingcost;
-		this.ordertax = ordertax;
-		this.orderemail = orderemail;
 		this.orderdate = orderdate;
 		this.ordershipped = ordershipped;
 		this.ordertrackingnumber = ordertrackingnumber;
 	}
-
-	public Orders() {
-
-	}
-
+	
 }