Updated some functionality of the coreapi.

Author: ProgrammingKiddo

api/src/main/java/coreapi/Cafeteria.java

@@ -18,7 +18,7 @@ public class Cafeteria implements Serializable
 {
 	private static final long serialVersionUID = 1L;
 	private LinkedHashMap<Product, Integer> productStock;
-	private List<Order> orderHistory;
+	private List<Integer> orderHistory;
 	private String name;
 	private int id;
 	private List<String> types;
@@ -36,7 +36,7 @@ public class Cafeteria implements Serializable
 	public Cafeteria(int assignedId, String givenName, String Email)
 	{
 		productStock = new LinkedHashMap<Product, Integer>();
-		orderHistory = new ArrayList<Order>();
+		orderHistory = new ArrayList<Integer>();
 		id = assignedId;
 		name = givenName;
 		types = new ArrayList<String>();
@@ -193,14 +193,14 @@ public void removeProduct(Product prod)
 	 */
 	public void registerOrder(Order newOrder)
 	{
-		orderHistory.add(newOrder);
+		orderHistory.add(Integer.valueOf(newOrder.getId()));
 	}
 
 	/**
 	 * Returns the list of orders registered to this cafeteria.
 	 * @return Returns the list of orders registered to this cafeteria.
 	 */
-	public List<Order> getOrders()
+	public List<Integer> getOrdersID()
 	{
 		return List.copyOf(orderHistory);
 	}

api/src/main/java/coreapi/OrderImpl.java

@@ -146,13 +146,11 @@ public BigDecimal totalCost()
 		BigDecimal sumCost = BigDecimal.ZERO;
 		BigDecimal productCost;
 		BigDecimal productQuantity;
-		System.out.println(basket.isEmpty());
 		for (Map.Entry<Product, Integer> entry : basket.entrySet())
 		{
 			// We create a copy of the product's price as to not modify its value via this reference.
 			productCost = entry.getKey().getPrice();
 			productQuantity = new BigDecimal(entry.getValue().intValue());
-			System.out.println(entry.getKey().getName()+"-"+productCost.doubleValue()+"--"+productQuantity.intValue());
 			productCost = productCost.multiply(productQuantity);
 
 			sumCost = sumCost.add(productCost);

api/src/main/java/coreapi/OrderService.java

@@ -165,12 +165,12 @@ public BigDecimal getTotalDailyRegister(Cafeteria coffe, LocalDate date) throws
 
 		if(date.compareTo(LocalDate.now()) <= 0)
 		{
-			for(Order ord: coffe.getOrders())
+			for(Integer ordID: coffe.getOrdersID())
 			{
-				if(ord.getDate().toLocalDate().equals(date))
+				Order aux = oData.getOrder(ordID.intValue());
+				if(aux.getDate().toLocalDate().equals(date))
 				{
-					dailyRegister = dailyRegister.add(ord.totalCost());
-					System.out.println("Order "+ord.getId()+": "+ord.totalCost());
+					dailyRegister = dailyRegister.add(aux.totalCost());
 				}
 			}
 		}
@@ -194,9 +194,10 @@ public int getNumberOfDailyOrders(Cafeteria coffee, LocalDate date) throws Inval
 		int numberOfOrders = 0;
 		if(date.compareTo(LocalDate.now()) <= 0)
 		{
-			for(Order ord: coffee.getOrders())
+			for(Integer ordID : coffee.getOrdersID())
 			{
-				if(ord.getDate().toLocalDate().equals(date))
+				Order aux = oData.getOrder(ordID.intValue());
+				if(aux.getDate().toLocalDate().equals(date))
 				{
 					numberOfOrders++;
 				}

api/src/main/java/coreapi/Product.java

@@ -36,5 +36,9 @@ public interface Product {
 	 */
 	public String getType();
 
+	@Override
 	public boolean equals(Object o);
+	
+	@Override
+	public int hashCode();
 }

api/src/main/java/coreapi/ProductImpl.java

@@ -72,20 +72,33 @@ public String getType()
 		return type;
 	}
 
+	@Override
 	public boolean equals(Object o)
 	{
 		if (o == this)
 		{
 			return true;
 		}
 
-		if (!(o instanceof Product))
+		if(!(o instanceof Product) && !(o instanceof ProductImpl))
 		{
 			return false;
 		}
 
 		Product p = (Product) o;
-		
 		return p.getId() == this.id;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		int result = 17;
+		
+		result = 31 * result + id;
+		result = 31 * result + price.hashCode();
+		result = 31 * result + name.hashCode();
+		result = 31 * result + type.hashCode();
+		
+		return result;
+	}
 }

api/src/main/java/coreapi/User.java

@@ -26,12 +26,12 @@ public class User implements Serializable
 	private String surname;
 	private String email;
 
-	//This list stores all the orders that the user has made
-	private List<Order> UserOrderList;
+	//This list stores all the ids of the orders that the user has made
+	private List<Integer> UserOrderList;
 
 	public User() 
 	{
-		UserOrderList = new ArrayList<Order>();
+		UserOrderList = new ArrayList<Integer>();
 	}
 	/**
 	 * Creates a new instance of a specific user.
@@ -50,7 +50,7 @@ public User(String Name, String Surname, int ncard, LocalDate birth_date, int Dn
 		this.surname = Surname;
 		this.dni = Dni;
 		this.email = Email;
-		UserOrderList = new ArrayList<Order>();
+		UserOrderList = new ArrayList<Integer>();
 	}
 
 	/**
@@ -102,7 +102,7 @@ public String getEmail()
 	* Returns the list of orders made by the user.
 	* @return Returns the list of orders made by the user.
 	*/
-	public List<Order> getUserOrderList()
+	public List<Integer> getUserOrderList()
 	{
 		return List.copyOf(UserOrderList);
 	}
@@ -195,12 +195,12 @@ public LocalDate getBirthDate()
 	}
 
 	/**
-	 * Set the new order to the list of the user order.
+	 * Set the new order id to the list of the user order.
 	 * @param o		The new order to set to the list.
 	 */
 	public void setOrder(Order o)
 	{
-		boolean b = UserOrderList.add(o);
+		boolean b = UserOrderList.add(Integer.valueOf(o.getId()));
 	}
 
 	/**