Arthur Brandao 5 жил өмнө
parent
commit
076a64d382

+ 2 - 0
src/db/Database.java

@@ -63,6 +63,8 @@ public class Database {
 			LOGGER.info("Creating table " + table);
 			execute(sql);
 		});
+		LOGGER.info("Add mock");
+		ManageTable.mock.forEach(req -> execute(req));
 	}
 	
 	public static void unset() {

+ 20 - 1
src/db/ManageTable.java

@@ -1,15 +1,19 @@
 package db;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ManageTable {
 	
 	public final static Map<String, String> create = new LinkedHashMap<>();
-	public final static Map<String, String> drop = new LinkedHashMap<>();	
+	public final static Map<String, String> drop = new LinkedHashMap<>();
+	public final static List<String> mock = new ArrayList<>();
 	static {
 		iniCreate();
 		iniDrop();
+		iniMock();
 	}
 	
 	private static void iniCreate() {
@@ -56,5 +60,20 @@ public class ManageTable {
 		drop.put("Ville", "DROP TABLE Ville");
 		drop.put("Espace", "DROP TABLE Espace");
 	}
+	
+	private static void iniMock() {
+		mock.add("Insert into Espace(LIBELLE) Values('Jeux')");
+		mock.add("Insert into Espace(LIBELLE) Values('Video')");
+		mock.add("Insert into Ville(LIBELLE, CODEPOSTAL) Values('Troyes', '10000')");
+		mock.add("Insert into Ville(LIBELLE, CODEPOSTAL) Values('Reims', '51000')");
+		mock.add("Insert into Ville(LIBELLE, CODEPOSTAL) Values('Lens', '62300')");
+		mock.add("Insert into Niveau(LIBELLE) Values('A')");
+		mock.add("Insert into Niveau(LIBELLE) Values('B')");
+		mock.add("Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Camille claudel', 1, 2)");
+		mock.add("Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('UTT', 1, 1)");
+		mock.add("Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Moulin de la housse', 2, 2)");
+		mock.add("Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Jean Perrin', 3, 1)");
+		mock.add("Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Brandao', 'Arthur', '1996-10-21', 'ab@email.fr', '0605040302', 'Nop', 'LCOM', TRUE, 'Desc', 1, 4)");
+	}
 
 }

+ 18 - 8
src/servlets/TestDb.java

@@ -13,8 +13,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import db.Database;
 import db.ManageTable;
+import db.table.EcoleTable;
 import db.table.EspaceTable;
 import db.table.VilleTable;
+import entity.Ecole;
 import entity.Espace;
 import entity.Ville;
 
@@ -37,15 +39,23 @@ public class TestDb extends HttpServlet {
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		EcoleTable et = EcoleTable.getInstance();
+		List<Ecole> le = et.getAll();
+		le.forEach(elt -> System.out.println(elt.libelle + " " + elt.ville.libelle + " " + elt.niveau.libelle));
+		
+		Ecole e = et.getById(1);
+		e.libelle = "Lycée " + e.libelle;
+		e.ville.libelle = "Maison";
+		et.save(e);
+		
+		et = EcoleTable.getInstance();
+		le = et.getAll();
+		le.forEach(elt -> System.out.println(elt.libelle + " " + elt.ville.libelle + " " + elt.niveau.libelle));
+		
 		VilleTable vt = VilleTable.getInstance();
-		Ville v = new Ville();
-		v.id = 8l;
-		v.libelle = "Troyes";
-		v.cp = "10410";
-		vt.save(v);
-		List<Ville> lv = vt.getAll();
-		System.out.println("Size: " + lv.size());
-		lv.forEach(elt -> System.out.println(elt.id + " " + elt.libelle + " " + elt.cp));
+		Ville v = vt.getById(1);
+		System.out.println(v.libelle);
+		
 		response.getWriter().append("Served at: ").append(request.getContextPath());
 	}