Parte tiendas hecha

oscarrzz · Mar 7, 2024 · 01c560a · 01c560a
1 parent 50fa980
commit 01c560a
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 39 deletions.
diff --git a/practica3/FranquiciasUCBusiness/.classpath b/practica3/FranquiciasUCBusiness/.classpath
@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/practica3/FranquiciasUCBusiness/.settings/org.eclipse.jdt.core.prefs b/practica3/FranquiciasUCBusiness/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...anquiciasUCBusiness/src/main/java/es/unican/is2/FranquiciasUCBusiness/GestionTiendas.java b/...anquiciasUCBusiness/src/main/java/es/unican/is2/FranquiciasUCBusiness/GestionTiendas.java
@@ -5,44 +5,42 @@
 
 import es.unican.is2.FranquiciasUCCommon.DataAccessException;
 import es.unican.is2.FranquiciasUCCommon.IGestionTiendas;
+import es.unican.is2.FranquiciasUCCommon.ITiendasDAO;
 import es.unican.is2.FranquiciasUCCommon.OperacionNoValidaException;
 import es.unican.is2.FranquiciasUCCommon.Tienda;
 
 public class GestionTiendas implements IGestionTiendas {
 
-    private Map<String, Tienda> tiendas; // Almacena las tiendas por nombre
+    private ITiendasDAO tiendas; // Almacena las tiendas por nombre
 
     public GestionTiendas() {
-        this.tiendas = new HashMap<>();
     }
 
     @Override
     public Tienda nuevaTienda(Tienda t) throws DataAccessException {
-        if (!tiendas.containsKey(t.getNombre())) {
-            tiendas.put(t.getNombre(), t);
-            return t;
-        } else {
-            return null; // La tienda ya existe
-        }
+        if (tiendas.tiendaPorNombre(t.getNombre()) != null) {
+            return null;
+        } 
+        tiendas.crearTienda(t);
+        return t;
     }
 
     @Override
     public Tienda eliminarTienda(String nombre) throws OperacionNoValidaException, DataAccessException {
-        Tienda tienda = tiendas.get(nombre);
-        if (tienda != null) {
-            if (tienda.getEmpleados().size() == 0) {
-                tiendas.remove(nombre);
-                return tienda;
-            } else {
-                throw new OperacionNoValidaException("No se puede eliminar la tienda porque tiene empleados.");
-            }
-        } else {
-            return null; // La tienda no existe
+        Tienda tienda = tiendas.tiendaPorNombre(nombre);
+        if (tienda == null) {
+            return null;
+        }
+        if (tienda.getEmpleados().isEmpty()) {
+        	throw new OperacionNoValidaException("La tienda tiene empleados");
         }
+        tiendas.eliminarTienda(tienda.getId());
+        return tienda;
+
     }
 
     @Override
     public Tienda tienda(String nombre) throws DataAccessException {
-        return tiendas.get(nombre);
+        return tiendas.tiendaPorNombre(nombre);
     }
 }
diff --git a/practica3/FranquiciasUCCommon/.classpath b/practica3/FranquiciasUCCommon/.classpath
@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/practica3/FranquiciasUCCommon/.settings/org.eclipse.jdt.core.prefs b/practica3/FranquiciasUCCommon/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/practica3/FranquiciasUCDAO/.classpath b/practica3/FranquiciasUCDAO/.classpath
@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/practica3/FranquiciasUCDAO/.settings/org.eclipse.jdt.core.prefs b/practica3/FranquiciasUCDAO/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/practica3/FranquiciasUCGUI/.classpath b/practica3/FranquiciasUCGUI/.classpath
@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/practica3/FranquiciasUCGUI/.settings/org.eclipse.jdt.core.prefs b/practica3/FranquiciasUCGUI/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/practica3/FranquiciasUCMain/.classpath b/practica3/FranquiciasUCMain/.classpath
@@ -26,7 +26,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/practica3/FranquiciasUCMain/.settings/org.eclipse.jdt.core.prefs b/practica3/FranquiciasUCMain/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8