Fixed all methods in the HTTP api.

Author: ProgrammingKiddo

DataBaseCruca/.classpath

@@ -13,13 +13,14 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-11.0.4.11-hotspot">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -28,5 +29,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/apihttp"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/projectcruca"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

DataBaseCruca/.gitignore

@@ -6,6 +6,7 @@
  * @author Maria
  * 
  */
+
 import java.math.BigDecimal;
 import java.util.Random;
 
@@ -59,10 +60,8 @@ public BigDecimal userBalace(int uDNI)
     /**
      * Carry out a reload on a user's card.
      * @param r		Reload data.
-     * @throws WrongTransactionException	If the operation to be performed 
-	 * 										fails because the data entered is incorrect.
      */
-    public void addBalance(Reload r) throws WrongTransactionException
+    public void addBalance(Reload r)
     {
         try
         {
@@ -105,7 +104,7 @@ public void paymentAuthoritation(Order o, int uDNI)
      * @throws WrongTransactionException	If the operation to be performed 
 	 * 										fails because the data entered is incorrect.
      */
-    public void PayRegister(Payment p, int nCard) throws WrongTransactionException
+    public void payRegister(Payment p, int nCard) throws WrongTransactionException
     {
         try
         {
@@ -128,7 +127,7 @@ public void PayRegister(Payment p, int nCard) throws WrongTransactionException
      * @throws WrongTransactionException	If the operation to be performed 
 	 * 										fails because the data entered is incorrect.
      */
-    public void payconfirm(int idord, int iduser, String code) throws WrongTransactionException,UnreachableStatusException
+    public void payconfirm(int idord, int iduser, String code)
     {
         User u = DU.getUser(iduser);
         Order o = DO.getOrder(idord);
@@ -138,8 +137,7 @@ public void payconfirm(int idord, int iduser, String code) throws WrongTransacti
         	try
         	{
         		OService.OrderStatus_Payed(o);
-        		PayRegister(new Payment("Pago Pedido " + idord, u , o.totalCost()), c.getCardNumber());
-        		
+        		payRegister(new Payment("Pago Pedido " + idord, u , o.totalCost()), c.getCardNumber());
         	}
         	catch(UnreachableStatusException ex)
         	{

DataBaseCruca/.project

@@ -94,26 +94,11 @@ public void payregister(@RequestBody Payment p, @PathVariable int ncard) throws
 	 * Check that the payment has been made correctly and the order status has been changed to <code>PAYED</code>.
 	 * @param ou		Map containing the ID of the order and the ID of the user to whom the order belongs.
 	 * @param code		Validation code for the payment of the specific order
-	 * @throws WrongTransactionException	If the operation to be performed 
-	 * 										fails because the data entered is incorrect.
-	 * @throws UnreachableStatusException	If the conditions to set the <code>PAYED</code> status aren't met.
 	 */
 	@PutMapping("/payconfirm/{code}")
-	public void payComfirm(@RequestBody Map<Integer, Integer> ou, @PathVariable("code") String code) throws WrongTransactionException, UnreachableStatusException
+	public void payComfirm(int userId, int orderId, @PathVariable("code") String code)
 	{
-		Map.Entry<Integer, Integer> entry = ou.entrySet().iterator().next();
-		try
-		{
-			CService.payconfirm(entry.getKey().intValue() , entry.getValue().intValue() , code);
-		}
-		catch(WrongTransactionException e)
-		{
-			
-		}
-		catch(UnreachableStatusException e)
-		{
-			
-		}
+		CService.payconfirm(orderId, userId, code);
 	}
 
 	@GetMapping("/seecard/{iduser}")

DataBaseCruca/.settings/org.eclipse.core.resources.prefs

@@ -189,11 +189,20 @@ public void removeProduct(Product prod)
 
 	/**
 	 * Registers an order as pertaining to this cafeteria.
-	 * @param newOrder The order to register to this cafeteria.
+	 * @param newOrderId The order to register to this cafeteria.
 	 */
-	public void registerOrder(Order newOrder)
+	public void registerOrder(int newOrderId)
 	{
-		orderHistory.add(Integer.valueOf(newOrder.getId()));
+		orderHistory.add(Integer.valueOf(newOrderId));
+	}
+	
+	/**
+	 * Removes the connection of an order pertaining to this cafeteria.
+	 * @param newOrderId The order to remove from this cafeteria.
+	 */
+	public void deleteOrder(int ordId)
+	{
+		orderHistory.remove(Integer.valueOf(ordId));
 	}
 
 	/**