From 841f7de74e4d7666332e043f936d78000eb7c90e Mon Sep 17 00:00:00 2001 From: WILMAR MALAVER Date: Sun, 21 Jun 2020 18:07:02 -0500 Subject: [PATCH 1/5] First problem solved --- "PULL_REQUEST_TEMPLATE.md\t" | 17 ----------------- src/index.js | 19 ++++++++++++++++--- 2 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 "PULL_REQUEST_TEMPLATE.md\t" diff --git "a/PULL_REQUEST_TEMPLATE.md\t" "b/PULL_REQUEST_TEMPLATE.md\t" deleted file mode 100644 index 9a4d861..0000000 --- "a/PULL_REQUEST_TEMPLATE.md\t" +++ /dev/null @@ -1,17 +0,0 @@ -## DESCRIPTION - -Solución al reto 04 de Escuela de JavaScript - -Nombre: -Usuario Platzi: - -## GRUPO -- [ ] Martes -- [ ] Miercoles -- [ ] Jueves - -## Reto: - - [ ] Primer problema - - [ ] Segundo problema - - [ ] Tercer problema - - [ ] Cuarto Problema (Opcional) \ No newline at end of file diff --git a/src/index.js b/src/index.js index 4c965e7..346d42f 100644 --- a/src/index.js +++ b/src/index.js @@ -1,12 +1,24 @@ +const min = 1000; +const max = 8000; +//creacion de function randomTime pedida +const randomTime = (max, min) => Math.round(Math.random() * (max - min) + min); +console.log(randomTime) + const orders = (time, product, table) => { console.log(`### Orden: ${product} para ${table}`); return new Promise((resolve, reject) => { setTimeout(() => { - resolve(`=== Pedido servido: ${product}, tiempo de preparación ${time}ms para la ${table}`); - }, time); - }); + if(randomTime(max,min) <= time){ + resolve(`=== Pedido servido: ${product}, tiempo de preparación ${time}ms para la ${table}`); + + } else { + reject(`Orden fuera del tiempo establecido`); + } + },time); + }); } + const menu = { hamburger: 'Combo Hamburguesa', hotdog: 'Combo Hot Dogs', @@ -21,4 +33,5 @@ const waiter = () => { .catch((err) => console.error(err)); }; + waiter(); From 4139177624232cc311af33ff28a194af4169a339 Mon Sep 17 00:00:00 2001 From: WILMAR MALAVER Date: Sun, 21 Jun 2020 19:09:46 -0500 Subject: [PATCH 2/5] Second problem solved --- src/index.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 346d42f..811f8b4 100644 --- a/src/index.js +++ b/src/index.js @@ -12,8 +12,8 @@ const orders = (time, product, table) => { resolve(`=== Pedido servido: ${product}, tiempo de preparación ${time}ms para la ${table}`); } else { - reject(`Orden fuera del tiempo establecido`); - } + reject(`=== Orden fuera del tiempo establecido`); + } },time); }); } @@ -32,6 +32,16 @@ const waiter = () => { .then((res) => console.log(res)) .catch((err) => console.error(err)); }; +const waiter2 = () => { + orders(6000, menu.hotdog, table[0]) + .then((res) => { + console.log(res) + return orders(6000, menu.pizza, table[2]) + }) + .then((res) => console.log(res)) + .catch((err) => console.error(err)); +}; waiter(); +waiter2() From 88dd2e772fc9868f5a2e7db92eb62b5ada6f1e5a Mon Sep 17 00:00:00 2001 From: WILMAR MALAVER Date: Mon, 22 Jun 2020 00:45:44 -0500 Subject: [PATCH 3/5] third problem solved --- src/index.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 811f8b4..aad5a54 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ const min = 1000; const max = 8000; -//creacion de function randomTime pedida + const randomTime = (max, min) => Math.round(Math.random() * (max - min) + min); console.log(randomTime) @@ -42,6 +42,23 @@ const waiter2 = () => { .catch((err) => console.error(err)); }; +const onerror = () => { + console.log(`=== Orden sin terminar`); +} + +async function waiter3(){ + const order = [menu.hotdog, menu.pizza, menu.hotdog]; + const promesas = order.map(pedido => orders(7000, pedido, table[1])); + try { + const ordersTable = await Promise.all(promesas); + console.log(ordersTable); + console.log(`Su Orden esta lista ${table[1]} por favor acerquese a retirarla`); + } catch (error) { + onerror(error); + } +} + waiter(); waiter2() +waiter3() From d0e2b1f5599422d1edcb1c3d95fd906ff8e398d4 Mon Sep 17 00:00:00 2001 From: WILMAR MALAVER Date: Tue, 23 Jun 2020 22:25:13 -0500 Subject: [PATCH 4/5] Ordenando codigo y eliminando lineas innecesarias --- src/index.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/index.js b/src/index.js index aad5a54..1a1d246 100644 --- a/src/index.js +++ b/src/index.js @@ -34,17 +34,15 @@ const waiter = () => { }; const waiter2 = () => { orders(6000, menu.hotdog, table[0]) - .then((res) => { - console.log(res) - return orders(6000, menu.pizza, table[2]) - }) - .then((res) => console.log(res)) - .catch((err) => console.error(err)); + .then((res) => console.log(res)) + .catch((err) => console.error(err)); + + orders(6000, menu.pizza, table[2]) + .then((res) => console.log(res)) + .catch((err) => console.error(err)); }; -const onerror = () => { - console.log(`=== Orden sin terminar`); -} + async function waiter3(){ const order = [menu.hotdog, menu.pizza, menu.hotdog]; @@ -53,8 +51,8 @@ async function waiter3(){ const ordersTable = await Promise.all(promesas); console.log(ordersTable); console.log(`Su Orden esta lista ${table[1]} por favor acerquese a retirarla`); - } catch (error) { - onerror(error); + } catch { + console.log(`=== Orden sin terminar`); } } From f60318eb41a10dac7e6067d12908c297d3f18087 Mon Sep 17 00:00:00 2001 From: WILMAR MALAVER Date: Tue, 23 Jun 2020 22:25:13 -0500 Subject: [PATCH 5/5] Ordenando codigo y eliminando lineas innecesarias --- src/index.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/index.js b/src/index.js index aad5a54..1a1d246 100644 --- a/src/index.js +++ b/src/index.js @@ -34,17 +34,15 @@ const waiter = () => { }; const waiter2 = () => { orders(6000, menu.hotdog, table[0]) - .then((res) => { - console.log(res) - return orders(6000, menu.pizza, table[2]) - }) - .then((res) => console.log(res)) - .catch((err) => console.error(err)); + .then((res) => console.log(res)) + .catch((err) => console.error(err)); + + orders(6000, menu.pizza, table[2]) + .then((res) => console.log(res)) + .catch((err) => console.error(err)); }; -const onerror = () => { - console.log(`=== Orden sin terminar`); -} + async function waiter3(){ const order = [menu.hotdog, menu.pizza, menu.hotdog]; @@ -53,8 +51,8 @@ async function waiter3(){ const ordersTable = await Promise.all(promesas); console.log(ordersTable); console.log(`Su Orden esta lista ${table[1]} por favor acerquese a retirarla`); - } catch (error) { - onerror(error); + } catch { + console.log(`=== Orden sin terminar`); } }