Modified the usage of order's timestamp to allow storing hours.

Author: ProgrammingKiddo

api/src/main/java/coreapi/Order.java

@@ -1,7 +1,7 @@
 package coreapi;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -37,7 +37,7 @@ public interface Order {
 	 * @return	Returns the day of creation of the order
 	 * @see LocalDate
 	 */
-	public LocalDate getDate();
+	public LocalDateTime getDate();
 	/**
 	 * Returns the constant corresponding to the current state of the order,
 	 * as determined by the Enum <code>OrderStatus</code>.

api/src/main/java/coreapi/OrderFactory.java

@@ -1,7 +1,7 @@
 package coreapi;
 
-import java.util.Date;
-import java.time.LocalDate;
+
+import java.time.LocalDateTime;
 /**
  * The static factory to use in the creation of new order objects.
  * @author Borja
@@ -38,7 +38,7 @@ public static int getOrderCount()
 	 */
 	public static Order createOrder(Cafeteria assignedCafeteria)
 	{
-		return createOrder(assignedCafeteria, LocalDate.now());
+		return createOrder(assignedCafeteria, LocalDateTime.now());
 	}
 
 	/**
@@ -51,7 +51,7 @@ public static Order createOrder(Cafeteria assignedCafeteria)
 	 * @see Order
 	 * @see Date
 	 */
-	public static Order createOrder(Cafeteria assignedCafeteria, LocalDate creationDate)
+	public static Order createOrder(Cafeteria assignedCafeteria, LocalDateTime creationDate)
 	{
 		OrderImpl createdOrder = new OrderImpl(orderCount++, creationDate);
 		assignedCafeteria.registerOrder(createdOrder);

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

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.LinkedHashMap;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * Implementation of the <code>Order</code> interface.
@@ -19,7 +19,7 @@ public class OrderImpl implements Order, Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private final int id;
-	private LocalDate creationDate;
+	private LocalDateTime creationDate;
 	// Map cannot take primitive types as the type of its mapped values
 	private LinkedHashMap<Product, Integer> basket;
 	private OrderStatus orderStatus;
@@ -29,7 +29,7 @@ public class OrderImpl implements Order, Serializable {
 	 * @param assignedId	The identifier assigned to this order.
 	 * @param creationDate	The timestamp representing the day this order was created.
 	 */
-	OrderImpl(int assignedId, LocalDate assignedDate)
+	OrderImpl(int assignedId, LocalDateTime assignedDate)
 	{
 		id = assignedId;
 		creationDate = assignedDate;
@@ -48,7 +48,7 @@ public class OrderImpl implements Order, Serializable {
 	 * @return	Returns the day of creation of the order
 	 * @see LocalDate
 	 */
-	public LocalDate getDate() { return creationDate; }
+	public LocalDateTime getDate() { return creationDate; }
 	/**
 	 * Returns the constant corresponding to the current state of the order,
 	 * as determined by the Enum <code>OrderStatus</code>.

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

@@ -169,10 +169,9 @@ public BigDecimal getTotalDailyRegister(Cafeteria coffe, LocalDate date)
 	{
 		BigDecimal dailyRegister = BigDecimal.ZERO;
 
-		//We go through the order history of the establishment
 		for(Order ord: coffe.getOrders())
 		{
-			if(ord.getDate() == date)
+			if(ord.getDate().toLocalDate().equals(date))
 			{
 				dailyRegister = dailyRegister.add(ord.totalCost());
 			}
@@ -183,23 +182,23 @@ public BigDecimal getTotalDailyRegister(Cafeteria coffe, LocalDate date)
 
 	/**
 	 * Returns the cash register from the indicated cafeteria on the designated day.
-	 * @param coffe		The cafeteria from which to calculate the cash register.
+	 * @param coffee		The cafeteria from which to calculate the cash register.
 	 * @param date		The day to which calculate the cash register.
 	 * @return 			Returns the number of orders that have been on the specified date.
 	 */
-	public BigDecimal getNumberOfOrdersDailyRegister(Cafeteria coffe, LocalDate date)
+	public int getNumberOfDailyOrders(Cafeteria coffee, LocalDate date)
 	{
-		int n_orders = 0;
+		int numberOfOrders = 0;
 
 		//We go through the order history of the establishment
-		for(Order ord: coffe.getOrders())
+		for(Order ord: coffee.getOrders())
 		{
-			if(ord.getDate() == date)
+			if(ord.getDate().toLocalDate().equals(date))
 			{
-				dailyRegister++;
+				numberOfOrders++;
 			}
 		}
-		return dailyRegister;
+		return numberOfOrders;
 	}
 
 }

terminalCli/src/main/java/terminalcli/Screen.java

@@ -13,7 +13,10 @@
 import java.io.*;
 import java.util.*;
 import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
 import java.lang.*;
+import java.math.BigDecimal;
 
 public class Screen
 {
@@ -59,7 +62,8 @@ public void main_screen(Cafeteria coffe)
                     	d = keyboard.nextInt();
                     	m = keyboard.nextInt();
                     	y = keyboard.nextInt();
-                    	LocalDate date = LocalDate.of(y,m,d);
+                    	// We create a complete timestamp from the introduced date and the current time.
+                    	LocalDateTime date = LocalDateTime.of(LocalDate.of(y,m,d), LocalTime.now());
 
                     	DailyRegister_screen(coffe, date);
                          break;
@@ -313,7 +317,7 @@ public void Finish_Order_screen(Cafeteria coffe, Order ord)
 	public void DailyRegister_screen(Cafeteria coffe, LocalDate date)
 	{
 	    char op;
-	    int n_orders = OrderService.getNumberOfOrdersDailyRegister(coffe, date);
+	    int n_orders = OrderService.getNumberOfDailyOrders(coffe, date);
 	    BigDecimal daily = getDailyRegister(coffe,date);
 	    Scanner keyboard = new Scanner(System.in);