From d3168c58b2235329d9287c14410ffd0a7e1a43bb Mon Sep 17 00:00:00 2001
From: Juanjo <juanjo@fp.edu.es>
Date: Sun, 5 Feb 2023 21:55:44 +0100
Subject: [PATCH] ApiControlar

---
 .../es/fp/edu/conecta2/controladores/ApiControlador.java     | 2 +-
 src/main/resources/application.properties                    | 5 +++--
 .../java/es/fp/edu/conecta2/Conecta2Application.java         | 5 +++++
 .../java/es/fp/edu/conecta2/Conecta2ApplicationTests.java    | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)
 rename src/{main => test}/java/es/fp/edu/conecta2/Conecta2Application.java (88%)

diff --git a/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java b/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java
index 18a75b1..1d69c49 100644
--- a/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java
+++ b/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java
@@ -6,7 +6,6 @@ import es.fp.edu.conecta2.servicios.AdminService;
 import es.fp.edu.conecta2.servicios.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -40,6 +39,7 @@ public class ApiControlador {
 
     @GetMapping()
     public List<User> obtenerUsuarios(){
+
         return servicioUser.listarUser();
     }
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 110e2bf..ac9caa7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,10 +20,11 @@ persistente.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialec
 #persistente.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 
 
-temporal.datasource.url=jdbc:h2:mem:test
+temporal.datasource.url=jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+temporal.datasource.driverClassName=org.h2.Driver
 temporal.datasource.username=sa
 temporal.datasource.password=
-temporal.jpa.show-sql=true
+temporal.jpa.database-platform=org.hibernate.dialect.H2Dialect
 temporal.jpa.hibernate.ddl-auto=update
 
 
diff --git a/src/main/java/es/fp/edu/conecta2/Conecta2Application.java b/src/test/java/es/fp/edu/conecta2/Conecta2Application.java
similarity index 88%
rename from src/main/java/es/fp/edu/conecta2/Conecta2Application.java
rename to src/test/java/es/fp/edu/conecta2/Conecta2Application.java
index e0280a3..c9b6821 100644
--- a/src/main/java/es/fp/edu/conecta2/Conecta2Application.java
+++ b/src/test/java/es/fp/edu/conecta2/Conecta2Application.java
@@ -2,6 +2,7 @@ package es.fp.edu.conecta2;
 
 import es.fp.edu.conecta2.modelo.user.User;
 import es.fp.edu.conecta2.repo.user.IUserRepo;
+import es.fp.edu.conecta2.servicios.AdminService;
 import es.fp.edu.conecta2.servicios.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
@@ -15,9 +16,13 @@ public class Conecta2Application implements CommandLineRunner {
         SpringApplication.run(Conecta2Application.class, args);
     }
 
+
     @Autowired
     private UserService repositorioUser;
 
+    @Autowired
+    private AdminService repositorioAdmin;
+
     @Override
     public void run(String... args) throws Exception {
         User user1 = new User();
diff --git a/src/test/java/es/fp/edu/conecta2/Conecta2ApplicationTests.java b/src/test/java/es/fp/edu/conecta2/Conecta2ApplicationTests.java
index 6e32ba7..f8b8676 100644
--- a/src/test/java/es/fp/edu/conecta2/Conecta2ApplicationTests.java
+++ b/src/test/java/es/fp/edu/conecta2/Conecta2ApplicationTests.java
@@ -2,9 +2,11 @@ package es.fp.edu.conecta2;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.jdbc.Sql;
 
 @SpringBootTest
 class Conecta2ApplicationTests {
+    @Sql({ "/schema.sql", "/data.sql" })
 
     @Test
     void contextLoads() {