Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Alvaro Ordóñez Romero
/
DAE-aha00026-aor00039
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
858b8b43
authored
Dec 09, 2023
by
Alvaro Ordóñez Romero
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Modificaciones por fallos en test
parent
edc5cd16
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
34 deletions
pom.xml
src/main/java/com/carpooling/carpoolingaoraha/entidades/Usuario.java
src/main/java/com/carpooling/carpoolingaoraha/rest/ControladorREST.java
src/main/java/com/carpooling/carpoolingaoraha/services/ServicioCarPooling.java
src/main/java/com/carpooling/carpoolingaoraha/utils/CodificadorPassword.java
src/test/java/com/carpooling/carpoolingaoraha/ControladorRESTEST/ControladorRESTTEST.java
pom.xml
View file @
858b8b43
...
...
@@ -21,10 +21,11 @@
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-security
</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-security</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
src/main/java/com/carpooling/carpoolingaoraha/entidades/Usuario.java
View file @
858b8b43
...
...
@@ -3,7 +3,6 @@ package com.carpooling.carpoolingaoraha.entidades;
import
com.carpooling.carpoolingaoraha.excepciones.ReservaNoRegistrada
;
import
com.carpooling.carpoolingaoraha.excepciones.SolicitudYaExistente
;
import
com.carpooling.carpoolingaoraha.excepciones.ViajeNoRegistrado
;
import
com.carpooling.carpoolingaoraha.utils.CodificadorPassword
;
import
com.carpooling.carpoolingaoraha.utils.ExprReg
;
import
jakarta.persistence.*
;
import
org.antlr.v4.runtime.misc.NotNull
;
...
...
src/main/java/com/carpooling/carpoolingaoraha/rest/ControladorREST.java
View file @
858b8b43
...
...
@@ -43,9 +43,8 @@ public class ControladorREST {
@PostMapping
(
"/usuarios"
)
ResponseEntity
<
DTOUsuario
>
altaUsuario
(
@RequestBody
DTOUsuario
usuario
){
try
{
SistemaCarPooling
s
;
servicioCarPooling
.
altaCliente
(
usuario
.
altaUsuario
());
return
ResponseEntity
.
status
(
HttpStatus
.
CREATED
).
build
();
Usuario
u
=
servicioCarPooling
.
altaCliente
(
usuario
.
altaUsuario
());
return
ResponseEntity
.
status
(
HttpStatus
.
CREATED
).
body
(
new
DTOUsuario
(
u
));
}
catch
(
UsuarioYaRegistrado
e
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
CONFLICT
).
build
();
}
...
...
src/main/java/com/carpooling/carpoolingaoraha/services/ServicioCarPooling.java
View file @
858b8b43
...
...
@@ -116,14 +116,7 @@ public class ServicioCarPooling {
return
v
;
}
@Transactional
public
Optional
<
Usuario
>
loginUsuario
(
@NotNull
@Valid
Usuario
usuariop
)
{
Optional
<
Usuario
>
usuarioLogin
=
repositorioUsuario
.
buscar
(
usuariop
.
getDNI
()).
filter
((
usuario
)
->
usuario
.
claveValida
(
usuariop
.
getClaveAcceso
()));
// Asegurarnos de que se devuelve el cliente con los datos precargados
//usuarioLogin.ifPresent(u -> u.verCuentas().size());
return
usuarioLogin
;
}
@Transactional
public
Optional
<
Usuario
>
verUsuario
(
@NotBlank
String
dni
)
{
...
...
src/main/java/com/carpooling/carpoolingaoraha/utils/CodificadorPassword.java
deleted
100644 → 0
View file @
edc5cd16
package
com
.
carpooling
.
carpoolingaoraha
.
utils
;
import
org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
;
public
class
CodificadorPassword
{
static
BCryptPasswordEncoder
encoder
=
new
BCryptPasswordEncoder
();
private
CodificadorPassword
()
{
}
public
static
String
codificar
(
String
cadena
)
{
return
encoder
.
encode
(
cadena
);
}
public
static
boolean
igual
(
String
password
,
String
passwordCodificado
)
{
return
encoder
.
matches
(
password
,
passwordCodificado
);
}
}
src/test/java/com/carpooling/carpoolingaoraha/ControladorRESTEST/ControladorRESTTEST.java
View file @
858b8b43
package
com
.
carpooling
.
carpoolingaoraha
.
ControladorRESTEST
;
import
com.carpooling.carpoolingaoraha.entidades.SistemaCarPooling
;
import
com.carpooling.carpoolingaoraha.entidades.Solicitud
;
import
com.carpooling.carpoolingaoraha.entidades.Usuario
;
import
com.carpooling.carpoolingaoraha.rest.dto.DTOUsuario
;
import
java.time.LocalDate
;
import
jakarta.annotation.PostConstruct
;
import
org.junit.jupiter.api.Test
;
import
org.assertj.core.api.Assertions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.web.client.TestRestTemplate
;
...
...
@@ -8,6 +15,9 @@ import org.springframework.boot.test.web.server.LocalServerPort;
import
org.springframework.boot.web.client.RestTemplateBuilder
;
import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
;
import
java.time.LocalDate
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -19,7 +29,6 @@ public class ControladorRESTTEST {
@Autowired
MappingJackson2HttpMessageConverter
springBoot
;
TestRestTemplate
restTemplate
;
@PostConstruct
...
...
@@ -31,6 +40,20 @@ public class ControladorRESTTEST {
restTemplate
=
new
TestRestTemplate
(
restTemplateBuilder
);
}
@Test
public
void
altaUsuario
(){
List
<
Solicitud
>
solicitudList
=
new
ArrayList
<>();
List
<
Solicitud
>
historico
=
new
ArrayList
<>();
SistemaCarPooling
sis
=
new
SistemaCarPooling
();
Date
fecha
=
new
Date
(
2000
,
12
,
1
);
DTOUsuario
usuario
=
new
DTOUsuario
(
"Fernando"
,
"Alonso Díaz"
,
fecha
,
"11995667D"
,
988674533
,
"hola@gmail.com"
,
"1234"
,
Usuario
.
Rol
.
CONDUCTOR
,
0
,
solicitudList
,
historico
,
sis
);
ResponseEntity
<
DTOUsuario
>
respuesta
=
restTemplate
.
postForEntity
(
"/usuarios"
,
usuario
,
DTOUsuario
.
class
);
Assertions
.
assertThat
(
respuesta
.
getStatusCode
()).
isEqualTo
(
HttpStatus
.
CREATED
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment