From c3400b4ba9cf8e78e6fd00358a78975aeb636a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Tovar?= Date: Tue, 21 Jul 2020 14:20:12 -0500 Subject: [PATCH 1/2] Rename PULL_REQUEST_TEMPLATE.md to PULL_REQUEST_TEMPLATE.md --- "PULL_REQUEST_TEMPLATE.md\t" => PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename "PULL_REQUEST_TEMPLATE.md\t" => PULL_REQUEST_TEMPLATE.md (86%) diff --git "a/PULL_REQUEST_TEMPLATE.md\t" b/PULL_REQUEST_TEMPLATE.md similarity index 86% rename from "PULL_REQUEST_TEMPLATE.md\t" rename to PULL_REQUEST_TEMPLATE.md index 9a4d861..4da4726 100644 --- "a/PULL_REQUEST_TEMPLATE.md\t" +++ b/PULL_REQUEST_TEMPLATE.md @@ -14,4 +14,4 @@ Usuario Platzi: - [ ] Primer problema - [ ] Segundo problema - [ ] Tercer problema - - [ ] Cuarto Problema (Opcional) \ No newline at end of file + - [ ] Cuarto Problema (Opcional) From 5cd401a9a47dfbd10df2e6499669d37088bca587 Mon Sep 17 00:00:00 2001 From: Andres Tovar Date: Sat, 25 Jul 2020 14:53:40 -0500 Subject: [PATCH 2/2] reto --- PULL_REQUEST_TEMPLATE.md | 12 ++++++------ package-lock.json | 5 +++++ package.json | 2 +- src/index.js | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 package-lock.json diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 4da4726..a52a8b6 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -2,16 +2,16 @@ Solución al reto 04 de Escuela de JavaScript -Nombre: -Usuario Platzi: +Nombre: Andrés Felipe Tovar Rojas +Usuario Platzi: andresftovarnpm ## GRUPO -- [ ] Martes +- [x] Martes - [ ] Miercoles - [ ] Jueves ## Reto: - - [ ] Primer problema - - [ ] Segundo problema - - [ ] Tercer problema + - [x] Primer problema + - [x] Segundo problema + - [x] Tercer problema - [ ] Cuarto Problema (Opcional) diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..b37f067 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "escuelajs-reto-04", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/package.json b/package.json index bf060d5..540620b 100644 --- a/package.json +++ b/package.json @@ -21,4 +21,4 @@ "url": "https://github.com/platzi/escuelajs-reto-04/issues" }, "homepage": "https://github.com/platzi/escuelajs-reto-04#readme" -} \ No newline at end of file +} diff --git a/src/index.js b/src/index.js index 4c965e7..4fc3e12 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,18 @@ +const minSeg = 1000 +const maxSeg = 8000 + +const randomTime = () => Math.floor(Math.random() * (maxSeg - minSeg)) + minSeg; + const orders = (time, product, table) => { console.log(`### Orden: ${product} para ${table}`); return new Promise((resolve, reject) => { + if (time <= randomTime()){ setTimeout(() => { resolve(`=== Pedido servido: ${product}, tiempo de preparación ${time}ms para la ${table}`); }, time); + } else{ + reject(`=== Disculpa la demora, estamos preparando ${product}`); + } }); } @@ -21,4 +30,31 @@ const waiter = () => { .catch((err) => console.error(err)); }; +const waiter2 = () => { + orders(randomTime, menu.hotdog, table[0]) + .then(res => { + console.log(res); + return orders(randomTime, menu.pizza, table[2]); + }) + .then(res => console.log(res)) + .catch(err => console.error(err)); +}; + +async function waiter3() { + try { + const listOrders = [ + await orders(randomTime(), menu.hotdog, table[1]), + await orders(randomTime(), menu.pizza, table[1]), + await orders(randomTime(), menu.hotdog, table[1]) + ]; + const res = await Promise.all(listOrders); + console.log(res); + } catch (err) { + console.error(err); + } +} + + waiter(); +waiter2(); +waiter3(); \ No newline at end of file