From ea4691ba871fe276f9aa66a3e2b7ee3ad3fac322 Mon Sep 17 00:00:00 2001 From: AlejandroGalanFreire Date: Tue, 3 May 2022 16:55:45 +0200 Subject: [PATCH 1/2] Actualizaciones en los diagramas de secuencia --- docs/06_runtime_view.adoc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/06_runtime_view.adoc b/docs/06_runtime_view.adoc index 86d4f52..3bf17b3 100644 --- a/docs/06_runtime_view.adoc +++ b/docs/06_runtime_view.adoc @@ -115,4 +115,18 @@ BaseDeDatos <-- Dede: Se almacena el usuario recién registrado como cliente en Usuario <- Dede: Se muestra la página principal de la aplicación Usuario -> Dede: Presiona el botón de "Desconectarse" Usuario <- Dede: Se muestra la página principal de la aplicación con las funciones de un usuario normal ----- \ No newline at end of file +---- + +=== Histórico de pedidos +[plantuml,"HistóricoPedidos",png] +---- +actor Usuario +database BaseDeDatos as "Base de datos" #blue +Usuario -> Dede: Accede a la página y presiona el botón "Registrarse" +Usuario -> Dede: Rellena el formulario de registro/inicio sesión que aporta Auth0 +BaseDeDatos <-- Dede: Se almacena el usuario recién registrado como cliente en la base de datos (si no está ya almacenado) +Usuario <- Dede: Se muestra la página principal de la aplicación +Usuario -> Dede: Presiona el botón de "Historial Pedidos" +Usuario <- Dede: Se muestra una página con un registro de los pedidos del usuario iniciado en sesión +---- + From a4f1768a72abf13bc6bf61962c0020d3cb960915 Mon Sep 17 00:00:00 2001 From: AlejandroGalanFreire Date: Tue, 3 May 2022 17:37:12 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Actualizaci=C3=B3n=20modelo=20de=20dominio?= =?UTF-8?q?=20y=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/images/modeloDominio.png | Bin 19217 -> 25174 bytes restapi/routes/usuario.router.ts | 3 ++- restapi/tests/datos/usuarios.json | 15 --------------- restapi/tests/pedido.test.ts | 2 +- restapi/tests/usuario.test.ts | 8 +------- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/docs/images/modeloDominio.png b/docs/images/modeloDominio.png index 703caf348d7a52b2430d908f8749c26a109fdd4d..dd47b6fcd0a66828e0f0b3fb180b08483371e178 100644 GIT binary patch literal 25174 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 literal 19217 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 if(usuario){ res.send(usuario); } else{ - res.send("No existe ese usuario"); + res.status(500).send("No existe ese usuario"); + } } catch(error){ res.status(500).send("se ha producido un error"); diff --git a/restapi/tests/datos/usuarios.json b/restapi/tests/datos/usuarios.json index 59eeb7d..44c6562 100644 --- a/restapi/tests/datos/usuarios.json +++ b/restapi/tests/datos/usuarios.json @@ -1,32 +1,17 @@ [{ - "DNI":"12345678R", - "nombre":"admin", - "apellidos":"admin", "email":"admin@email.com", "isAdmin":true },{ - "DNI":"78958473Z", - "nombre":"Juan", - "apellidos":"Garcia", "email":"juan@email.com", "isAdmin":false },{ - "DNI":"25864789B", - "nombre":"Wardel Stephen", - "apellidos":"Curry", "email":"goat@email.com", "isAdmin":false }, { - "DNI":"257413698Y", - "nombre":"Carlos", - "apellidos":"Alcaraz", "email":"carlos@email.com", "isAdmin":false },{ - "DNI":"20506101F", - "nombre":"Fernando", - "apellidos":"Alonso", "email":"padre@email.com", "isAdmin":false }] \ No newline at end of file diff --git a/restapi/tests/pedido.test.ts b/restapi/tests/pedido.test.ts index 071b7ca..a999ae1 100644 --- a/restapi/tests/pedido.test.ts +++ b/restapi/tests/pedido.test.ts @@ -127,6 +127,6 @@ describe('pedidos ', () => { it("Se calculan los gastos de envío a una dirección que no se encuentra", async () =>{ const response:Response = await request(app).post('/pedido/gastosEnvio').send({direccion:"La direccion no se encuentra"}); expect(response.status).toBe(200); - expect(Number(response.text).toFixed(2).toString()).toEqual("5.00"); + expect(Number(response.text).toFixed(2).toString()).toEqual("0.00"); }); }); diff --git a/restapi/tests/usuario.test.ts b/restapi/tests/usuario.test.ts index 4e04ee4..1f4d6ad 100644 --- a/restapi/tests/usuario.test.ts +++ b/restapi/tests/usuario.test.ts @@ -55,11 +55,8 @@ afterAll(async () => { describe('user ', () => { it("Se puede añadir un usuario", async() =>{ - var dni:String = "7178958B"; - var nombre:String = "nombrePrueba"; - var apellidos:String = "apellidosPrueba"; var email:String = "prueba@email.com"; - const response:Response = await request(app).post('/usuario').send({dni:dni,nombre:nombre,apellidos:apellidos,email:email}); + const response:Response = await request(app).post('/usuario').send({email:email}); expect(response.statusCode).toBe(200); expect(response.text).toEqual("Usuario añadido correctamente"); }) @@ -69,9 +66,6 @@ describe('user ', () => { expect(response.statusCode).toBe(200); expect(response.body).toEqual({ id:response.body.id, - DNI:"20506101F", - nombre:"Fernando", - apellidos:"Alonso", email: "padre@email.com", isAdmin: false });